diff --git a/build.gradle b/build.gradle index 4efbf1825..6e6116963 100644 --- a/build.gradle +++ b/build.gradle @@ -62,7 +62,6 @@ processResources expand ([ 'version':project.version, 'acversion':project.props.ac_version, - 'coreversion':project.props.core_version, 'mcversion':project.props.mc_version, 'forgeversion':project.props.forge_version ]) @@ -74,12 +73,6 @@ processResources exclude 'version.properties' } } - jar { - manifest { - attributes("FMLCorePlugin": "com.shinoow.abyssalcraft.core.ACCorePlugin") - attributes("FMLCorePluginContainsFMLMod": "true") - } - } task srcJar(type: Jar) { from sourceSets.main.allSource diff --git a/build.properties b/build.properties index d55ac2561..0c55e9450 100644 --- a/build.properties +++ b/build.properties @@ -1,4 +1,3 @@ mc_version=1.7.2 forge_version=10.12.2.1147 -ac_version=1.7.8.1 -core_version=1.2.0 \ No newline at end of file +ac_version=1.8.0 \ No newline at end of file diff --git a/mods/Core_dummy.jar b/mods/Core_dummy.jar deleted file mode 100644 index 233403222..000000000 Binary files a/mods/Core_dummy.jar and /dev/null differ diff --git a/src/api/java/thaumcraft/api/IGoggles.java b/src/api/java/thaumcraft/api/IGoggles.java new file mode 100644 index 000000000..2f53d8163 --- /dev/null +++ b/src/api/java/thaumcraft/api/IGoggles.java @@ -0,0 +1,22 @@ +package thaumcraft.api; + +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.item.ItemStack; + +/** + * + * @author Azanor + * + * Equipped head slot items that extend this class will be able to perform most functions that + * goggles of revealing can apart from view nodes which is handled by IRevealer. + * + */ + +public interface IGoggles { + + /* + * If this method returns true things like block essentia contents will be shown. + */ + public boolean showIngamePopups(ItemStack itemstack, EntityLivingBase player); + +} diff --git a/src/api/java/thaumcraft/api/IRepairable.java b/src/api/java/thaumcraft/api/IRepairable.java new file mode 100644 index 000000000..48c6dff9d --- /dev/null +++ b/src/api/java/thaumcraft/api/IRepairable.java @@ -0,0 +1,13 @@ +package thaumcraft.api; + + + +/** + * @author Azanor + * Items, armor and tools with this interface can receive the Repair enchantment. + * Repairs 1 point of durability every 10 seconds (2 for repair II) + */ +public interface IRepairable { + + +} diff --git a/src/api/java/thaumcraft/api/IRepairableExtended.java b/src/api/java/thaumcraft/api/IRepairableExtended.java new file mode 100644 index 000000000..33827124e --- /dev/null +++ b/src/api/java/thaumcraft/api/IRepairableExtended.java @@ -0,0 +1,17 @@ +package thaumcraft.api; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; + + + +/** + * @author Azanor + * Items, armor and tools with this interface can receive the Repair enchantment. + * Repairs 1 point of durability every 10 seconds (2 for repair II) + */ +public interface IRepairableExtended extends IRepairable { + + public boolean doRepair(ItemStack stack, EntityPlayer player, int enchantlevel); + +} diff --git a/src/api/java/thaumcraft/api/IRunicArmor.java b/src/api/java/thaumcraft/api/IRunicArmor.java new file mode 100644 index 000000000..89d3c379d --- /dev/null +++ b/src/api/java/thaumcraft/api/IRunicArmor.java @@ -0,0 +1,23 @@ +package thaumcraft.api; + +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.item.ItemStack; + +/** + * + * @author Azanor + * + * Armor or bauble slot items that implement this interface can provide runic shielding. + * Recharging, hardening, etc. is handled internally by thaumcraft. + * + */ + +public interface IRunicArmor { + + /** + * returns how much charge this item can provide. This is the base shielding value - any hardening is stored and calculated internally. + */ + public int getRunicCharge(ItemStack itemstack); + + +} diff --git a/src/api/java/thaumcraft/api/IScribeTools.java b/src/api/java/thaumcraft/api/IScribeTools.java new file mode 100644 index 000000000..8800fa577 --- /dev/null +++ b/src/api/java/thaumcraft/api/IScribeTools.java @@ -0,0 +1,14 @@ +package thaumcraft.api; + + +/** + * + * @author Azanor + * + * Interface used to identify scribing tool items used in research table + * + */ + +public interface IScribeTools { + +} diff --git a/src/api/java/thaumcraft/api/IVisDiscountGear.java b/src/api/java/thaumcraft/api/IVisDiscountGear.java new file mode 100644 index 000000000..3793ea3e5 --- /dev/null +++ b/src/api/java/thaumcraft/api/IVisDiscountGear.java @@ -0,0 +1,20 @@ +package thaumcraft.api; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import thaumcraft.api.aspects.Aspect; + + + + +/** + * @author Azanor + * ItemArmor with this interface will grant a discount to the vis cost of actions the wearer performs with casting wands. + * The amount returned is the percentage by which the cost is discounted. There is a built-int max discount of 50%, but + * individual items really shouldn't have a discount more than 5% + */ +public interface IVisDiscountGear { + + int getVisDiscount(ItemStack stack, EntityPlayer player, Aspect aspect); + +} diff --git a/src/api/java/thaumcraft/api/ItemApi.java b/src/api/java/thaumcraft/api/ItemApi.java new file mode 100644 index 000000000..25dda2826 --- /dev/null +++ b/src/api/java/thaumcraft/api/ItemApi.java @@ -0,0 +1,70 @@ +package thaumcraft.api; + +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import cpw.mods.fml.common.FMLLog; + +/** + * @author Azanor + * + * This is used to gain access to the items in my mod. + * I only give some examples and it will probably still + * require a bit of work for you to get hold of everything you need. + * + */ +public class ItemApi { + + public static ItemStack getItem(String itemString, int meta) { + ItemStack item = null; + + try { + String itemClass = "thaumcraft.common.config.ConfigItems"; + Object obj = Class.forName(itemClass).getField(itemString).get(null); + if (obj instanceof Item) { + item = new ItemStack((Item) obj,1,meta); + } else if (obj instanceof ItemStack) { + item = (ItemStack) obj; + } + } catch (Exception ex) { + FMLLog.warning("[Thaumcraft] Could not retrieve item identified by: " + itemString); + } + + return item; + } + + public static ItemStack getBlock(String itemString, int meta) { + ItemStack item = null; + + try { + String itemClass = "thaumcraft.common.config.ConfigBlocks"; + Object obj = Class.forName(itemClass).getField(itemString).get(null); + if (obj instanceof Block) { + item = new ItemStack((Block) obj,1,meta); + } else if (obj instanceof ItemStack) { + item = (ItemStack) obj; + } + } catch (Exception ex) { + FMLLog.warning("[Thaumcraft] Could not retrieve block identified by: " + itemString); + } + + return item; + } + + /** + * + * Some examples + * + * Casting Wands: + * itemWandCasting + * + * Resources: + * itemEssence, itemWispEssence, itemResource, itemShard, itemNugget, + * itemNuggetChicken, itemNuggetBeef, itemNuggetPork, itemTripleMeatTreat + * + * Research: + * itemResearchNotes, itemInkwell, itemThaumonomicon + * + */ + +} diff --git a/src/api/java/thaumcraft/api/ItemRunic.java b/src/api/java/thaumcraft/api/ItemRunic.java new file mode 100644 index 000000000..80251f599 --- /dev/null +++ b/src/api/java/thaumcraft/api/ItemRunic.java @@ -0,0 +1,21 @@ +package thaumcraft.api; + +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +public class ItemRunic extends Item implements IRunicArmor { + + int charge; + + public ItemRunic (int charge) + { + super(); + this.charge = charge; + } + + @Override + public int getRunicCharge(ItemStack itemstack) { + return charge; + } + +} diff --git a/src/api/java/thaumcraft/api/ThaumcraftApi.java b/src/api/java/thaumcraft/api/ThaumcraftApi.java new file mode 100644 index 000000000..f3195aa55 --- /dev/null +++ b/src/api/java/thaumcraft/api/ThaumcraftApi.java @@ -0,0 +1,470 @@ +package thaumcraft.api; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.concurrent.ConcurrentHashMap; + +import net.minecraft.block.Block; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.Item.ToolMaterial; +import net.minecraft.item.ItemArmor.ArmorMaterial; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.util.EnumHelper; +import net.minecraftforge.oredict.OreDictionary; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; +import thaumcraft.api.crafting.CrucibleRecipe; +import thaumcraft.api.crafting.InfusionEnchantmentRecipe; +import thaumcraft.api.crafting.InfusionRecipe; +import thaumcraft.api.crafting.ShapedArcaneRecipe; +import thaumcraft.api.crafting.ShapelessArcaneRecipe; +import thaumcraft.api.research.IScanEventHandler; +import thaumcraft.api.research.ResearchCategories; +import thaumcraft.api.research.ResearchCategoryList; +import thaumcraft.api.research.ResearchItem; +import thaumcraft.api.research.ResearchPage; + + +/** + * @author Azanor + * + * + * IMPORTANT: If you are adding your own aspects to items it is a good idea to do it AFTER Thaumcraft adds its aspects, otherwise odd things may happen. + * + */ +public class ThaumcraftApi { + + //Materials + public static ToolMaterial toolMatThaumium = EnumHelper.addToolMaterial("THAUMIUM", 3, 400, 7F, 2, 22); + public static ToolMaterial toolMatElemental = EnumHelper.addToolMaterial("THAUMIUM_ELEMENTAL", 3, 1500, 10F, 3, 18); + public static ArmorMaterial armorMatThaumium = EnumHelper.addArmorMaterial("THAUMIUM", 25, new int[] { 2, 6, 5, 2 }, 25); + public static ArmorMaterial armorMatSpecial = EnumHelper.addArmorMaterial("SPECIAL", 25, new int[] { 1, 3, 2, 1 }, 25); + + //Enchantment references + public static int enchantFrugal; + public static int enchantPotency; + public static int enchantWandFortune; + public static int enchantHaste; + public static int enchantRepair; + + //Miscellaneous + /** + * Portable Hole Block-id Blacklist. + * Simply add the block-id's of blocks you don't want the portable hole to go through. + */ + public static ArrayList portableHoleBlackList = new ArrayList(); + + + //RESEARCH///////////////////////////////////////// + public static ArrayList scanEventhandlers = new ArrayList(); + public static ArrayList scanEntities = new ArrayList(); + public static class EntityTagsNBT { + public EntityTagsNBT(String name, Object value) { + this.name = name; + this.value = value; + } + public String name; + public Object value; + } + public static class EntityTags { + public EntityTags(String entityName, AspectList aspects, EntityTagsNBT... nbts) { + this.entityName = entityName; + this.nbts = nbts; + this.aspects = aspects; + } + public String entityName; + public EntityTagsNBT[] nbts; + public AspectList aspects; + } + + /** + * not really working atm, so ignore it for now + * @param scanEventHandler + */ + public static void registerScanEventhandler(IScanEventHandler scanEventHandler) { + scanEventhandlers.add(scanEventHandler); + } + + /** + * This is used to add aspects to entities which you can then scan using a thaumometer. + * Also used to calculate vis drops from mobs. + * @param entityName + * @param aspects + * @param nbt you can specify certain nbt keys and their values + * to differentiate between mobs.
For example the normal and wither skeleton: + *
ThaumcraftApi.registerEntityTag("Skeleton", (new AspectList()).add(Aspect.DEATH, 5)); + *
ThaumcraftApi.registerEntityTag("Skeleton", (new AspectList()).add(Aspect.DEATH, 8), new NBTTagByte("SkeletonType",(byte) 1)); + */ + public static void registerEntityTag(String entityName, AspectList aspects, EntityTagsNBT... nbt ) { + scanEntities.add(new EntityTags(entityName,aspects,nbt)); + } + + //RECIPES///////////////////////////////////////// + private static ArrayList craftingRecipes = new ArrayList(); + private static HashMap smeltingBonus = new HashMap(); + + /** + * This method is used to determine what bonus items are generated when the infernal furnace smelts items + * @param in The input of the smelting operation. e.g. new ItemStack(Block.oreGold) + * @param out The bonus item that can be produced from the smelting operation e.g. new ItemStack(nuggetGold,0,0). + * Stacksize should be 0 unless you want to guarantee that at least 1 item is always produced. + */ + public static void addSmeltingBonus(ItemStack in, ItemStack out) { + smeltingBonus.put( + Arrays.asList(in.getItem(),in.getItemDamage()), + new ItemStack(out.getItem(),0,out.getItemDamage())); + } + + /** + * This method is used to determine what bonus items are generated when the infernal furnace smelts items + * @param in The ore dictionary input of the smelting operation. e.g. "oreGold" + * @param out The bonus item that can be produced from the smelting operation e.g. new ItemStack(nuggetGold,0,0). + * Stacksize should be 0 unless you want to guarantee that at least 1 item is always produced. + */ + public static void addSmeltingBonus(String in, ItemStack out) { + smeltingBonus.put( in, new ItemStack(out.getItem(),0,out.getItemDamage())); + } + + /** + * Returns the bonus item produced from a smelting operation in the infernal furnace + * @param in The input of the smelting operation. e.g. new ItemStack(oreGold) + * @return the The bonus item that can be produced + */ + public static ItemStack getSmeltingBonus(ItemStack in) { + ItemStack out = smeltingBonus.get(Arrays.asList(in.getItem(),in.getItemDamage())); + if (out==null) { + out = smeltingBonus.get(Arrays.asList(in.getItem(),OreDictionary.WILDCARD_VALUE)); + } + if (out==null) { + String od = OreDictionary.getOreName( OreDictionary.getOreID(in)); + out = smeltingBonus.get(od); + } + return out; + } + + public static List getCraftingRecipes() { + return craftingRecipes; + } + + /** + * @param research the research key required for this recipe to work. Leave blank if it will work without research + * @param result the recipe output + * @param aspects the vis cost per aspect. + * @param recipe The recipe. Format is exactly the same as vanilla recipes. Input itemstacks are NBT sensitive. + */ + public static ShapedArcaneRecipe addArcaneCraftingRecipe(String research, ItemStack result, AspectList aspects, Object ... recipe) + { + ShapedArcaneRecipe r= new ShapedArcaneRecipe(research, result, aspects, recipe); + craftingRecipes.add(r); + return r; + } + + /** + * @param research the research key required for this recipe to work. Leave blank if it will work without research + * @param result the recipe output + * @param aspects the vis cost per aspect + * @param recipe The recipe. Format is exactly the same as vanilla shapeless recipes. Input itemstacks are NBT sensitive. + */ + public static ShapelessArcaneRecipe addShapelessArcaneCraftingRecipe(String research, ItemStack result, AspectList aspects, Object ... recipe) + { + ShapelessArcaneRecipe r = new ShapelessArcaneRecipe(research, result, aspects, recipe); + craftingRecipes.add(r); + return r; + } + + /** + * @param research the research key required for this recipe to work. Leave blank if it will work without research + * @param result the recipe output. It can either be an itemstack or an nbt compound tag that will be added to the central item + * @param instability a number that represents the N in 1000 chance for the infusion altar to spawn an + * instability effect each second while the crafting is in progress + * @param aspects the essentia cost per aspect. + * @param aspects input the central item to be infused + * @param recipe An array of items required to craft this. Input itemstacks are NBT sensitive. + * Infusion crafting components are automatically "fuzzy" and the oredict will be checked for possible matches. + * + */ + public static InfusionRecipe addInfusionCraftingRecipe(String research, Object result, int instability, AspectList aspects, ItemStack input,ItemStack[] recipe) + { + if (!(result instanceof ItemStack || result instanceof Object[])) return null; + InfusionRecipe r= new InfusionRecipe(research, result, instability, aspects, input, recipe); + craftingRecipes.add(r); + return r; + } + + /** + * @param research the research key required for this recipe to work. Leave blank if it will work without research + * @param enchantment the enchantment that will be applied to the item + * @param instability a number that represents the N in 1000 chance for the infusion altar to spawn an + * instability effect each second while the crafting is in progress + * @param aspects the essentia cost per aspect. + * @param recipe An array of items required to craft this. Input itemstacks are NBT sensitive. + * Infusion crafting components are automatically "fuzzy" and the oredict will be checked for possible matches. + * + */ + public static InfusionEnchantmentRecipe addInfusionEnchantmentRecipe(String research, Enchantment enchantment, int instability, AspectList aspects, ItemStack[] recipe) + { + InfusionEnchantmentRecipe r= new InfusionEnchantmentRecipe(research, enchantment, instability, aspects, recipe); + craftingRecipes.add(r); + return r; + } + + /** + * @param stack the recipe result + * @return the recipe + */ + public static InfusionRecipe getInfusionRecipe(ItemStack res) { + for (Object r:getCraftingRecipes()) { + if (r instanceof InfusionRecipe) { + if (((InfusionRecipe)r).getRecipeOutput() instanceof ItemStack) { + if (((ItemStack) ((InfusionRecipe)r).getRecipeOutput()).isItemEqual(res)) + return (InfusionRecipe)r; + } + } + } + return null; + } + + + /** + * @param key the research key required for this recipe to work. + * @param result the output result + * @param catalyst an itemstack of the catalyst or a string if it is an ore dictionary item + * @param cost the vis cost + * @param tags the aspects required to craft this + */ + public static CrucibleRecipe addCrucibleRecipe(String key, ItemStack result, Object catalyst, AspectList tags) { + CrucibleRecipe rc = new CrucibleRecipe(key, result, catalyst, tags); + getCraftingRecipes().add(rc); + return rc; + } + + + /** + * @param stack the recipe result + * @return the recipe + */ + public static CrucibleRecipe getCrucibleRecipe(ItemStack stack) { + for (Object r:getCraftingRecipes()) { + if (r instanceof CrucibleRecipe) { + if (((CrucibleRecipe)r).getRecipeOutput().isItemEqual(stack)) + return (CrucibleRecipe)r; + } + } + return null; + } + + /** + * Used by the thaumonomicon drilldown feature. + * @param stack the item + * @return the thaumcraft recipe key that produces that item. + */ + private static HashMap keyCache = new HashMap(); + + public static Object[] getCraftingRecipeKey(EntityPlayer player, ItemStack stack) { + int[] key = new int[] {Item.getIdFromItem(stack.getItem()),stack.getItemDamage()}; + if (keyCache.containsKey(key)) { + if (keyCache.get(key)==null) return null; + if (ThaumcraftApiHelper.isResearchComplete(player.getCommandSenderName(), (String)(keyCache.get(key))[0])) + return keyCache.get(key); + else + return null; + } + for (ResearchCategoryList rcl:ResearchCategories.researchCategories.values()) { + for (ResearchItem ri:rcl.research.values()) { + if (ri.getPages()==null) continue; + for (int a=0;a objectTags = new ConcurrentHashMap(); + + /** + * Checks to see if the passed item/block already has aspects associated with it. + * @param id + * @param meta + * @return + */ + public static boolean exists(Item item, int meta) { + AspectList tmp = ThaumcraftApi.objectTags.get(Arrays.asList(item,meta)); + if (tmp==null) { + tmp = ThaumcraftApi.objectTags.get(Arrays.asList(item,OreDictionary.WILDCARD_VALUE)); + if (meta==OreDictionary.WILDCARD_VALUE && tmp==null) { + int index=0; + do { + tmp = ThaumcraftApi.objectTags.get(Arrays.asList(item,index)); + index++; + } while (index<16 && tmp==null); + } + if (tmp==null) return false; + } + + return true; + } + + /** + * Used to assign apsects to the given item/block. Here is an example of the declaration for cobblestone:

+ * ThaumcraftApi.registerObjectTag(new ItemStack(Blocks.cobblestone), (new AspectList()).add(Aspect.ENTROPY, 1).add(Aspect.EARTH, 1)); + * @param item the item passed. Pass OreDictionary.WILDCARD_VALUE if all damage values of this item/block should have the same aspects + * @param aspects A ObjectTags object of the associated aspects + */ + public static void registerObjectTag(ItemStack item, AspectList aspects) { + if (aspects==null) aspects=new AspectList(); + try { + objectTags.put(Arrays.asList(item.getItem(),item.getItemDamage()), aspects); + } catch (Exception e) {} + } + + + /** + * Used to assign apsects to the given item/block. Here is an example of the declaration for cobblestone:

+ * ThaumcraftApi.registerObjectTag(new ItemStack(Blocks.cobblestone), new int[]{0,1}, (new AspectList()).add(Aspect.ENTROPY, 1).add(Aspect.EARTH, 1)); + * @param item + * @param meta A range of meta values if you wish to lump several item meta's together as being the "same" item (i.e. stair orientations) + * @param aspects A ObjectTags object of the associated aspects + */ + public static void registerObjectTag(ItemStack item, int[] meta, AspectList aspects) { + if (aspects==null) aspects=new AspectList(); + try { + objectTags.put(Arrays.asList(item.getItem(),meta), aspects); + } catch (Exception e) {} + } + + /** + * Used to assign apsects to the given ore dictionary item. + * @param oreDict the ore dictionary name + * @param aspects A ObjectTags object of the associated aspects + */ + public static void registerObjectTag(String oreDict, AspectList aspects) { + if (aspects==null) aspects=new AspectList(); + ArrayList ores = OreDictionary.getOres(oreDict); + if (ores!=null && ores.size()>0) { + for (ItemStack ore:ores) { + try { + objectTags.put(Arrays.asList(ore.getItem(), ore.getItemDamage()), aspects); + } catch (Exception e) {} + } + } + } + + /** + * Used to assign aspects to the given item/block. + * Attempts to automatically generate aspect tags by checking registered recipes. + * Here is an example of the declaration for pistons:

+ * ThaumcraftApi.registerComplexObjectTag(new ItemStack(Blocks.cobblestone), (new AspectList()).add(Aspect.MECHANISM, 2).add(Aspect.MOTION, 4)); + * @param item, pass OreDictionary.WILDCARD_VALUE to meta if all damage values of this item/block should have the same aspects + * @param aspects A ObjectTags object of the associated aspects + */ + public static void registerComplexObjectTag(ItemStack item, AspectList aspects ) { + if (!exists(item.getItem(),item.getItemDamage())) { + AspectList tmp = ThaumcraftApiHelper.generateTags(item.getItem(), item.getItemDamage()); + if (tmp != null && tmp.size()>0) { + for(Aspect tag:tmp.getAspects()) { + aspects.add(tag, tmp.getAmount(tag)); + } + } + registerObjectTag(item,aspects); + } else { + AspectList tmp = ThaumcraftApiHelper.getObjectAspects(item); + for(Aspect tag:aspects.getAspects()) { + tmp.merge(tag, tmp.getAmount(tag)); + } + registerObjectTag(item,tmp); + } + } + + //CROPS ////////////////////////////////////////////////////////////////////////////////////////// + + /** + * To define mod crops you need to use FMLInterModComms in your @Mod.Init method. + * There are two 'types' of crops you can add. Standard crops and clickable crops. + * + * Standard crops work like normal vanilla crops - they grow until a certain metadata + * value is reached and you harvest them by destroying the block and collecting the blocks. + * You need to create and ItemStack that tells the golem what block id and metadata represents + * the crop when fully grown. Sending a metadata of [OreDictionary.WILDCARD_VALUE] will mean the metadata won't get + * checked. + * Example for vanilla wheat: + * FMLInterModComms.sendMessage("Thaumcraft", "harvestStandardCrop", new ItemStack(Block.crops,1,7)); + * + * Clickable crops are crops that you right click to gather their bounty instead of destroying them. + * As for standard crops, you need to create and ItemStack that tells the golem what block id + * and metadata represents the crop when fully grown. The golem will trigger the blocks onBlockActivated method. + * Sending a metadata of [OreDictionary.WILDCARD_VALUE] will mean the metadata won't get checked. + * Example (this will technically do nothing since clicking wheat does nothing, but you get the idea): + * FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(Block.crops,1,7)); + * + * Stacked crops (like reeds) are crops that you wish the bottom block should remain after harvesting. + * As for standard crops, you need to create and ItemStack that tells the golem what block id + * and metadata represents the crop when fully grown. Sending a metadata of [OreDictionary.WILDCARD_VALUE] will mean the actualy md won't get + * checked. If it has the order upgrade it will only harvest if the crop is more than one block high. + * Example: + * FMLInterModComms.sendMessage("Thaumcraft", "harvestStackedCrop", new ItemStack(Block.reed,1,7)); + */ + + //NATIVE CLUSTERS ////////////////////////////////////////////////////////////////////////////////// + + /** + * You can define certain ores that will have a chance to produce native clusters via FMLInterModComms + * in your @Mod.Init method using the "nativeCluster" string message. + * The format should be: + * "[ore item/block id],[ore item/block metadata],[cluster item/block id],[cluster item/block metadata],[chance modifier float]" + * + * NOTE: The chance modifier is a multiplier applied to the default chance for that cluster to be produced (default 27.5% for a pickaxe of the core) + * + * Example for vanilla iron ore to produce one of my own native iron clusters (assuming default id's) at double the default chance: + * FMLInterModComms.sendMessage("Thaumcraft", "nativeCluster","15,0,25016,16,2.0"); + */ + + //LAMP OF GROWTH BLACKLIST /////////////////////////////////////////////////////////////////////////// + /** + * You can blacklist crops that should not be effected by the Lamp of Growth via FMLInterModComms + * in your @Mod.Init method using the "lampBlacklist" itemstack message. + * Sending a metadata of [OreDictionary.WILDCARD_VALUE] will mean the metadata won't get checked. + * Example for vanilla wheat: + * FMLInterModComms.sendMessage("Thaumcraft", "lampBlacklist", new ItemStack(Block.crops,1,OreDictionary.WILDCARD_VALUE)); + */ + + //DIMENSION BLACKLIST /////////////////////////////////////////////////////////////////////////// + /** + * You can blacklist a dimension to not spawn certain thaumcraft features + * in your @Mod.Init method using the "dimensionBlacklist" string message in the format "[dimension]:[level]" + * The level values are as follows: + * [0] stop all tc spawning and generation + * [1] allow ore and node generation + * [2] allow mob spawning + * [3] allow ore and node gen + mob spawning + * Example: + * FMLInterModComms.sendMessage("Thaumcraft", "dimensionBlacklist", "15:1"); + */ + + //BIOME BLACKLIST /////////////////////////////////////////////////////////////////////////// + /** + * You can blacklist a biome to not spawn certain thaumcraft features + * in your @Mod.Init method using the "biomeBlacklist" string message in the format "[biome id]:[level]" + * The level values are as follows: + * [0] stop all tc spawning and generation + * [1] allow ore and node generation + * [2] allow mob spawning + * [3] allow ore and node gen + mob spawning + * Example: + * FMLInterModComms.sendMessage("Thaumcraft", "biomeBlacklist", "180:2"); + */ +} diff --git a/src/api/java/thaumcraft/api/ThaumcraftApiHelper.java b/src/api/java/thaumcraft/api/ThaumcraftApiHelper.java new file mode 100644 index 000000000..b5feb068a --- /dev/null +++ b/src/api/java/thaumcraft/api/ThaumcraftApiHelper.java @@ -0,0 +1,268 @@ +package thaumcraft.api; + +import java.lang.reflect.Method; +import java.util.HashMap; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.oredict.OreDictionary; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; +import thaumcraft.api.aspects.IEssentiaTransport; +import cpw.mods.fml.common.FMLLog; + +public class ThaumcraftApiHelper { + + public static AspectList cullTags(AspectList temp) { + AspectList temp2 = new AspectList(); + for (Aspect tag:temp.getAspects()) { + if (tag!=null) + temp2.add(tag, temp.getAmount(tag)); + } + while (temp2!=null && temp2.size()>10) { + Aspect lowest = null; + int low = Integer.MAX_VALUE; + for (Aspect tag:temp2.getAspects()) { + if (tag==null) continue; + if (temp2.getAmount(tag) allAspects= new HashMap(); + private static HashMap allCompoundAspects= new HashMap(); + + public static AspectList getAllAspects(int amount) { + if (allAspects.get(amount)==null) { + AspectList al = new AspectList(); + for (Aspect aspect:Aspect.aspects.values()) { + al.add(aspect, amount); + } + allAspects.put(amount, al); + } + return allAspects.get(amount); + } + + public static AspectList getAllCompoundAspects(int amount) { + if (allCompoundAspects.get(amount)==null) { + AspectList al = new AspectList(); + for (Aspect aspect:Aspect.getCompoundAspects()) { + al.add(aspect, amount); + } + allCompoundAspects.put(amount, al); + } + return allCompoundAspects.get(amount); + } + + static Method consumeVisFromWand; + /** + * Use to subtract vis from a wand for most operations + * Wands store vis differently so "real" vis costs need to be multiplied by 100 before calling this method + * @param wand the wand itemstack + * @param player the player using the wand + * @param cost the cost of the operation. + * @param doit actually subtract the vis from the wand if true - if false just simulate the result + * @param crafting is this a crafting operation or not - if + * false then things like frugal and potency will apply to the costs + * @return was the vis successfully subtracted + */ + public static boolean consumeVisFromWand(ItemStack wand, EntityPlayer player, + AspectList cost, boolean doit, boolean crafting) { + boolean ot = false; + try { + if(consumeVisFromWand == null) { + Class fake = Class.forName("thaumcraft.common.items.wands.ItemWandCasting"); + consumeVisFromWand = fake.getMethod("consumeAllVis", + ItemStack.class, EntityPlayer.class, AspectList.class, boolean.class, boolean.class); + } + ot = (Boolean) consumeVisFromWand.invoke( + consumeVisFromWand.getDeclaringClass().cast(wand.getItem()), wand, player, cost, doit, crafting); + } catch(Exception ex) { + FMLLog.warning("[Thaumcraft API] Could not invoke thaumcraft.common.items.wands.ItemWandCasting method consumeAllVis"); + } + return ot; + } + + static Method consumeVisFromWandCrafting; + /** + * Subtract vis for use by a crafting mechanic. Costs are calculated slightly + * differently and things like the frugal enchant is ignored + * Must NOT be multiplied by 100 - send the actual vis cost + * @param wand the wand itemstack + * @param player the player using the wand + * @param cost the cost of the operation. + * @param doit actually subtract the vis from the wand if true - if false just simulate the result + * @return was the vis successfully subtracted + */ + public static boolean consumeVisFromWandCrafting(ItemStack wand, EntityPlayer player, + AspectList cost, boolean doit) { + boolean ot = false; + try { + if(consumeVisFromWandCrafting == null) { + Class fake = Class.forName("thaumcraft.common.items.wands.ItemWandCasting"); + consumeVisFromWandCrafting = fake.getMethod("consumeAllVisCrafting", + ItemStack.class, EntityPlayer.class, AspectList.class, boolean.class); + } + ot = (Boolean) consumeVisFromWandCrafting.invoke( + consumeVisFromWandCrafting.getDeclaringClass().cast(wand.getItem()), wand, player, cost, doit); + } catch(Exception ex) { + FMLLog.warning("[Thaumcraft API] Could not invoke thaumcraft.common.items.wands.ItemWandCasting method consumeAllVisCrafting"); + } + return ot; + } + + static Method consumeVisFromInventory; + /** + * Subtract vis from a wand the player is carrying. Works like consumeVisFromWand in that actual vis + * costs should be multiplied by 100. The costs are handled like crafting however and things like + * frugal don't effect them + * @param player the player using the wand + * @param cost the cost of the operation. + * @return was the vis successfully subtracted + */ + public static boolean consumeVisFromInventory(EntityPlayer player, AspectList cost) { + boolean ot = false; + try { + if(consumeVisFromInventory == null) { + Class fake = Class.forName("thaumcraft.common.items.wands.WandManager"); + consumeVisFromInventory = fake.getMethod("consumeVisFromInventory", + EntityPlayer.class, AspectList.class); + } + ot = (Boolean) consumeVisFromInventory.invoke(null, player, cost); + } catch(Exception ex) { + FMLLog.warning("[Thaumcraft API] Could not invoke thaumcraft.common.items.wands.WandManager method consumeVisFromInventory"); + } + return ot; + } +} diff --git a/src/api/java/thaumcraft/api/aspects/Aspect.java b/src/api/java/thaumcraft/api/aspects/Aspect.java new file mode 100644 index 000000000..3c33a4a7a --- /dev/null +++ b/src/api/java/thaumcraft/api/aspects/Aspect.java @@ -0,0 +1,201 @@ +package thaumcraft.api.aspects; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.LinkedHashMap; + +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; + +import org.apache.commons.lang3.text.WordUtils; + +public class Aspect { + + String tag; + Aspect[] components; + int color; + private String chatcolor; + ResourceLocation image; + int blend; + + /** + * Use this constructor to register your own aspects. + * @param tag the key that will be used to reference this aspect, as well as its latin display name + * @param color color to display the tag in + * @param components the aspects this one is formed from + * @param image ResourceLocation pointing to a 32x32 icon of the aspect + * @param blend GL11 blendmode (1 or 771). Used for rendering nodes. Default is 1 + */ + public Aspect(String tag, int color, Aspect[] components, ResourceLocation image, int blend) { + if (aspects.containsKey(tag)) throw new IllegalArgumentException(tag+" already registered!"); + this.tag = tag; + this.components = components; + this.color = color; + this.image = image; + this.blend = blend; + aspects.put(tag, this); + } + + /** + * Shortcut constructor I use for the default aspects - you shouldn't be using this. + */ + public Aspect(String tag, int color, Aspect[] components) { + this(tag,color,components,new ResourceLocation("thaumcraft","textures/aspects/"+tag.toLowerCase()+".png"),1); + } + + /** + * Shortcut constructor I use for the default aspects - you shouldn't be using this. + */ + public Aspect(String tag, int color, Aspect[] components, int blend) { + this(tag,color,components,new ResourceLocation("thaumcraft","textures/aspects/"+tag.toLowerCase()+".png"),blend); + } + + /** + * Shortcut constructor I use for the primal aspects - + * you shouldn't use this as making your own primal aspects will break all the things. + */ + public Aspect(String tag, int color, String chatcolor, int blend) { + this(tag,color,(Aspect[])null, blend); + this.setChatcolor(chatcolor); + } + + public int getColor() { + return color; + } + + public String getName() { + return WordUtils.capitalizeFully(tag); + } + + public String getLocalizedDescription() { + return StatCollector.translateToLocal("tc.aspect."+tag); + } + + public String getTag() { + return tag; + } + + public void setTag(String tag) { + this.tag = tag; + } + + public Aspect[] getComponents() { + return components; + } + + public void setComponents(Aspect[] components) { + this.components = components; + } + + public ResourceLocation getImage() { + return image; + } + + public static Aspect getAspect(String tag) { + return aspects.get(tag); + } + + public int getBlend() { + return blend; + } + + public void setBlend(int blend) { + this.blend = blend; + } + + public boolean isPrimal() { + return getComponents()==null || getComponents().length!=2; + } + + /////////////////////////////// + public static ArrayList getPrimalAspects() { + ArrayList primals = new ArrayList(); + Collection pa = aspects.values(); + for (Aspect aspect:pa) { + if (aspect.isPrimal()) primals.add(aspect); + } + return primals; + } + + public static ArrayList getCompoundAspects() { + ArrayList compounds = new ArrayList(); + Collection pa = aspects.values(); + for (Aspect aspect:pa) { + if (!aspect.isPrimal()) compounds.add(aspect); + } + return compounds; + } + + public String getChatcolor() { + return chatcolor; + } + + public void setChatcolor(String chatcolor) { + this.chatcolor = chatcolor; + } + + + /////////////////////////////// + public static LinkedHashMap aspects = new LinkedHashMap(); + + //PRIMAL + public static final Aspect AIR = new Aspect("aer",0xffff7e,"e",1); + public static final Aspect EARTH = new Aspect("terra",0x56c000,"2",1); + public static final Aspect FIRE = new Aspect("ignis",0xff5a01,"c",1); + public static final Aspect WATER = new Aspect("aqua",0x3cd4fc,"3",1); + public static final Aspect ORDER = new Aspect("ordo",0xd5d4ec,"7",1); + public static final Aspect ENTROPY = new Aspect("perditio",0x404040,"8",771); + + //SECONDARY + public static final Aspect VOID = new Aspect("vacuos",0x888888, new Aspect[] {AIR, ENTROPY},771); + public static final Aspect LIGHT = new Aspect("lux",0xfff663, new Aspect[] {AIR, FIRE}); + public static final Aspect WEATHER = new Aspect("tempestas",0xFFFFFF, new Aspect[] {AIR, WATER}); + public static final Aspect MOTION = new Aspect("motus",0xcdccf4, new Aspect[] {AIR, ORDER}); + public static final Aspect COLD = new Aspect("gelum",0xe1ffff, new Aspect[] {FIRE, ENTROPY}); + public static final Aspect CRYSTAL = new Aspect("vitreus",0x80ffff, new Aspect[] {EARTH, ORDER}); + public static final Aspect LIFE = new Aspect("victus",0xde0005, new Aspect[] {WATER, EARTH}); + public static final Aspect POISON = new Aspect("venenum",0x89f000, new Aspect[] {WATER, ENTROPY}); + public static final Aspect ENERGY = new Aspect("potentia",0xc0ffff, new Aspect[] {ORDER, FIRE}); + public static final Aspect EXCHANGE = new Aspect("permutatio",0x578357, new Aspect[] {ENTROPY, ORDER}); +// public static final Aspect ?? = new Aspect("??",0xcdccf4, new Aspect[] {AIR, EARTH}); +// public static final Aspect ?? = new Aspect("??",0xcdccf4, new Aspect[] {FIRE, EARTH}); +// public static final Aspect ?? = new Aspect("??",0xcdccf4, new Aspect[] {FIRE, WATER}); +// public static final Aspect ?? = new Aspect("??",0xcdccf4, new Aspect[] {ORDER, WATER}); +// public static final Aspect ?? = new Aspect("??",0xcdccf4, new Aspect[] {EARTH, ENTROPY}); + + //TERTIARY + public static final Aspect METAL = new Aspect("metallum",0xb5b5cd, new Aspect[] {EARTH, CRYSTAL}); + public static final Aspect DEATH = new Aspect("mortuus",0x887788, new Aspect[] {LIFE, ENTROPY}); + public static final Aspect FLIGHT = new Aspect("volatus",0xe7e7d7, new Aspect[] {AIR, MOTION}); + public static final Aspect DARKNESS = new Aspect("tenebrae",0x222222, new Aspect[] {VOID, LIGHT}); + public static final Aspect SOUL = new Aspect("spiritus",0xebebfb, new Aspect[] {LIFE, DEATH}); + public static final Aspect HEAL = new Aspect("sano",0xff2f34, new Aspect[] {LIFE, ORDER}); + public static final Aspect TRAVEL = new Aspect("iter",0xe0585b, new Aspect[] {MOTION, EARTH}); + public static final Aspect ELDRITCH = new Aspect("alienis",0x805080, new Aspect[] {VOID, DARKNESS}); + public static final Aspect MAGIC = new Aspect("praecantatio",0x9700c0, new Aspect[] {VOID, ENERGY}); + public static final Aspect AURA = new Aspect("auram",0xffc0ff, new Aspect[] {MAGIC, AIR}); + public static final Aspect TAINT = new Aspect("vitium",0x800080, new Aspect[] {MAGIC, ENTROPY}); + public static final Aspect SLIME = new Aspect("limus",0x01f800, new Aspect[] {LIFE, WATER}); + public static final Aspect PLANT = new Aspect("herba",0x01ac00, new Aspect[] {LIFE, EARTH}); + public static final Aspect TREE = new Aspect("arbor",0x876531, new Aspect[] {AIR, PLANT}); + public static final Aspect BEAST = new Aspect("bestia",0x9f6409, new Aspect[] {MOTION, LIFE}); + public static final Aspect FLESH = new Aspect("corpus",0xee478d, new Aspect[] {DEATH, BEAST}); + public static final Aspect UNDEAD = new Aspect("exanimis",0x3a4000, new Aspect[] {MOTION, DEATH}); + public static final Aspect MIND = new Aspect("cognitio",0xffc2b3, new Aspect[] {EARTH, SOUL}); + public static final Aspect SENSES = new Aspect("sensus",0x0fd9ff, new Aspect[] {AIR, SOUL}); + public static final Aspect MAN = new Aspect("humanus",0xffd7c0, new Aspect[] {BEAST, MIND}); + public static final Aspect CROP = new Aspect("messis",0xe1b371, new Aspect[] {PLANT, MAN}); + public static final Aspect MINE = new Aspect("perfodio",0xdcd2d8, new Aspect[] {MAN, EARTH}); + public static final Aspect TOOL = new Aspect("instrumentum",0x4040ee, new Aspect[] {MAN, ORDER}); + public static final Aspect HARVEST = new Aspect("meto",0xeead82, new Aspect[] {CROP, TOOL}); + public static final Aspect WEAPON = new Aspect("telum",0xc05050, new Aspect[] {TOOL, ENTROPY}); + public static final Aspect ARMOR = new Aspect("tutamen",0x00c0c0, new Aspect[] {TOOL, EARTH}); + public static final Aspect HUNGER = new Aspect("fames",0x9a0305, new Aspect[] {LIFE, VOID}); + public static final Aspect GREED = new Aspect("lucrum",0xe6be44, new Aspect[] {MAN, HUNGER}); + public static final Aspect CRAFT = new Aspect("fabrico",0x809d80, new Aspect[] {MAN, TOOL}); + public static final Aspect CLOTH = new Aspect("pannus",0xeaeac2, new Aspect[] {TOOL, BEAST}); + public static final Aspect MECHANISM = new Aspect("machina",0x8080a0, new Aspect[] {MOTION, TOOL}); + public static final Aspect TRAP = new Aspect("vinculum",0x9a8080, new Aspect[] {MOTION, ENTROPY}); + + +} diff --git a/src/api/java/thaumcraft/api/aspects/AspectList.java b/src/api/java/thaumcraft/api/aspects/AspectList.java new file mode 100644 index 000000000..6b9dfcef8 --- /dev/null +++ b/src/api/java/thaumcraft/api/aspects/AspectList.java @@ -0,0 +1,256 @@ +package thaumcraft.api.aspects; + +import java.io.Serializable; +import java.util.LinkedHashMap; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import thaumcraft.api.ThaumcraftApiHelper; + +public class AspectList implements Serializable { + + public LinkedHashMap aspects = new LinkedHashMap();//aspects associated with this object + + + /** + * this creates a new aspect list with preloaded values based off the aspects of the given item. + * @param the itemstack of the given item + */ + public AspectList(ItemStack stack) { + try { + AspectList temp = ThaumcraftApiHelper.getObjectAspects(stack); + if (temp!=null) + for (Aspect tag:temp.getAspects()) { + add(tag,temp.getAmount(tag)); + } + } catch (Exception e) {} + } + + public AspectList() { + } + + public AspectList copy() { + AspectList out = new AspectList(); + for (Aspect a:this.getAspects()) + out.add(a, this.getAmount(a)); + return out; + } + + /** + * @return the amount of different aspects in this collection + */ + public int size() { + return aspects.size(); + } + + /** + * @return the amount of total vis in this collection + */ + public int visSize() { + int q = 0; + + for (Aspect as:aspects.keySet()) { + q+=this.getAmount(as); + } + + return q; + } + + /** + * @return an array of all the aspects in this collection + */ + public Aspect[] getAspects() { + Aspect[] q = new Aspect[1]; + return aspects.keySet().toArray(q); + } + + /** + * @return an array of all the aspects in this collection + */ + public Aspect[] getPrimalAspects() { + AspectList t = new AspectList(); + for (Aspect as:aspects.keySet()) { + if (as.isPrimal()) { + t.add(as,1); + } + } + Aspect[] q = new Aspect[1]; + return t.aspects.keySet().toArray(q); + } + + /** + * @return an array of all the aspects in this collection sorted by name + */ + public Aspect[] getAspectsSorted() { + try { + Aspect[] out = aspects.keySet().toArray(new Aspect[1]); + boolean change=false; + do { + change=false; + for(int a=0;a0) { + out[a] = e2; + out[a+1] = e1; + change = true; + break; + } + } + } while (change==true); + return out; + } catch (Exception e) { + return this.getAspects(); + } + } + + /** + * @return an array of all the aspects in this collection sorted by amount + */ + public Aspect[] getAspectsSortedAmount() { + try { + Aspect[] out = aspects.keySet().toArray(new Aspect[1]); + boolean change=false; + do { + change=false; + for(int a=0;a0 && e2>0 && e2>e1) { + Aspect ea = out[a]; + Aspect eb = out[a+1]; + out[a] = eb; + out[a+1] = ea; + change = true; + break; + } + } + } while (change==true); + return out; + } catch (Exception e) { + return this.getAspects(); + } + } + + /** + * @param key + * @return the amount associated with the given aspect in this collection + */ + public int getAmount(Aspect key) { + return aspects.get(key)==null?0:aspects.get(key); + } + + /** + * Reduces the amount of an aspect in this collection by the given amount. + * @param key + * @param amount + * @return + */ + public boolean reduce(Aspect key, int amount) { + if (getAmount(key)>=amount) { + int am = getAmount(key)-amount; + aspects.put(key, am); + return true; + } + return false; + } + + /** + * Reduces the amount of an aspect in this collection by the given amount. + * If reduced to 0 or less the aspect will be removed completely. + * @param key + * @param amount + * @return + */ + public AspectList remove(Aspect key, int amount) { + int am = getAmount(key)-amount; + if (am<=0) aspects.remove(key); else + this.aspects.put(key, am); + return this; + } + + /** + * Simply removes the aspect from the list + * @param key + * @param amount + * @return + */ + public AspectList remove(Aspect key) { + aspects.remove(key); + return this; + } + + /** + * Adds this aspect and amount to the collection. + * If the aspect exists then its value will be increased by the given amount. + * @param aspect + * @param amount + * @return + */ + public AspectList add(Aspect aspect, int amount) { + if (this.aspects.containsKey(aspect)) { + int oldamount = this.aspects.get(aspect); + amount+=oldamount; + } + this.aspects.put( aspect, amount ); + return this; + } + + + /** + * Adds this aspect and amount to the collection. + * If the aspect exists then only the highest of the old or new amount will be used. + * @param aspect + * @param amount + * @return + */ + public AspectList merge(Aspect aspect, int amount) { + if (this.aspects.containsKey(aspect)) { + int oldamount = this.aspects.get(aspect); + if (amount0?aspects:null; + } + return null; + } + + @Override + public void setAspects(ItemStack itemstack, AspectList aspects) { + if (!itemstack.hasTagCompound()) itemstack.setTagCompound(new NBTTagCompound()); + aspects.writeToNBT(itemstack.getTagCompound()); + } +*/ \ No newline at end of file diff --git a/src/api/java/thaumcraft/api/aspects/IEssentiaTransport.java b/src/api/java/thaumcraft/api/aspects/IEssentiaTransport.java new file mode 100644 index 000000000..fecbc1608 --- /dev/null +++ b/src/api/java/thaumcraft/api/aspects/IEssentiaTransport.java @@ -0,0 +1,100 @@ +package thaumcraft.api.aspects; + +import net.minecraftforge.common.util.ForgeDirection; + + +/** + * @author Azanor + * This interface is used by tiles that use or transport vis. + * Only tiles that implement this interface will be able to connect to vis conduits or other thaumic devices + */ +public interface IEssentiaTransport { + /** + * Is this tile able to connect to other vis users/sources on the specified side? + * @param face + * @return + */ + public boolean isConnectable(ForgeDirection face); + + /** + * Is this side used to input essentia? + * @param face + * @return + */ + boolean canInputFrom(ForgeDirection face); + + /** + * Is this side used to output essentia? + * @param face + * @return + */ + boolean canOutputTo(ForgeDirection face); + + /** + * Sets the amount of suction this block will apply + * @param suction + */ + public void setSuction(Aspect aspect, int amount); + + /** + * Returns the type of suction this block is applying. + * @param loc + * the location from where the suction is being checked + * @return + * a return type of null indicates the suction is untyped and the first thing available will be drawn + */ + public Aspect getSuctionType(ForgeDirection face); + + /** + * Returns the strength of suction this block is applying. + * @param loc + * the location from where the suction is being checked + * @return + */ + public int getSuctionAmount(ForgeDirection face); + + /** + * remove the specified amount of essentia from this transport tile + * @return how much was actually taken + */ + public int takeEssentia(Aspect aspect, int amount, ForgeDirection face); + + /** + * add the specified amount of essentia to this transport tile + * @return how much was actually added + */ + public int addEssentia(Aspect aspect, int amount, ForgeDirection face); + + /** + * What type of essentia this contains + * @param face + * @return + */ + public Aspect getEssentiaType(ForgeDirection face); + + /** + * How much essentia this block contains + * @param face + * @return + */ + public int getEssentiaAmount(ForgeDirection face); + + + + /** + * Essentia will not be drawn from this container unless the suction exceeds this amount. + * @return the amount + */ + public int getMinimumSuction(); + + /** + * Return true if you want the conduit to extend a little further into the block. + * Used by jars and alembics that have smaller than normal hitboxes + * @return + */ + boolean renderExtendedTube(); + + + +} + diff --git a/src/api/java/thaumcraft/api/crafting/CrucibleRecipe.java b/src/api/java/thaumcraft/api/crafting/CrucibleRecipe.java new file mode 100644 index 000000000..ebd84791a --- /dev/null +++ b/src/api/java/thaumcraft/api/crafting/CrucibleRecipe.java @@ -0,0 +1,74 @@ +package thaumcraft.api.crafting; + +import java.util.ArrayList; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; +import thaumcraft.api.ThaumcraftApiHelper; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; + +public class CrucibleRecipe { + + private ItemStack recipeOutput; + + + public Object catalyst; + public AspectList aspects; + public String key; + + public CrucibleRecipe(String researchKey, ItemStack result, Object cat, AspectList tags) { + recipeOutput = result; + this.aspects = tags; + this.key = researchKey; + this.catalyst = cat; + if (cat instanceof String) { + this.catalyst = OreDictionary.getOres((String) cat); + } + } + + + public boolean matches(AspectList itags, ItemStack cat) { + if (catalyst instanceof ItemStack && + !ThaumcraftApiHelper.itemMatches((ItemStack) catalyst,cat,false)) { + return false; + } else + if (catalyst instanceof ArrayList && ((ArrayList)catalyst).size()>0) { + if (!ThaumcraftApiHelper.containsMatch(true, ((ArrayList)catalyst).toArray(new ItemStack[]{}), cat)) return false; + } + if (itags==null) return false; + for (Aspect tag:aspects.getAspects()) { + if (itags.getAmount(tag))catalyst).size()>0) { + if (ThaumcraftApiHelper.containsMatch(true, + ((ArrayList)catalyst).toArray(new ItemStack[]{}), cat)) return true; + } + return false; + } + + public AspectList removeMatching(AspectList itags) { + AspectList temptags = new AspectList(); + temptags.aspects.putAll(itags.aspects); + + for (Aspect tag:aspects.getAspects()) { + temptags.remove(tag, aspects.getAmount(tag)); +// if (!temptags.remove(tag, aspects.getAmount(tag))) return null; + } + + itags = temptags; + return itags; + } + + public ItemStack getRecipeOutput() { + return recipeOutput; + } + +} diff --git a/src/api/java/thaumcraft/api/crafting/IArcaneRecipe.java b/src/api/java/thaumcraft/api/crafting/IArcaneRecipe.java new file mode 100644 index 000000000..bb5036d20 --- /dev/null +++ b/src/api/java/thaumcraft/api/crafting/IArcaneRecipe.java @@ -0,0 +1,35 @@ +package thaumcraft.api.crafting; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import thaumcraft.api.aspects.AspectList; + +public interface IArcaneRecipe +{ + + + /** + * Used to check if a recipe matches current crafting inventory + * @param player + */ + boolean matches(IInventory var1, World world, EntityPlayer player); + + /** + * Returns an Item that is the result of this recipe + */ + ItemStack getCraftingResult(IInventory var1); + + /** + * Returns the size of the recipe area + */ + int getRecipeSize(); + + ItemStack getRecipeOutput(); + AspectList getAspects(); + AspectList getAspects(IInventory var1); + String getResearch(); + + +} diff --git a/src/api/java/thaumcraft/api/crafting/IInfusionStabiliser.java b/src/api/java/thaumcraft/api/crafting/IInfusionStabiliser.java new file mode 100644 index 000000000..d137ff24e --- /dev/null +++ b/src/api/java/thaumcraft/api/crafting/IInfusionStabiliser.java @@ -0,0 +1,19 @@ +package thaumcraft.api.crafting; + +import net.minecraft.world.World; + +/** + * + * @author Azanor + * + * Blocks that implement this interface act as infusion crafting stabilisers like candles and skulls + * + */ +public interface IInfusionStabiliser { + + /** + * returns true if the block can stabilise things + */ + public boolean canStabaliseInfusion(World world, int x, int y, int z); + +} diff --git a/src/api/java/thaumcraft/api/crafting/InfusionEnchantmentRecipe.java b/src/api/java/thaumcraft/api/crafting/InfusionEnchantmentRecipe.java new file mode 100644 index 000000000..6fb4d63de --- /dev/null +++ b/src/api/java/thaumcraft/api/crafting/InfusionEnchantmentRecipe.java @@ -0,0 +1,156 @@ +package thaumcraft.api.crafting; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.Map; + +import net.minecraft.enchantment.Enchantment; +import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.minecraftforge.oredict.OreDictionary; +import thaumcraft.api.ThaumcraftApiHelper; +import thaumcraft.api.aspects.AspectList; + +public class InfusionEnchantmentRecipe +{ + + public AspectList aspects; + public String research; + public ItemStack[] components; + public Enchantment enchantment; + public int recipeXP; + public int instability; + + public InfusionEnchantmentRecipe(String research, Enchantment input, int inst, + AspectList aspects2, ItemStack[] recipe) { + this.research = research; + this.enchantment = input; + this.aspects = aspects2; + this.components = recipe; + this.instability = inst; + this.recipeXP = Math.max(1, input.getMinEnchantability(1)/3); + } + + /** + * Used to check if a recipe matches current crafting inventory + * @param player + */ + public boolean matches(ArrayList input, ItemStack central, World world, EntityPlayer player) { + if (research.length()>0 && !ThaumcraftApiHelper.isResearchComplete(player.getCommandSenderName(), research)) { + return false; + } + + if (!enchantment.canApply(central) || !central.getItem().isItemTool(central)) { + return false; + } + + Map map1 = EnchantmentHelper.getEnchantments(central); + Iterator iterator = map1.keySet().iterator(); + while (iterator.hasNext()) + { + int j1 = ((Integer)iterator.next()).intValue(); + Enchantment ench = Enchantment.enchantmentsList[j1]; + if (j1 == enchantment.effectId && + EnchantmentHelper.getEnchantmentLevel(j1, central)>=ench.getMaxLevel()) + return false; + if (enchantment.effectId != ench.effectId && + (!enchantment.canApplyTogether(ench) || + !ench.canApplyTogether(enchantment))) { + return false; + } + } + + ItemStack i2 = null; + + ArrayList ii = new ArrayList(); + for (ItemStack is:input) { + ii.add(is.copy()); + } + + for (ItemStack comp:components) { + boolean b=false; + for (int a=0;a stack0.getMaxStackSize() ? false : t1)); + } + + + public Enchantment getEnchantment() { + return enchantment; + + } + + public AspectList getAspects() { + return aspects; + + } + + public String getResearch() { + return research; + + } + + public int calcInstability(ItemStack recipeInput) { + int i = 0; + Map map1 = EnchantmentHelper.getEnchantments(recipeInput); + Iterator iterator = map1.keySet().iterator(); + while (iterator.hasNext()) + { + int j1 = ((Integer)iterator.next()).intValue(); + i += EnchantmentHelper.getEnchantmentLevel(j1, recipeInput); + } + return (i/2) + instability; + } + + public int calcXP(ItemStack recipeInput) { + return recipeXP * (1+EnchantmentHelper.getEnchantmentLevel(enchantment.effectId, recipeInput)); + } + + public float getEssentiaMod(ItemStack recipeInput) { + float mod = EnchantmentHelper.getEnchantmentLevel(enchantment.effectId, recipeInput); + Map map1 = EnchantmentHelper.getEnchantments(recipeInput); + Iterator iterator = map1.keySet().iterator(); + while (iterator.hasNext()) + { + int j1 = ((Integer)iterator.next()).intValue(); + if (j1 != enchantment.effectId) + mod += EnchantmentHelper.getEnchantmentLevel(j1, recipeInput) * .1f; + } + return mod; + } + +} diff --git a/src/api/java/thaumcraft/api/crafting/InfusionRecipe.java b/src/api/java/thaumcraft/api/crafting/InfusionRecipe.java new file mode 100644 index 000000000..fef0a3471 --- /dev/null +++ b/src/api/java/thaumcraft/api/crafting/InfusionRecipe.java @@ -0,0 +1,128 @@ +package thaumcraft.api.crafting; + +import java.util.ArrayList; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.minecraftforge.oredict.OreDictionary; +import thaumcraft.api.ThaumcraftApiHelper; +import thaumcraft.api.aspects.AspectList; + +public class InfusionRecipe +{ + protected AspectList aspects; + protected String research; + private ItemStack[] components; + private ItemStack recipeInput; + protected Object recipeOutput; + protected int instability; + + public InfusionRecipe(String research, Object output, int inst, + AspectList aspects2, ItemStack input, ItemStack[] recipe) { + this.research = research; + this.recipeOutput = output; + this.recipeInput = input; + this.aspects = aspects2; + this.components = recipe; + this.instability = inst; + } + + /** + * Used to check if a recipe matches current crafting inventory + * @param player + */ + public boolean matches(ArrayList input, ItemStack central, World world, EntityPlayer player) { + if (getRecipeInput()==null) return false; + + if (research.length()>0 && !ThaumcraftApiHelper.isResearchComplete(player.getCommandSenderName(), research)) { + return false; + } + + ItemStack i2 = central.copy(); + if (getRecipeInput().getItemDamage()==OreDictionary.WILDCARD_VALUE) { + i2.setItemDamage(OreDictionary.WILDCARD_VALUE); + } + + if (!areItemStacksEqual(i2, getRecipeInput(), true)) return false; + + ArrayList ii = new ArrayList(); + for (ItemStack is:input) { + ii.add(is.copy()); + } + + for (ItemStack comp:getComponents()) { + boolean b=false; + for (int a=0;a stack0.getMaxStackSize() ? false : t1)); + } + + + public Object getRecipeOutput() { + return getRecipeOutput(this.getRecipeInput()); + } + + public AspectList getAspects() { + return getAspects(this.getRecipeInput()); + } + + public int getInstability() { + return getInstability(this.getRecipeInput()); + } + + public String getResearch() { + return research; + } + + public ItemStack getRecipeInput() { + return recipeInput; + } + + public ItemStack[] getComponents() { + return components; + } + + public Object getRecipeOutput(ItemStack input) { + return recipeOutput; + } + + public AspectList getAspects(ItemStack input) { + return aspects; + } + + public int getInstability(ItemStack input) { + return instability; + } +} diff --git a/src/api/java/thaumcraft/api/crafting/ShapedArcaneRecipe.java b/src/api/java/thaumcraft/api/crafting/ShapedArcaneRecipe.java new file mode 100644 index 000000000..40c7bc27e --- /dev/null +++ b/src/api/java/thaumcraft/api/crafting/ShapedArcaneRecipe.java @@ -0,0 +1,261 @@ +package thaumcraft.api.crafting; + +import java.util.ArrayList; +import java.util.HashMap; + +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.minecraftforge.oredict.OreDictionary; +import thaumcraft.api.ThaumcraftApiHelper; +import thaumcraft.api.aspects.AspectList; + +public class ShapedArcaneRecipe implements IArcaneRecipe +{ + //Added in for future ease of change, but hard coded for now. + private static final int MAX_CRAFT_GRID_WIDTH = 3; + private static final int MAX_CRAFT_GRID_HEIGHT = 3; + + public ItemStack output = null; + public Object[] input = null; + public AspectList aspects = null; + public String research; + public int width = 0; + public int height = 0; + private boolean mirrored = true; + + public ShapedArcaneRecipe(String research, Block result, AspectList aspects, Object... recipe){ this(research, new ItemStack(result), aspects, recipe); } + public ShapedArcaneRecipe(String research, Item result, AspectList aspects, Object... recipe){ this(research, new ItemStack(result), aspects, recipe); } + public ShapedArcaneRecipe(String research, ItemStack result, AspectList aspects, Object... recipe) + { + output = result.copy(); + this.research = research; + this.aspects = aspects; + String shape = ""; + + int idx = 0; + + if (recipe[idx] instanceof Boolean) + { + mirrored = (Boolean)recipe[idx]; + if (recipe[idx+1] instanceof Object[]) + { + recipe = (Object[])recipe[idx+1]; + } + else + { + idx = 1; + } + } + + if (recipe[idx] instanceof String[]) + { + String[] parts = ((String[])recipe[idx++]); + + for (String s : parts) + { + width = s.length(); + shape += s; + } + + height = parts.length; + } + else + { + while (recipe[idx] instanceof String) + { + String s = (String)recipe[idx++]; + shape += s; + width = s.length(); + height++; + } + } + + if (width * height != shape.length()) + { + String ret = "Invalid shaped ore recipe: "; + for (Object tmp : recipe) + { + ret += tmp + ", "; + } + ret += output; + throw new RuntimeException(ret); + } + + HashMap itemMap = new HashMap(); + + for (; idx < recipe.length; idx += 2) + { + Character chr = (Character)recipe[idx]; + Object in = recipe[idx + 1]; + + if (in instanceof ItemStack) + { + itemMap.put(chr, ((ItemStack)in).copy()); + } + else if (in instanceof Item) + { + itemMap.put(chr, new ItemStack((Item)in)); + } + else if (in instanceof Block) + { + itemMap.put(chr, new ItemStack((Block)in, 1, OreDictionary.WILDCARD_VALUE)); + } + else if (in instanceof String) + { + itemMap.put(chr, OreDictionary.getOres((String)in)); + } + else + { + String ret = "Invalid shaped ore recipe: "; + for (Object tmp : recipe) + { + ret += tmp + ", "; + } + ret += output; + throw new RuntimeException(ret); + } + } + + input = new Object[width * height]; + int x = 0; + for (char chr : shape.toCharArray()) + { + input[x++] = itemMap.get(chr); + } + } + + @Override + public ItemStack getCraftingResult(IInventory var1){ return output.copy(); } + + @Override + public int getRecipeSize(){ return input.length; } + + @Override + public ItemStack getRecipeOutput(){ return output; } + + @Override + public boolean matches(IInventory inv, World world, EntityPlayer player) + { + if (research.length()>0 && !ThaumcraftApiHelper.isResearchComplete(player.getCommandSenderName(), research)) { + return false; + } + for (int x = 0; x <= MAX_CRAFT_GRID_WIDTH - width; x++) + { + for (int y = 0; y <= MAX_CRAFT_GRID_HEIGHT - height; ++y) + { + if (checkMatch(inv, x, y, false)) + { + return true; + } + + if (mirrored && checkMatch(inv, x, y, true)) + { + return true; + } + } + } + + return false; + } + + private boolean checkMatch(IInventory inv, int startX, int startY, boolean mirror) + { + for (int x = 0; x < MAX_CRAFT_GRID_WIDTH; x++) + { + for (int y = 0; y < MAX_CRAFT_GRID_HEIGHT; y++) + { + int subX = x - startX; + int subY = y - startY; + Object target = null; + + if (subX >= 0 && subY >= 0 && subX < width && subY < height) + { + if (mirror) + { + target = input[width - subX - 1 + subY * width]; + } + else + { + target = input[subX + subY * width]; + } + } + + ItemStack slot = ThaumcraftApiHelper.getStackInRowAndColumn(inv, x, y); + + if (target instanceof ItemStack) + { + if (!checkItemEquals((ItemStack)target, slot)) + { + return false; + } + } + else if (target instanceof ArrayList) + { + boolean matched = false; + + for (ItemStack item : (ArrayList)target) + { + matched = matched || checkItemEquals(item, slot); + } + + if (!matched) + { + return false; + } + } + else if (target == null && slot != null) + { + return false; + } + } + } + + return true; + } + + private boolean checkItemEquals(ItemStack target, ItemStack input) + { + if (input == null && target != null || input != null && target == null) + { + return false; + } + return (target.getItem() == input.getItem() && + (!target.hasTagCompound() || ItemStack.areItemStackTagsEqual(target, input)) && + (target.getItemDamage() == OreDictionary.WILDCARD_VALUE|| target.getItemDamage() == input.getItemDamage())); + } + + public ShapedArcaneRecipe setMirrored(boolean mirror) + { + mirrored = mirror; + return this; + } + + /** + * Returns the input for this recipe, any mod accessing this value should never + * manipulate the values in this array as it will effect the recipe itself. + * @return The recipes input vales. + */ + public Object[] getInput() + { + return this.input; + } + + @Override + public AspectList getAspects() { + return aspects; + } + + @Override + public AspectList getAspects(IInventory inv) { + return aspects; + } + + @Override + public String getResearch() { + return research; + } +} diff --git a/src/api/java/thaumcraft/api/crafting/ShapelessArcaneRecipe.java b/src/api/java/thaumcraft/api/crafting/ShapelessArcaneRecipe.java new file mode 100644 index 000000000..3d4ed5088 --- /dev/null +++ b/src/api/java/thaumcraft/api/crafting/ShapelessArcaneRecipe.java @@ -0,0 +1,157 @@ +package thaumcraft.api.crafting; + +import java.util.ArrayList; +import java.util.Iterator; + +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.minecraftforge.oredict.OreDictionary; +import thaumcraft.api.ThaumcraftApiHelper; +import thaumcraft.api.aspects.AspectList; + +public class ShapelessArcaneRecipe implements IArcaneRecipe +{ + private ItemStack output = null; + private ArrayList input = new ArrayList(); + + public AspectList aspects = null; + public String research; + + public ShapelessArcaneRecipe(String research, Block result, AspectList aspects, Object... recipe){ this(research,new ItemStack(result),aspects, recipe); } + public ShapelessArcaneRecipe(String research, Item result, AspectList aspects, Object... recipe){ this(research,new ItemStack(result),aspects, recipe); } + + public ShapelessArcaneRecipe(String research, ItemStack result, AspectList aspects, Object... recipe) + { + output = result.copy(); + this.research = research; + this.aspects = aspects; + for (Object in : recipe) + { + if (in instanceof ItemStack) + { + input.add(((ItemStack)in).copy()); + } + else if (in instanceof Item) + { + input.add(new ItemStack((Item)in)); + } + else if (in instanceof Block) + { + input.add(new ItemStack((Block)in)); + } + else if (in instanceof String) + { + input.add(OreDictionary.getOres((String)in)); + } + else + { + String ret = "Invalid shapeless ore recipe: "; + for (Object tmp : recipe) + { + ret += tmp + ", "; + } + ret += output; + throw new RuntimeException(ret); + } + } + } + + @Override + public int getRecipeSize(){ return input.size(); } + + @Override + public ItemStack getRecipeOutput(){ return output; } + + @Override + public ItemStack getCraftingResult(IInventory var1){ return output.copy(); } + + @Override + public boolean matches(IInventory var1, World world, EntityPlayer player) + { + if (research.length()>0 && !ThaumcraftApiHelper.isResearchComplete(player.getCommandSenderName(), research)) { + return false; + } + + ArrayList required = new ArrayList(input); + + for (int x = 0; x < 9; x++) + { + ItemStack slot = var1.getStackInSlot(x); + + if (slot != null) + { + boolean inRecipe = false; + Iterator req = required.iterator(); + + while (req.hasNext()) + { + boolean match = false; + + Object next = req.next(); + + if (next instanceof ItemStack) + { + match = checkItemEquals((ItemStack)next, slot); + } + else if (next instanceof ArrayList) + { + for (ItemStack item : (ArrayList)next) + { + match = match || checkItemEquals(item, slot); + } + } + + if (match) + { + inRecipe = true; + required.remove(next); + break; + } + } + + if (!inRecipe) + { + return false; + } + } + } + + return required.isEmpty(); + } + + private boolean checkItemEquals(ItemStack target, ItemStack input) + { + return (target.getItem() == input.getItem() && + (!target.hasTagCompound() || ItemStack.areItemStackTagsEqual(target, input)) && + (target.getItemDamage() == OreDictionary.WILDCARD_VALUE || target.getItemDamage() == input.getItemDamage())); + } + + /** + * Returns the input for this recipe, any mod accessing this value should never + * manipulate the values in this array as it will effect the recipe itself. + * @return The recipes input vales. + */ + public ArrayList getInput() + { + return this.input; + } + + @Override + public AspectList getAspects() { + return aspects; + } + + @Override + public AspectList getAspects(IInventory inv) { + return aspects; + } + + @Override + public String getResearch() { + return research; + } +} diff --git a/src/api/java/thaumcraft/api/damagesource/DamageSourceIndirectThaumcraftEntity.java b/src/api/java/thaumcraft/api/damagesource/DamageSourceIndirectThaumcraftEntity.java new file mode 100644 index 000000000..1562d052f --- /dev/null +++ b/src/api/java/thaumcraft/api/damagesource/DamageSourceIndirectThaumcraftEntity.java @@ -0,0 +1,32 @@ +package thaumcraft.api.damagesource; + +import net.minecraft.entity.Entity; +import net.minecraft.util.DamageSource; +import net.minecraft.util.EntityDamageSourceIndirect; + +public class DamageSourceIndirectThaumcraftEntity extends EntityDamageSourceIndirect { + + private boolean fireDamage; + private float hungerDamage; + private boolean isUnblockable; + + + public DamageSourceIndirectThaumcraftEntity(String par1Str, + Entity par2Entity, Entity par3Entity) { + super(par1Str, par2Entity, par3Entity); + } + + + public DamageSource setFireDamage() + { + this.fireDamage = true; + return this; + } + + public DamageSource setDamageBypassesArmor() + { + this.isUnblockable = true; + this.hungerDamage = 0.0F; + return this; + } +} diff --git a/src/api/java/thaumcraft/api/damagesource/DamageSourceThaumcraft.java b/src/api/java/thaumcraft/api/damagesource/DamageSourceThaumcraft.java new file mode 100644 index 000000000..7c277f28e --- /dev/null +++ b/src/api/java/thaumcraft/api/damagesource/DamageSourceThaumcraft.java @@ -0,0 +1,46 @@ +package thaumcraft.api.damagesource; + +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.util.DamageSource; +import net.minecraft.util.EntityDamageSource; + +public class DamageSourceThaumcraft extends DamageSource +{ + + public static DamageSource taint = new DamageSourceThaumcraft("taint").setDamageBypassesArmor().setMagicDamage(); + public static DamageSource tentacle = new DamageSourceThaumcraft("tentacle"); + public static DamageSource swarm = new DamageSourceThaumcraft("swarm"); + + protected DamageSourceThaumcraft(String par1Str) { + super(par1Str); + } + + /** This kind of damage can be blocked or not. */ + private boolean isUnblockable = false; + private boolean isDamageAllowedInCreativeMode = false; + private float hungerDamage = 0.3F; + + /** This kind of damage is based on fire or not. */ + private boolean fireDamage; + + /** This kind of damage is based on a projectile or not. */ + private boolean projectile; + + /** + * Whether this damage source will have its damage amount scaled based on the current difficulty. + */ + private boolean difficultyScaled; + private boolean magicDamage = false; + private boolean explosion = false; + + public static DamageSource causeSwarmDamage(EntityLivingBase par0EntityLiving) + { + return new EntityDamageSource("swarm", par0EntityLiving); + } + + public static DamageSource causeTentacleDamage(EntityLivingBase par0EntityLiving) + { + return new EntityDamageSource("tentacle", par0EntityLiving); + } + +} diff --git a/src/api/java/thaumcraft/api/entities/ITaintedMob.java b/src/api/java/thaumcraft/api/entities/ITaintedMob.java new file mode 100644 index 000000000..83fb1fcbd --- /dev/null +++ b/src/api/java/thaumcraft/api/entities/ITaintedMob.java @@ -0,0 +1,5 @@ +package thaumcraft.api.entities; + +public interface ITaintedMob { + +} diff --git a/src/api/java/thaumcraft/api/nodes/INode.java b/src/api/java/thaumcraft/api/nodes/INode.java new file mode 100644 index 000000000..8c71414d9 --- /dev/null +++ b/src/api/java/thaumcraft/api/nodes/INode.java @@ -0,0 +1,53 @@ +package thaumcraft.api.nodes; + +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; +import thaumcraft.api.aspects.IAspectContainer; + +public interface INode extends IAspectContainer { + + /** + * Unique identifier to distinguish nodes. Normal node id's are based on world id and coordinates + * @return + */ + public String getId(); + + public AspectList getAspectsBase(); + + /** + * Return the type of node + * @return + */ + public NodeType getNodeType(); + + /** + * Set the type of node + * @return + */ + public void setNodeType(NodeType nodeType); + + /** + * Return the node modifier + * @return + */ + public void setNodeModifier(NodeModifier nodeModifier); + + /** + * Set the node modifier + * @return + */ + public NodeModifier getNodeModifier(); + + /** + * Return the maximum capacity of each aspect the node can hold + * @return + */ + public int getNodeVisBase(Aspect aspect); + + /** + * Set the maximum capacity of each aspect the node can hold + * @return + */ + public void setNodeVisBase(Aspect aspect, short nodeVisBase); + +} diff --git a/src/api/java/thaumcraft/api/nodes/IRevealer.java b/src/api/java/thaumcraft/api/nodes/IRevealer.java new file mode 100644 index 000000000..14a19b54d --- /dev/null +++ b/src/api/java/thaumcraft/api/nodes/IRevealer.java @@ -0,0 +1,22 @@ +package thaumcraft.api.nodes; + +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.item.ItemStack; + +/** + * + * @author Azanor + * + * Equipped head slot items that extend this class will make nodes visible in world. + * + */ + +public interface IRevealer { + + /* + * If this method returns true the nodes will be visible. + */ + public boolean showNodes(ItemStack itemstack, EntityLivingBase player); + + +} diff --git a/src/api/java/thaumcraft/api/nodes/NodeModifier.java b/src/api/java/thaumcraft/api/nodes/NodeModifier.java new file mode 100644 index 000000000..885b8678a --- /dev/null +++ b/src/api/java/thaumcraft/api/nodes/NodeModifier.java @@ -0,0 +1,6 @@ +package thaumcraft.api.nodes; + +public enum NodeModifier +{ + BRIGHT, PALE, FADING +} \ No newline at end of file diff --git a/src/api/java/thaumcraft/api/nodes/NodeType.java b/src/api/java/thaumcraft/api/nodes/NodeType.java new file mode 100644 index 000000000..355324b51 --- /dev/null +++ b/src/api/java/thaumcraft/api/nodes/NodeType.java @@ -0,0 +1,6 @@ +package thaumcraft.api.nodes; + +public enum NodeType +{ + NORMAL, UNSTABLE, DARK, TAINTED, HUNGRY, PURE +} \ No newline at end of file diff --git a/src/api/java/thaumcraft/api/potions/PotionFluxTaint.java b/src/api/java/thaumcraft/api/potions/PotionFluxTaint.java new file mode 100644 index 000000000..b718de4b7 --- /dev/null +++ b/src/api/java/thaumcraft/api/potions/PotionFluxTaint.java @@ -0,0 +1,67 @@ +package thaumcraft.api.potions; + +import net.minecraft.client.Minecraft; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.potion.Potion; +import net.minecraft.util.ResourceLocation; +import thaumcraft.api.damagesource.DamageSourceThaumcraft; +import thaumcraft.api.entities.ITaintedMob; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class PotionFluxTaint extends Potion +{ + public static PotionFluxTaint instance = null; // will be instantiated at runtime + private int statusIconIndex = -1; + + public PotionFluxTaint(int par1, boolean par2, int par3) + { + super(par1,par2,par3); + setIconIndex(0, 0); + } + + public static void init() + { + instance.setPotionName("potion.fluxtaint"); + instance.setIconIndex(3, 1); + instance.setEffectiveness(0.25D); + } + + @Override + public boolean isBadEffect() { + return true; + } + + @Override + @SideOnly(Side.CLIENT) + public int getStatusIconIndex() { + Minecraft.getMinecraft().renderEngine.bindTexture(rl); + return super.getStatusIconIndex(); + } + + ResourceLocation rl = new ResourceLocation("thaumcraft","textures/misc/potions.png"); + + @Override + public void performEffect(EntityLivingBase target, int par2) { + if (target instanceof ITaintedMob) { + target.heal(1); + } else + if (!target.isEntityUndead() && !(target instanceof EntityPlayer)) + { + target.attackEntityFrom(DamageSourceThaumcraft.taint, 1); + } + else + if (!target.isEntityUndead() && (target.getMaxHealth() > 1 || (target instanceof EntityPlayer))) + { + target.attackEntityFrom(DamageSourceThaumcraft.taint, 1); + } + } + + public boolean isReady(int par1, int par2) + { + int k = 40 >> par2; + return k > 0 ? par1 % k == 0 : true; + } + +} diff --git a/src/api/java/thaumcraft/api/research/IScanEventHandler.java b/src/api/java/thaumcraft/api/research/IScanEventHandler.java new file mode 100644 index 000000000..d0efac5fc --- /dev/null +++ b/src/api/java/thaumcraft/api/research/IScanEventHandler.java @@ -0,0 +1,9 @@ +package thaumcraft.api.research; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +public interface IScanEventHandler { + ScanResult scanPhenomena(ItemStack stack, World world, EntityPlayer player); +} diff --git a/src/api/java/thaumcraft/api/research/ResearchCategories.java b/src/api/java/thaumcraft/api/research/ResearchCategories.java new file mode 100644 index 000000000..82309b369 --- /dev/null +++ b/src/api/java/thaumcraft/api/research/ResearchCategories.java @@ -0,0 +1,101 @@ +package thaumcraft.api.research; + +import java.util.Collection; +import java.util.LinkedHashMap; + +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; + +import org.apache.logging.log4j.Level; + +import cpw.mods.fml.common.FMLLog; + +public class ResearchCategories { + + //Research + public static LinkedHashMap researchCategories = new LinkedHashMap (); + + /** + * @param key + * @return the research item linked to this key + */ + public static ResearchCategoryList getResearchList(String key) { + return researchCategories.get(key); + } + + /** + * @param key + * @return the name of the research category linked to this key. + * Must be stored as localization information in the LanguageRegistry. + */ + public static String getCategoryName(String key) { + return StatCollector.translateToLocal("tc.research_category."+key); + } + + /** + * @param key the research key + * @return the ResearchItem object. + */ + public static ResearchItem getResearch(String key) { + Collection rc = researchCategories.values(); + for (Object cat:rc) { + Collection rl = ((ResearchCategoryList)cat).research.values(); + for (Object ri:rl) { + if ((((ResearchItem)ri).key).equals(key)) return (ResearchItem)ri; + } + } + return null; + } + + /** + * This should only be done at the PostInit stage + * @param key the key used for this category + * @param icon the icon to be used for the research category tab + * @param background the resource location of the background image to use for this category + * @return the name of the research linked to this key + */ + public static void registerCategory(String key, ResourceLocation icon, ResourceLocation background) { + if (getResearchList(key)==null) { + ResearchCategoryList rl = new ResearchCategoryList(icon, background); + researchCategories.put(key, rl); + } + } + + public static void addResearch(ResearchItem ri) { + ResearchCategoryList rl = getResearchList(ri.category); + if (rl!=null && !rl.research.containsKey(ri.key)) { + + if (!ri.isVirtual()) { + for (ResearchItem rr:rl.research.values()) { + if (rr.displayColumn == ri.displayColumn && rr.displayRow == ri.displayRow) { + FMLLog.log(Level.FATAL, "[Thaumcraft] Research ["+ri.getName()+"] not added as it overlaps with existing research ["+rr.getName()+"]"); + return; + } + } + } + + + rl.research.put(ri.key, ri); + + if (ri.displayColumn < rl.minDisplayColumn) + { + rl.minDisplayColumn = ri.displayColumn; + } + + if (ri.displayRow < rl.minDisplayRow) + { + rl.minDisplayRow = ri.displayRow; + } + + if (ri.displayColumn > rl.maxDisplayColumn) + { + rl.maxDisplayColumn = ri.displayColumn; + } + + if (ri.displayRow > rl.maxDisplayRow) + { + rl.maxDisplayRow = ri.displayRow; + } + } + } +} diff --git a/src/api/java/thaumcraft/api/research/ResearchCategoryList.java b/src/api/java/thaumcraft/api/research/ResearchCategoryList.java new file mode 100644 index 000000000..7eed0101e --- /dev/null +++ b/src/api/java/thaumcraft/api/research/ResearchCategoryList.java @@ -0,0 +1,37 @@ +package thaumcraft.api.research; + +import java.util.HashMap; +import java.util.Map; + +import net.minecraft.util.ResourceLocation; + +public class ResearchCategoryList { + + /** Is the smallest column used on the GUI. */ + public int minDisplayColumn; + + /** Is the smallest row used on the GUI. */ + public int minDisplayRow; + + /** Is the biggest column used on the GUI. */ + public int maxDisplayColumn; + + /** Is the biggest row used on the GUI. */ + public int maxDisplayRow; + + /** display variables **/ + public ResourceLocation icon; + public ResourceLocation background; + + public ResearchCategoryList(ResourceLocation icon, ResourceLocation background) { + this.icon = icon; + this.background = background; + } + + //Research + public Map research = new HashMap(); + + + + +} diff --git a/src/api/java/thaumcraft/api/research/ResearchItem.java b/src/api/java/thaumcraft/api/research/ResearchItem.java new file mode 100644 index 000000000..55b3820ca --- /dev/null +++ b/src/api/java/thaumcraft/api/research/ResearchItem.java @@ -0,0 +1,367 @@ +package thaumcraft.api.research; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; + +public class ResearchItem +{ + /** + * A short string used as a key for this research. Must be unique + */ + public final String key; + + /** + * A short string used as a reference to the research category to which this must be added. + */ + public final String category; + + /** + * The aspect tags and their values required to complete this research + */ + public final AspectList tags; + + /** + * This links to any research that needs to be completed before this research can be discovered or learnt. + */ + public String[] parents = null; + + /** + * Like parent above, but a line will not be displayed in the thaumonomicon linking them. Just used to prevent clutter. + */ + public String[] parentsHidden = null; + /** + * any research linked to this that will be unlocked automatically when this research is complete + */ + public String[] siblings = null; + + /** + * the horizontal position of the research icon + */ + public final int displayColumn; + + /** + * the vertical position of the research icon + */ + public final int displayRow; + + /** + * the icon to be used for this research + */ + public final ItemStack icon_item; + + /** + * the icon to be used for this research + */ + public final ResourceLocation icon_resource; + + /** + * How large the research grid is. Valid values are 1 to 3. + */ + private int complexity; + + /** + * Special research has a spiky border. Used for important research milestones. + */ + private boolean isSpecial; + + /** + * Research that can be directly purchased with RP in normal research difficulty. + */ + private boolean isSecondary; + + /** + * This indicates if the research should use a circular icon border. Usually used for "passive" research + * that doesn't have recipes and grants passive effects, or that unlock automatically. + */ + private boolean isRound; + + /** + * Stub research cannot be discovered by normal means, but can be unlocked via the sibling system. + */ + private boolean isStub; + + /** + * This indicated that the research is completely hidden and cannot be discovered by any + * player-controlled means. The recipes will never show up in the thaumonomicon. + * Usually used to unlock "hidden" recipes via sibling unlocking, like + * the various cap and rod combos for wands. + */ + private boolean isVirtual; + + @Deprecated + private boolean isLost; + + /** + * Concealed research does not display in the thaumonomicon until parent researches are discovered. + */ + private boolean isConcealed; + + /** + * Hidden research can only be discovered via scanning or knowledge fragments + */ + private boolean isHidden; + + /** + * These research items will automatically unlock for all players on game start + */ + private boolean isAutoUnlock; + + /** + * Scanning these items will have a chance of revealing hidden knowledge in the thaumonomicon + */ + private ItemStack[] itemTriggers; + + /** + * Scanning these entities will have a chance of revealing hidden knowledge in the thaumonomicon + */ + private String[] entityTriggers; + + /** + * Scanning things with these aspects will have a chance of revealing hidden knowledge in the thaumonomicon + */ + private Aspect[] aspectTriggers; + + private ResearchPage[] pages = null; + + public ResearchItem(String key, String category) + { + this.key = key; + this.category = category; + this.tags = new AspectList(); + this.icon_resource = null; + this.icon_item = null; + this.displayColumn = 0; + this.displayRow = 0; + this.setVirtual(); + + } + + public ResearchItem(String key, String category, AspectList tags, int col, int row, int complex, ResourceLocation icon) + { + this.key = key; + this.category = category; + this.tags = tags; + this.icon_resource = icon; + this.icon_item = null; + this.displayColumn = col; + this.displayRow = row; + this.complexity = complex; + if (complexity < 1) this.complexity = 1; + if (complexity > 3) this.complexity = 3; + } + + public ResearchItem(String key, String category, AspectList tags, int col, int row, int complex, ItemStack icon) + { + this.key = key; + this.category = category; + this.tags = tags; + this.icon_item = icon; + this.icon_resource = null; + this.displayColumn = col; + this.displayRow = row; + this.complexity = complex; + if (complexity < 1) this.complexity = 1; + if (complexity > 3) this.complexity = 3; + } + + public ResearchItem setSpecial() + { + this.isSpecial = true; + return this; + } + + public ResearchItem setStub() + { + this.isStub = true; + return this; + } + + @Deprecated + public ResearchItem setLost() + { + this.isLost = true; + return this; + } + + public ResearchItem setConcealed() + { + this.isConcealed = true; + return this; + } + + public ResearchItem setHidden() + { + this.isHidden = true; + return this; + } + + public ResearchItem setVirtual() + { + this.isVirtual = true; + return this; + } + + public ResearchItem setParents(String... par) + { + this.parents = par; + return this; + } + + + + public ResearchItem setParentsHidden(String... par) + { + this.parentsHidden = par; + return this; + } + + public ResearchItem setSiblings(String... sib) + { + this.siblings = sib; + return this; + } + + public ResearchItem setPages(ResearchPage... par) + { + this.pages = par; + return this; + } + + public ResearchPage[] getPages() { + return pages; + } + + public ResearchItem setItemTriggers(ItemStack... par) + { + this.itemTriggers = par; + return this; + } + + public ResearchItem setEntityTriggers(String... par) + { + this.entityTriggers = par; + return this; + } + + public ResearchItem setAspectTriggers(Aspect... par) + { + this.aspectTriggers = par; + return this; + } + + public ItemStack[] getItemTriggers() { + return itemTriggers; + } + + public String[] getEntityTriggers() { + return entityTriggers; + } + + public Aspect[] getAspectTriggers() { + return aspectTriggers; + } + + public ResearchItem registerResearchItem() + { + ResearchCategories.addResearch(this); + return this; + } + + public String getName() + { + return StatCollector.translateToLocal("tc.research_name."+key); + } + + public String getText() + { + return StatCollector.translateToLocal("tc.research_text."+key); + } + + public boolean isSpecial() + { + return this.isSpecial; + } + + public boolean isStub() + { + return this.isStub; + } + + @Deprecated + public boolean isLost() + { + return this.isLost; + } + + public boolean isConcealed() + { + return this.isConcealed; + } + + public boolean isHidden() + { + return this.isHidden; + } + + public boolean isVirtual() + { + return this.isVirtual; + } + + public boolean isAutoUnlock() { + return isAutoUnlock; + } + + public ResearchItem setAutoUnlock() + { + this.isAutoUnlock = true; + return this; + } + + public boolean isRound() { + return isRound; + } + + public ResearchItem setRound() { + this.isRound = true; + return this; + } + + public boolean isSecondary() { + return isSecondary; + } + + public ResearchItem setSecondary() { + this.isSecondary = true; + return this; + } + + public int getComplexity() { + return complexity; + } + + public ResearchItem setComplexity(int complexity) { + this.complexity = complexity; + return this; + } + + /** + * @return the aspect aspects ordinal with the highest value. Used to determine scroll color and similar things + */ + public Aspect getResearchPrimaryTag() { + Aspect aspect=null; + int highest=0; + if (tags!=null) + for (Aspect tag:tags.getAspects()) { + if (tags.getAmount(tag)>highest) { + aspect=tag; + highest=tags.getAmount(tag); + }; + } + return aspect; + } + +} diff --git a/src/api/java/thaumcraft/api/research/ResearchPage.java b/src/api/java/thaumcraft/api/research/ResearchPage.java new file mode 100644 index 000000000..a2e7824a5 --- /dev/null +++ b/src/api/java/thaumcraft/api/research/ResearchPage.java @@ -0,0 +1,174 @@ +package thaumcraft.api.research; + +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; +import thaumcraft.api.aspects.AspectList; +import thaumcraft.api.crafting.CrucibleRecipe; +import thaumcraft.api.crafting.IArcaneRecipe; +import thaumcraft.api.crafting.InfusionEnchantmentRecipe; +import thaumcraft.api.crafting.InfusionRecipe; + +public class ResearchPage { + public static enum PageType + { + TEXT, + TEXT_CONCEALED, + IMAGE, + CRUCIBLE_CRAFTING, + ARCANE_CRAFTING, + ASPECTS, + NORMAL_CRAFTING, + INFUSION_CRAFTING, + COMPOUND_CRAFTING, + INFUSION_ENCHANTMENT + } + + public PageType type = PageType.TEXT; + + public String text=null; + public String research=null; + public ResourceLocation image=null; + public AspectList aspects=null; + public Object recipe=null; + public ItemStack recipeOutput=null; + + /** + * @param text this can (but does not have to) be a reference to a localization variable, not the actual text. + */ + public ResearchPage(String text) { + this.type = PageType.TEXT; + this.text = text; + } + + /** + * @param research this page will only be displayed if the player has discovered this research + * @param text this can (but does not have to) be a reference to a localization variable, not the actual text. + */ + public ResearchPage(String research, String text) { + this.type = PageType.TEXT_CONCEALED; + this.research = research; + this.text = text; + } + + /** + * @param recipe a vanilla crafting recipe. + */ + public ResearchPage(IRecipe recipe) { + this.type = PageType.NORMAL_CRAFTING; + this.recipe = recipe; + this.recipeOutput = recipe.getRecipeOutput(); + } + + /** + * @param recipe a collection of vanilla crafting recipes. + */ + public ResearchPage(IRecipe[] recipe) { + this.type = PageType.NORMAL_CRAFTING; + this.recipe = recipe; + } + + /** + * @param recipe a collection of arcane crafting recipes. + */ + public ResearchPage(IArcaneRecipe[] recipe) { + this.type = PageType.ARCANE_CRAFTING; + this.recipe = recipe; + } + + /** + * @param recipe a collection of infusion crafting recipes. + */ + public ResearchPage(InfusionRecipe[] recipe) { + this.type = PageType.INFUSION_CRAFTING; + this.recipe = recipe; + } + + /** + * @param recipe a compound crafting recipe. + */ + public ResearchPage(List recipe) { + this.type = PageType.COMPOUND_CRAFTING; + this.recipe = recipe; + } + + /** + * @param recipe an arcane worktable crafting recipe. + */ + public ResearchPage(IArcaneRecipe recipe) { + this.type = PageType.ARCANE_CRAFTING; + this.recipe = recipe; + this.recipeOutput = recipe.getRecipeOutput(); + } + + /** + * @param recipe an alchemy crafting recipe. + */ + public ResearchPage(CrucibleRecipe recipe) { + this.type = PageType.CRUCIBLE_CRAFTING; + this.recipe = recipe; + this.recipeOutput = recipe.getRecipeOutput(); + } + + /** + * @param recipe an infusion crafting recipe. + */ + public ResearchPage(InfusionRecipe recipe) { + this.type = PageType.INFUSION_CRAFTING; + this.recipe = recipe; + if (recipe.getRecipeOutput() instanceof ItemStack) { + this.recipeOutput = (ItemStack) recipe.getRecipeOutput(); + } else { + this.recipeOutput = recipe.getRecipeInput(); + } + } + + /** + * @param recipe an infusion crafting recipe. + */ + public ResearchPage(InfusionEnchantmentRecipe recipe) { + this.type = PageType.INFUSION_ENCHANTMENT; + this.recipe = recipe; +// if (recipe.recipeOutput instanceof ItemStack) { +// this.recipeOutput = (ItemStack) recipe.recipeOutput; +// } else { +// this.recipeOutput = recipe.recipeInput; +// } + } + + /** + * @param image + * @param caption this can (but does not have to) be a reference to a localization variable, not the actual text. + */ + public ResearchPage(ResourceLocation image, String caption) { + this.type = PageType.IMAGE; + this.image = image; + this.text = caption; + } + + /** + * This function should really not be called directly - used internally + */ + public ResearchPage(AspectList as) { + this.type = PageType.ASPECTS; + this.aspects = as; + } + + /** + * returns a localized text of the text field (if one exists). Returns the text field itself otherwise. + * @return + */ + public String getTranslatedText() { + String ret=""; + if (text != null) { + ret = StatCollector.translateToLocal(text); + if (ret.isEmpty()) ret = text; + } + return ret; + } + + +} diff --git a/src/api/java/thaumcraft/api/research/ScanResult.java b/src/api/java/thaumcraft/api/research/ScanResult.java new file mode 100644 index 000000000..e1498f310 --- /dev/null +++ b/src/api/java/thaumcraft/api/research/ScanResult.java @@ -0,0 +1,39 @@ +package thaumcraft.api.research; + +import net.minecraft.entity.Entity; + +public class ScanResult { + public byte type = 0; //1=blocks,2=entities,3=phenomena + public int id; + public int meta; + public Entity entity; + public String phenomena; + + public ScanResult(byte type, int blockId, int blockMeta, Entity entity, + String phenomena) { + super(); + this.type = type; + this.id = blockId; + this.meta = blockMeta; + this.entity = entity; + this.phenomena = phenomena; + } + + @Override + public boolean equals(Object obj) { + if (obj instanceof ScanResult) { + ScanResult sr = (ScanResult) obj; + if (type != sr.type) + return false; + if (type == 1 + && (id != sr.id || meta != sr.meta)) + return false; + if (type == 2 && entity.getEntityId() != sr.entity.getEntityId()) + return false; + if (type == 3 && !phenomena.equals(sr.phenomena)) + return false; + } + return true; + } + +} diff --git a/src/api/java/thaumcraft/api/wands/IWandFocus.java b/src/api/java/thaumcraft/api/wands/IWandFocus.java new file mode 100644 index 000000000..da4b9ae90 --- /dev/null +++ b/src/api/java/thaumcraft/api/wands/IWandFocus.java @@ -0,0 +1,64 @@ +package thaumcraft.api.wands; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.World; +import thaumcraft.api.aspects.AspectList; + + +public interface IWandFocus { + + public enum WandFocusAnimation { + WAVE, CHARGE; + } + + /** + * @return The color the focus should be changed to. + */ + public int getFocusColor(); + + /** + * @return An icon that will be drawn as a block inside the focus "block". + */ + IIcon getFocusDepthLayerIcon(); + + public IIcon getOrnament(); + + public WandFocusAnimation getAnimation(); + + /** + * Gets the amount of vis used per aspect per click or tick. This cost is actually listed as + * a hundredth of a single point of vis, so a cost of 100 will equal one vis per tick/click. + * It is returned as an AspectList to allow for multiple vis types in different ratios. + */ + public AspectList getVisCost(); + + public boolean isVisCostPerTick(); + + public ItemStack onFocusRightClick(ItemStack itemstack, World world, EntityPlayer player, MovingObjectPosition movingobjectposition); + + public void onUsingFocusTick(ItemStack itemstack, EntityPlayer player, int count); + + public void onPlayerStoppedUsingFocus(ItemStack itemstack, World world, EntityPlayer player, int count); + + /** + * Helper method to determine in what order foci should be iterated through when + * the user presses the 'change focus' keybinding. + * @return a string of characters that foci will be sorted against. + * For example AA00 will be placed before FG12 + *
As a guide build the sort string from two alphanumeric characters followed by + * two numeric characters based on... whatever. + */ + public String getSortingHelper(ItemStack itemstack); + + boolean onFocusBlockStartBreak(ItemStack itemstack, int x, int y, int z, EntityPlayer player); + + public boolean acceptsEnchant(int id); + + + + + +} diff --git a/src/api/java/thaumcraft/api/wands/IWandRodOnUpdate.java b/src/api/java/thaumcraft/api/wands/IWandRodOnUpdate.java new file mode 100644 index 000000000..4ef8c8494 --- /dev/null +++ b/src/api/java/thaumcraft/api/wands/IWandRodOnUpdate.java @@ -0,0 +1,16 @@ +package thaumcraft.api.wands; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; + +/** + * + * @author azanor + * + * Implemented by a class that you wish to be called whenever a wand with this rod performs its + * update tick. + * + */ +public interface IWandRodOnUpdate { + void onUpdate(ItemStack itemstack, EntityPlayer player); +} diff --git a/src/api/java/thaumcraft/api/wands/IWandTriggerManager.java b/src/api/java/thaumcraft/api/wands/IWandTriggerManager.java new file mode 100644 index 000000000..474655528 --- /dev/null +++ b/src/api/java/thaumcraft/api/wands/IWandTriggerManager.java @@ -0,0 +1,12 @@ +package thaumcraft.api.wands; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +public interface IWandTriggerManager { + + public boolean performTrigger(World world, ItemStack wand, EntityPlayer player, + int x, int y, int z, int side, int event); + +} diff --git a/src/api/java/thaumcraft/api/wands/IWandable.java b/src/api/java/thaumcraft/api/wands/IWandable.java new file mode 100644 index 000000000..aeb9bac79 --- /dev/null +++ b/src/api/java/thaumcraft/api/wands/IWandable.java @@ -0,0 +1,25 @@ +package thaumcraft.api.wands; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +/** + * + * @author azanor + * + * Add this to a tile entity that you wish wands to interact with in some way. + * + */ + +public interface IWandable { + + public int onWandRightClick(World world, ItemStack wandstack, EntityPlayer player, int x, int y, int z, int side, int md); + + public ItemStack onWandRightClick(World world, ItemStack wandstack, EntityPlayer player); + + public void onUsingWandTick(ItemStack wandstack, EntityPlayer player, int count); + + public void onWandStoppedUsing(ItemStack wandstack, World world, EntityPlayer player, int count); + +} diff --git a/src/api/java/thaumcraft/api/wands/ItemFocusBasic.java b/src/api/java/thaumcraft/api/wands/ItemFocusBasic.java new file mode 100644 index 000000000..35900520c --- /dev/null +++ b/src/api/java/thaumcraft/api/wands/ItemFocusBasic.java @@ -0,0 +1,166 @@ +package thaumcraft.api.wands; + +import java.text.DecimalFormat; +import java.util.List; +import java.util.Map; + +import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumRarity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.StatCollector; +import net.minecraft.world.World; +import thaumcraft.api.ThaumcraftApi; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class ItemFocusBasic extends Item implements IWandFocus { + + public ItemFocusBasic () + { + super(); + maxStackSize = 1; + canRepair=false; + this.setMaxDamage(0); + } + + public IIcon icon; + + @SideOnly(Side.CLIENT) + @Override + public IIcon getIconFromDamage(int par1) { + return icon; + } + + @Override + public boolean isItemTool(ItemStack par1ItemStack) + { + return true; + } + + @Override + public boolean isDamageable() { + return true; + } + + @Override + public void addInformation(ItemStack stack,EntityPlayer player, List list, boolean par4) { + AspectList al = this.getVisCost(); + if (al!=null && al.size()>0) { + list.add(StatCollector.translateToLocal(isVisCostPerTick()?"item.Focus.cost2":"item.Focus.cost1")); + for (Aspect aspect:al.getAspectsSorted()) { + DecimalFormat myFormatter = new DecimalFormat("#####.##"); + String amount = myFormatter.format(al.getAmount(aspect)/100f); + list.add(" \u00A7"+aspect.getChatcolor()+aspect.getName()+"\u00A7r x "+ amount); + + } + } + } + + @Override + public int getItemEnchantability() { + return 5; + } + + @Override + public EnumRarity getRarity(ItemStack itemstack) + { + return EnumRarity.rare; + } + + + @Override + public int getFocusColor() { + // TODO Auto-generated method stub + return 0; + } + + @Override + public AspectList getVisCost() { + // TODO Auto-generated method stub + return null; + } + + @Override + public ItemStack onFocusRightClick(ItemStack itemstack, World world, + EntityPlayer player, MovingObjectPosition movingobjectposition) { + // TODO Auto-generated method stub + return null; + } + + @Override + public void onUsingFocusTick(ItemStack itemstack, EntityPlayer player, + int count) { + // TODO Auto-generated method stub + } + + @Override + public void onPlayerStoppedUsingFocus(ItemStack itemstack, World world, + EntityPlayer player, int count) { + // TODO Auto-generated method stub + + } + + /** + * Just insert two alphanumeric characters before this string in your focus item class + */ + @Override + public String getSortingHelper(ItemStack itemstack) { + Map ench = EnchantmentHelper.getEnchantments(itemstack); + String out=""; + for (Integer lvl:ench.values()) { + out = out + lvl + ""; + } + return out; + } + + @Override + public boolean isVisCostPerTick() { + return false; + } + + @Override + public IIcon getOrnament() { + // TODO Auto-generated method stub + return null; + } + + @Override + public boolean onFocusBlockStartBreak(ItemStack itemstack, int x, int y, + int z, EntityPlayer player) { + // TODO Auto-generated method stub + return false; + } + + @Override + public WandFocusAnimation getAnimation() { + return WandFocusAnimation.WAVE; + } + + @Override + public IIcon getFocusDepthLayerIcon() { + // TODO Auto-generated method stub + return null; + } + + /** + * @see thaumcraft.api.wands.IWandFocus#acceptsEnchant(int) + * By default fortune is off for all wands + **/ + @Override + public boolean acceptsEnchant(int id) { + if (id==ThaumcraftApi.enchantFrugal|| + id==ThaumcraftApi.enchantPotency) return true; + return false; + } + + + + + +} diff --git a/src/api/java/thaumcraft/api/wands/StaffRod.java b/src/api/java/thaumcraft/api/wands/StaffRod.java new file mode 100644 index 000000000..e7ae90f06 --- /dev/null +++ b/src/api/java/thaumcraft/api/wands/StaffRod.java @@ -0,0 +1,48 @@ +package thaumcraft.api.wands; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; + +/** + * + * @author Azanor + * + * This class is used to keep the material information for the various rods. + * It is also used to generate the wand recipes ingame. + * + */ +public class StaffRod extends WandRod { + + boolean runes=false; + + public StaffRod(String tag, int capacity, ItemStack item, int craftCost) { + super(tag+"_staff", capacity, item, craftCost); + this.texture = new ResourceLocation("thaumcraft","textures/models/wand_rod_"+tag+".png"); + } + + public StaffRod(String tag, int capacity, ItemStack item, int craftCost, + IWandRodOnUpdate onUpdate, ResourceLocation texture) { + super(tag+"_staff", capacity, item, craftCost, onUpdate, texture); + } + + public StaffRod(String tag, int capacity, ItemStack item, int craftCost, + IWandRodOnUpdate onUpdate) { + super(tag+"_staff", capacity, item, craftCost, onUpdate); + this.texture = new ResourceLocation("thaumcraft","textures/models/wand_rod_"+tag+".png"); + } + + public StaffRod(String tag, int capacity, ItemStack item, int craftCost, + ResourceLocation texture) { + super(tag+"_staff", capacity, item, craftCost, texture); + } + + public boolean hasRunes() { + return runes; + } + + public void setRunes(boolean hasRunes) { + this.runes = hasRunes; + } + + +} diff --git a/src/api/java/thaumcraft/api/wands/WandCap.java b/src/api/java/thaumcraft/api/wands/WandCap.java new file mode 100644 index 000000000..1fc9ba1ca --- /dev/null +++ b/src/api/java/thaumcraft/api/wands/WandCap.java @@ -0,0 +1,122 @@ +package thaumcraft.api.wands; + +import java.util.LinkedHashMap; +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import thaumcraft.api.aspects.Aspect; + +/** + * This class is used to keep the material information for the various caps. + * It is also used to generate the wand recipes ingame. + * @author Azanor + * + */ +public class WandCap { + + private String tag; + + /** + * Cost to craft this wand. Combined with the rod cost. + */ + private int craftCost; + + /** + * the amount by which all aspect costs are multiplied + */ + float baseCostModifier; + + /** + * specifies a list of primal aspects that use the special discount figure instead of the normal discount. + */ + List specialCostModifierAspects; + + /** + * the amount by which the specified aspect costs are multiplied + */ + float specialCostModifier; + + /** + * The texture that will be used for the ingame wand cap + */ + ResourceLocation texture; + + /** + * the actual item that makes up this cap and will be used to generate the wand recipes + */ + ItemStack item; + + public static LinkedHashMap caps = new LinkedHashMap(); + + public WandCap (String tag, float discount, ItemStack item, int craftCost) { + this.setTag(tag); + this.baseCostModifier = discount; + this.specialCostModifierAspects = null; + texture = new ResourceLocation("thaumcraft","textures/models/wand_cap_"+getTag()+".png"); + this.item=item; + this.setCraftCost(craftCost); + caps.put(tag, this); + } + + public WandCap (String tag, float discount, List specialAspects, float discountSpecial, ItemStack item, int craftCost) { + this.setTag(tag); + this.baseCostModifier = discount; + this.specialCostModifierAspects = specialAspects; + this.specialCostModifier = discountSpecial; + texture = new ResourceLocation("thaumcraft","textures/models/wand_cap_"+getTag()+".png"); + this.item=item; + this.setCraftCost(craftCost); + caps.put(tag, this); + } + + public float getBaseCostModifier() { + return baseCostModifier; + } + + public List getSpecialCostModifierAspects() { + return specialCostModifierAspects; + } + + public float getSpecialCostModifier() { + return specialCostModifier; + } + + public ResourceLocation getTexture() { + return texture; + } + + public void setTexture(ResourceLocation texture) { + this.texture = texture; + } + + public String getTag() { + return tag; + } + + public void setTag(String tag) { + this.tag = tag; + } + + + public ItemStack getItem() { + return item; + } + + public void setItem(ItemStack item) { + this.item = item; + } + + public int getCraftCost() { + return craftCost; + } + + public void setCraftCost(int craftCost) { + this.craftCost = craftCost; + } + + // Some examples: + // WandCap WAND_CAP_IRON = new WandCap("iron", 1.1f, Arrays.asList(Aspect.ORDER),1, new ItemStack(ConfigItems.itemWandCap,1,0),1); + // WandCap WAND_CAP_GOLD = new WandCap("gold", 1f, new ItemStack(ConfigItems.itemWandCap,1,1),3); + +} diff --git a/src/api/java/thaumcraft/api/wands/WandRod.java b/src/api/java/thaumcraft/api/wands/WandRod.java new file mode 100644 index 000000000..6b43cd470 --- /dev/null +++ b/src/api/java/thaumcraft/api/wands/WandRod.java @@ -0,0 +1,151 @@ +package thaumcraft.api.wands; + +import java.util.LinkedHashMap; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; + +/** + * + * @author Azanor + * + * This class is used to keep the material information for the various rods. + * It is also used to generate the wand recipes ingame. + * + */ +public class WandRod { + + + private String tag; + + /** + * Cost to craft this wand. Combined with the rod cost. + */ + private int craftCost; + + /** + * The amount of vis that can be stored - this number is actually multiplied + * by 100 for use by the wands internals + */ + int capacity; + + /** + * The texture that will be used for the ingame wand rod + */ + protected ResourceLocation texture; + + /** + * the actual item that makes up this rod and will be used to generate the wand recipes + */ + ItemStack item; + + /** + * A class that will be called whenever the wand onUpdate tick is run + */ + IWandRodOnUpdate onUpdate; + + /** + * Does the rod glow in the dark? + */ + boolean glow; + + public static LinkedHashMap rods = new LinkedHashMap(); + + public WandRod (String tag, int capacity, ItemStack item, int craftCost, ResourceLocation texture) { + this.setTag(tag); + this.capacity = capacity; + this.texture = texture; + this.item=item; + this.setCraftCost(craftCost); + rods.put(tag, this); + } + + public WandRod (String tag, int capacity, ItemStack item, int craftCost, IWandRodOnUpdate onUpdate, ResourceLocation texture) { + this.setTag(tag); + this.capacity = capacity; + this.texture = texture; + this.item=item; + this.setCraftCost(craftCost); + rods.put(tag, this); + this.onUpdate = onUpdate; + } + + public WandRod (String tag, int capacity, ItemStack item, int craftCost) { + this.setTag(tag); + this.capacity = capacity; + this.texture = new ResourceLocation("thaumcraft","textures/models/wand_rod_"+getTag()+".png"); + this.item=item; + this.setCraftCost(craftCost); + rods.put(tag, this); + } + + public WandRod (String tag, int capacity, ItemStack item, int craftCost, IWandRodOnUpdate onUpdate) { + this.setTag(tag); + this.capacity = capacity; + this.texture = new ResourceLocation("thaumcraft","textures/models/wand_rod_"+getTag()+".png"); + this.item=item; + this.setCraftCost(craftCost); + rods.put(tag, this); + this.onUpdate = onUpdate; + } + + public String getTag() { + return tag; + } + + public void setTag(String tag) { + this.tag = tag; + } + + public int getCapacity() { + return capacity; + } + + public void setCapacity(int capacity) { + this.capacity = capacity; + } + + public ResourceLocation getTexture() { + return texture; + } + + public void setTexture(ResourceLocation texture) { + this.texture = texture; + } + + public ItemStack getItem() { + return item; + } + + public void setItem(ItemStack item) { + this.item = item; + } + + public int getCraftCost() { + return craftCost; + } + + public void setCraftCost(int craftCost) { + this.craftCost = craftCost; + } + + public IWandRodOnUpdate getOnUpdate() { + return onUpdate; + } + + public void setOnUpdate(IWandRodOnUpdate onUpdate) { + this.onUpdate = onUpdate; + } + + public boolean isGlowing() { + return glow; + } + + public void setGlowing(boolean hasGlow) { + this.glow = hasGlow; + } + + // Some examples: + // WandRod WAND_ROD_WOOD = new WandRod("wood",25,new ItemStack(Item.stick),1); + // WandRod WAND_ROD_BLAZE = new WandRod("blaze",100,new ItemStack(Item.blazeRod),7,new WandRodBlazeOnUpdate()); +} diff --git a/src/api/java/thaumcraft/api/wands/WandTriggerRegistry.java b/src/api/java/thaumcraft/api/wands/WandTriggerRegistry.java new file mode 100644 index 000000000..68655cb7a --- /dev/null +++ b/src/api/java/thaumcraft/api/wands/WandTriggerRegistry.java @@ -0,0 +1,72 @@ +package thaumcraft.api.wands; + +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +/** + * This class serves a similar function to IWandable in that it allows wands to interact + * with object in the world. In this case it is most useful for adding interaction with non-mod + * blocks where you can't control what happens in their code. + * Example where it is used is in crafting the thaumonomicon from a bookshelf and the + * crucible from a cauldron + * + * @author azanor + * + */ +public class WandTriggerRegistry { + + /** + * Registers an action to perform when a casting wand right clicks on a specific block. + * A manager class needs to be created that implements IWandTriggerManager. + * @param manager + * @param event a logical number that you can use to differentiate different events or actions + * @param block + * @param meta send -1 as a wildcard value for all possible meta values + */ + public static void registerWandBlockTrigger(IWandTriggerManager manager, int event, Block block, int meta) { + triggers.put(Arrays.asList(block,meta), + Arrays.asList(manager,event)); + + } + + private static HashMap triggers = new HashMap(); + + public static boolean hasTrigger(Block block, int meta) { + if (triggers.containsKey(Arrays.asList(block,meta)) || + triggers.containsKey(Arrays.asList(block,-1))) return true; + return false; + } + + /** + * This is called by the onItemUseFirst function in wands. + * Parameters and return value functions like you would expect for that function. + * @param world + * @param wand + * @param player + * @param x + * @param y + * @param z + * @param side + * @param block + * @param meta + * @return + */ + public static boolean performTrigger(World world, ItemStack wand, EntityPlayer player, + int x, int y, int z, int side, Block block, int meta) { + + List l = triggers.get(Arrays.asList(block,meta)); + if (l==null) l = triggers.get(Arrays.asList(block,-1)); + if (l==null) return false; + + IWandTriggerManager manager = (IWandTriggerManager) l.get(0); + int event = (Integer) l.get(1); + return manager.performTrigger(world, wand, player, x, y, z, side, event); + } + +} diff --git a/src/main/build.gradle b/src/main/build.gradle new file mode 100644 index 000000000..6e6116963 --- /dev/null +++ b/src/main/build.gradle @@ -0,0 +1,94 @@ +buildscript { + repositories { + mavenCentral() + maven { + name = "forge" + url = "http://files.minecraftforge.net/maven" + } + maven { + name = "sonatype" + url = "https://oss.sonatype.org/content/repositories/snapshots/" + } + } + dependencies { + classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' + } +} + +apply plugin: 'forge' + +ext.propFile = file "build.properties" + +propFile.withReader { + + def prop = new Properties() + prop.load(it) + project.ext.props = new ConfigSlurper().parse prop +} + +version = props.ac_version +group= "com.shinoow.abyssalcraft" // http://maven.apache.org/guides/mini/guide-naming-conventions.html +archivesBaseName = "AbyssalCraft" + +minecraft { + version = "1.7.2-10.12.2.1147" + runDir = "eclipse/assets" + + replaceIn "AbyssalCraft.java" + replace "forgeversion", props.forge_version +} + +dependencies { + +} + +version = "${props.mc_version}-${props.ac_version}" + +processResources +{ + // I really don't want that file to exist anywhere + exclude '**/Thumbs.db' + + // this will ensure that this task is redone when the versions change. + inputs.property "version", project.version + inputs.property "mcversion", project.minecraft.version + + // replace stuff in mcmod.info, nothing else + from(sourceSets.main.resources.srcDirs) { + include 'mcmod.info' + include 'version.properties' + + // replace version and mcversion + expand ([ + 'version':project.version, + 'acversion':project.props.ac_version, + 'mcversion':project.props.mc_version, + 'forgeversion':project.props.forge_version + ]) + } + + // copy everything else, thats not the mcmod.info + from(sourceSets.main.resources.srcDirs) { + exclude 'mcmod.info' + exclude 'version.properties' + } +} + + task srcJar(type: Jar) { + from sourceSets.main.allSource + + extension = 'jar' + classifier = 'src' +} + + task devJar(type: Jar, dependsOn: 'classes') { + from(sourceSets.main.output) { + include '**' + } + + extension = 'jar' + classifier = 'dev' +} + artifacts { + archives srcJar, devJar +} diff --git a/src/main/build.properties b/src/main/build.properties new file mode 100644 index 000000000..0c55e9450 --- /dev/null +++ b/src/main/build.properties @@ -0,0 +1,3 @@ +mc_version=1.7.2 +forge_version=10.12.2.1147 +ac_version=1.8.0 \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/AbyssalCraft.java b/src/main/java/com/shinoow/abyssalcraft/AbyssalCraft.java index 5249a6fac..41565a4bb 100644 --- a/src/main/java/com/shinoow/abyssalcraft/AbyssalCraft.java +++ b/src/main/java/com/shinoow/abyssalcraft/AbyssalCraft.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft; @@ -26,22 +27,23 @@ import net.minecraft.entity.EntityList.EntityEggInfo; import net.minecraft.init.Items; import net.minecraft.item.*; -import net.minecraft.item.Item.ToolMaterial; -import net.minecraft.item.ItemArmor.ArmorMaterial; import net.minecraft.potion.*; import net.minecraft.stats.*; import net.minecraft.util.WeightedRandomChestContent; +import net.minecraft.world.WorldProvider; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.structure.MapGenStructureIO; import net.minecraftforge.common.*; import net.minecraftforge.common.BiomeDictionary.Type; import net.minecraftforge.common.BiomeManager.BiomeEntry; import net.minecraftforge.common.config.Configuration; -import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.event.world.WorldEvent; import net.minecraftforge.fluids.*; import net.minecraftforge.oredict.OreDictionary; +import com.shinoow.abyssalcraft.api.AbyssalCraftAPI; +import com.shinoow.abyssalcraft.api.item.ItemEngraving; +import com.shinoow.abyssalcraft.api.item.ItemUpgradeKit; import com.shinoow.abyssalcraft.common.*; import com.shinoow.abyssalcraft.common.blocks.*; import com.shinoow.abyssalcraft.common.blocks.itemblock.*; @@ -59,8 +61,7 @@ import com.shinoow.abyssalcraft.common.util.*; import com.shinoow.abyssalcraft.common.world.*; import com.shinoow.abyssalcraft.common.world.biome.*; -import com.shinoow.abyssalcraft.core.api.item.ItemUpgradeKit; -import com.shinoow.abyssalcraft.core.util.CoreRegistry; +import com.shinoow.abyssalcraft.integration.thaumcraft.ACThaumcraftIntegration; import com.shinoow.abyssalcraft.update.IUpdateProxy; import cpw.mods.fml.client.event.ConfigChangedEvent; @@ -71,10 +72,10 @@ import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.*; -@Mod(modid = AbyssalCraft.modid, name = AbyssalCraft.name, version = AbyssalCraft.version, dependencies = "required-after:Forge@[forgeversion,);required-after:accore", useMetadata = false, guiFactory = "com.shinoow.abyssalcraft.client.config.ACGuiFactory") +@Mod(modid = AbyssalCraft.modid, name = AbyssalCraft.name, version = AbyssalCraft.version, dependencies = "required-after:Forge@[forgeversion,);after:Thaumcraft", useMetadata = false, guiFactory = "com.shinoow.abyssalcraft.client.config.ACGuiFactory") public class AbyssalCraft { - public static final String version = "1.7.8.1"; + public static final String version = "1.8.0"; public static final String modid = "abyssalcraft"; public static final String name = "AbyssalCraft"; @@ -119,7 +120,8 @@ public class AbyssalCraft { dreadiumblock, transmutator, transmutator_on, dreadguardspawner, chagarothspawner, chagarothfistspawner, DrTfence, nitreOre, AbyIroOre, AbyGolOre, AbyDiaOre, AbyNitOre, AbyTinOre, AbyCopOre, AbyPCorOre, AbyLCorOre, solidLava, ethaxium, ethaxiumbrick, ethaxiumpillar, ethaxiumstairs, - ethaxiumslab1, ethaxiumslab2, ethaxiumfence, omotholstone, ethaxiumblock, omotholportal, omotholfire; + ethaxiumslab1, ethaxiumslab2, ethaxiumfence, omotholstone, ethaxiumblock, omotholportal, omotholfire, + engraver, engraver_on; //Overworld biomes public static BiomeGenBase Darklands, DarklandsForest, DarklandsPlains, DarklandsHills, @@ -138,7 +140,9 @@ public class AbyssalCraft { //misc items public static Item OC, Staff, portalPlacer, Cbucket, PSDLfinder, EoA, portalPlacerDL, cbrick, cudgel, carbonCluster, denseCarbonCluster, methane, nitre, sulfur, portalPlacerJzh, - tinIngot, copperIngot, lifeCrystal, coin; + tinIngot, copperIngot, lifeCrystal, shoggothFlesh, eldritchScale, omotholFlesh; + //coin stuff + public static Item coin, cthulhuCoin, elderCoin, jzaharCoin, engravingBlank, engravingCthulhu, engravingElder, engravingJzahar; //crystals (real elements) public static Item crystalIron, crystalGold, crystalSulfur, crystalCarbon, crystalOxygen, crystalHydrogen, crystalNitrogen, crystalPhosphorus, crystalPotassium, crystalTin, crystalCopper, @@ -149,7 +153,7 @@ public class AbyssalCraft { public static Item crystalRedstone, crystalAbyssalnite, crystalCoralium, crystalDreadium, crystalBlaze; //shadow items - public static Item shadowfragment, shadowshard, shadowgem, oblivionshard, soulReaper; + public static Item shadowfragment, shadowshard, shadowgem, oblivionshard, soulReaper, shadowPlate; //dread items public static Item Dreadshard, dreadchunk, dreadiumingot, dreadfragment, dreadcloth, dreadplate, dreadblade, dreadKey; //abyssalnite items @@ -181,7 +185,7 @@ public class AbyssalCraft { public static Potion Cplague, Dplague, antiMatter; - public static Enchantment coraliumE, dreadE, ironWall, lightPierce; + public static Enchantment coraliumE, dreadE, lightPierce, ironWall; public static CreativeTabs tabBlock = new TabACBlocks(CreativeTabs.getNextID(), "acblocks"); public static CreativeTabs tabItems = new TabACItems(CreativeTabs.getNextID(), "acitems"); @@ -190,6 +194,7 @@ public class AbyssalCraft { public static CreativeTabs tabFood = new TabACFood(CreativeTabs.getNextID(), "acfood"); public static CreativeTabs tabDecoration = new TabACDecoration(CreativeTabs.getNextID(), "acdblocks"); public static CreativeTabs tabCrystals = new TabACCrystals(CreativeTabs.getNextID(), "accrystals"); + public static CreativeTabs tabCoins = new TabACCoins(CreativeTabs.getNextID(), "accoins"); //Dimension Ids public static int configDimId1, configDimId2, configDimId3, configDimId4; @@ -201,13 +206,15 @@ public class AbyssalCraft { public static boolean dark1, dark2, dark3, dark4, dark5, coralium1, coralium2; public static boolean darkspawn1, darkspawn2, darkspawn3, darkspawn4, darkspawn5, coraliumspawn1, coraliumspawn2; + public static int darkWeight1, darkWeight2, darkWeight3, darkWeight4, darkWeight5, coraliumWeight; - public static boolean shouldSpread, shouldInfect, breakLogic, destroyOcean; + public static boolean shouldSpread, shouldInfect, breakLogic, destroyOcean, canRenderStarspawn; static int startEntityId = 300; public static final int crystallizerGuiID = 30; public static final int transmutatorGuiID = 31; + public static final int engraverGuiID = 32; @EventHandler public void preInit(FMLPreInitializationEvent event) { @@ -216,6 +223,7 @@ public void preInit(FMLPreInitializationEvent event) { metadata = event.getModMetadata(); MinecraftForge.EVENT_BUS.register(new AbyssalCraftEventHooks()); + FMLCommonHandler.instance().bus().register(new AbyssalCraftEventHooks()); MinecraftForge.EVENT_BUS.register(this); NetworkRegistry.INSTANCE.registerGuiHandler(this, new CommonProxy()); instance = this; @@ -223,25 +231,10 @@ public void preInit(FMLPreInitializationEvent event) { cfg = new Configuration(event.getSuggestedConfigurationFile()); syncConfig(); - - EnumHelper.addArmorMaterial("Abyssalnite", 35, new int[]{3, 8, 6, 3}, 13); - EnumHelper.addArmorMaterial("AbyssalniteC", 36, new int[]{3, 8, 6, 3}, 30); - EnumHelper.addArmorMaterial("Dread", 36, new int[]{3, 8, 6, 3}, 15); - EnumHelper.addArmorMaterial("Coralium", 37, new int[]{3, 8, 6, 3}, 14); - EnumHelper.addArmorMaterial("CoraliumP", 55, new int[]{4, 9, 7, 4}, 14); - EnumHelper.addArmorMaterial("Depths", 33, new int[]{3, 8, 6, 3}, 25); - EnumHelper.addArmorMaterial("Dreadium", 40, new int[]{3, 8, 6, 3}, 15); - EnumHelper.addArmorMaterial("DreadiumS", 45, new int[]{3, 8, 6, 3}, 20); - EnumHelper.addArmorMaterial("Ethaxium", 50, new int[]{3, 8, 6, 3}, 25); - - EnumHelper.addToolMaterial("DARKSTONE", 1, 180, 5.0F, 1, 5); - EnumHelper.addToolMaterial("ABYSSALNITE", 4, 1261, 13.0F, 4, 13); - EnumHelper.addToolMaterial("CORALIUM", 5, 2000, 14.0F, 5, 14); - EnumHelper.addToolMaterial("DREADIUM", 6, 3000, 15.0F, 6, 15); - EnumHelper.addToolMaterial("ABYSSALNITE_C", 8, 8000, 20.0F, 8, 30); - EnumHelper.addToolMaterial("ETHAXIUM", 8, 4000, 16.0F, 8, 20); - - EnumHelper.addCreatureAttribute("SHADOW"); + AbyssalCraftAPI.initPotionReflection(Loader.isModLoaded("DragonAPI")); + if(canRenderStarspawn == true) + ACLogger.info("RenderPlayer Override enabled, the Coralium Longbow will render twice in your hand now."); + else ACLogger.info("RenderPlayer Override disabled, Compatibility level +100."); CFluid = new Fluid("liquidcoralium").setDensity(3000).setViscosity(1000).setTemperature(350); antifluid = new Fluid("liquidantimatter").setDensity(4000).setViscosity(1500).setTemperature(100); @@ -271,7 +264,7 @@ public void preInit(FMLPreInitializationEvent event) { abyslab1 = new BlockACSingleSlab(abyslab1, abyslab2, Material.rock, "pickaxe", 2).setCreativeTab(AbyssalCraft.tabBlock).setStepSound(Block.soundTypeStone).setHardness(1.8F).setResistance(12.0F).setBlockName("ASBs1").setBlockTextureName(modid + ":" + "ASB"); abyslab2 = new BlockACDoubleSlab(abyslab1, abyslab2, Material.rock, "pickaxe", 2).setStepSound(Block.soundTypeStone).setHardness(1.8F).setResistance(12.0F).setBlockName("ASBs2").setBlockTextureName(modid + ":" + "ASB"); abystairs = new BlockACStairs(abybrick, "pickaxe", 2).setStepSound(Block.soundTypeStone).setHardness(1.65F).setResistance(12.0F).setBlockName("ASBs"); - Coraliumore = new BlockACOre(2, 3.0F, 6.0F).setBlockName("CO").setBlockTextureName(modid + ":" + "CO"); + Coraliumore = new BlockACOre(2, 3.0F, 6000.0F).setBlockName("CO").setBlockTextureName(modid + ":" + "CO"); abyore = new BlockACOre(2, 3.0F, 6.0F).setBlockName("AO").setBlockTextureName(modid + ":" + "AO"); abyfence = new BlockACFence("ASBf", Material.rock, "pickaxe", 2).setHardness(1.8F).setResistance(12.0F).setStepSound(Block.soundTypeStone).setBlockName("ASBf").setBlockTextureName(modid + ":" + "ASBf"); DSCwall = new BlockDarkstonecobblewall(Darkstone_cobble).setHardness(1.65F).setResistance(12.0F).setStepSound(Block.soundTypeStone).setBlockName("DSCw").setBlockTextureName(modid + ":" + "DSC"); @@ -367,6 +360,8 @@ public void preInit(FMLPreInitializationEvent event) { ethaxiumblock = new IngotBlock(8).setResistance(Float.MAX_VALUE).setBlockName("BOE").setBlockTextureName(modid + ":" + "BOE"); omotholportal = new BlockOmotholPortal().setBlockName("OG").setBlockTextureName(modid + ":" + "OG"); omotholfire = new BlockOmotholFire().setLightLevel(1.0F).setBlockName("Ofire"); + engraver = new BlockEngraver(false).setHardness(2.5F).setResistance(12.0F).setStepSound(Block.soundTypeStone).setBlockName("engraver"); + engraver_on = new BlockEngraver(true).setHardness(2.5F).setResistance(12.0F).setStepSound(Block.soundTypeStone).setLightLevel(0.875F).setBlockName("engraver"); //Biome Darklands = new BiomeGenDarklands(configBiomeId1).setColor(522674).setBiomeName("Darklands"); @@ -395,22 +390,32 @@ public void preInit(FMLPreInitializationEvent event) { PSDLfinder = new ItemTrackerPSDL().setCreativeTab(AbyssalCraft.tabItems).setUnlocalizedName("PSDLf").setTextureName(modid + ":" + "PSDLf"); EoA = new ItemEoA().setCreativeTab(AbyssalCraft.tabItems).setUnlocalizedName("EoA").setTextureName(modid + ":" + "EoA"); portalPlacerDL = new ItemPortalPlacerDL().setUnlocalizedName("GKD").setTextureName(modid + ":" + "GKD"); - cbrick = new ItemACBasic("cbrick").setCreativeTab(AbyssalCraft.tabItems); + cbrick = new ItemACBasic("cbrick"); cudgel = new ItemCudgel().setCreativeTab(AbyssalCraft.tabCombat).setFull3D().setUnlocalizedName("cudgel").setTextureName(modid + ":" + "cudgel"); - carbonCluster = new ItemACBasic("CarbC").setCreativeTab(AbyssalCraft.tabItems); - denseCarbonCluster = new ItemACBasic("DCarbC").setCreativeTab(AbyssalCraft.tabItems); - methane = new ItemACBasic("methane").setCreativeTab(AbyssalCraft.tabItems); - nitre = new ItemACBasic("nitre").setCreativeTab(AbyssalCraft.tabItems); - sulfur = new ItemACBasic("sulfur").setCreativeTab(AbyssalCraft.tabItems); + carbonCluster = new ItemACBasic("CarbC"); + denseCarbonCluster = new ItemACBasic("DCarbC"); + methane = new ItemACBasic("methane"); + nitre = new ItemACBasic("nitre"); + sulfur = new ItemACBasic("sulfur"); portalPlacerJzh = new ItemPortalPlacerJzh().setUnlocalizedName("GKJ").setTextureName(modid + ":" + "GKJ"); - tinIngot = new ItemACBasic("IT").setCreativeTab(AbyssalCraft.tabItems); - copperIngot = new ItemACBasic("IC").setCreativeTab(AbyssalCraft.tabItems); - lifeCrystal = new ItemACBasic("lifeCrystal").setCreativeTab(AbyssalCraft.tabItems); - coin = new ItemCoin(); + tinIngot = new ItemACBasic("IT"); + copperIngot = new ItemACBasic("IC"); + lifeCrystal = new ItemACBasic("lifeCrystal"); + coin = new ItemCoin("coin"); + cthulhuCoin = new ItemCoin("cthulhucoin"); + elderCoin = new ItemCoin("eldercoin"); + jzaharCoin = new ItemCoin("jzaharcoin"); + engravingBlank = new ItemEngraving("blank", 50).setCreativeTab(AbyssalCraft.tabCoins).setTextureName(modid + ":" + "engraving_blank"); + engravingCthulhu = new ItemEngraving("cthulhu", 10).setCreativeTab(AbyssalCraft.tabCoins).setTextureName(modid + ":" + "engraving_cthulhu"); + engravingElder = new ItemEngraving("elder", 10).setCreativeTab(AbyssalCraft.tabCoins).setTextureName(modid + ":" + "engraving_elder"); + engravingJzahar = new ItemEngraving("jzahar", 10).setCreativeTab(AbyssalCraft.tabCoins).setTextureName(modid + ":" + "engraving_jzahar"); + shoggothFlesh = new ItemShoggothFlesh(); + eldritchScale = new ItemACBasic("eldritchscale"); + omotholFlesh = new ItemACBasic("omotholflesh"); //Ethaxium - ethaxium_brick = new ItemACBasic("EB").setCreativeTab(AbyssalCraft.tabItems); - ethaxiumIngot = new ItemACBasic("EI").setCreativeTab(AbyssalCraft.tabItems); + ethaxium_brick = new ItemACBasic("EB"); + ethaxiumIngot = new ItemACBasic("EI"); //anti-items antibucket = new ItemAntiBucket(anticwater).setCreativeTab(AbyssalCraft.tabItems).setContainerItem(Items.bucket).setUnlocalizedName("Antibucket").setTextureName(modid + ":" + "Antibucket"); @@ -418,7 +423,7 @@ public void preInit(FMLPreInitializationEvent event) { antiChicken = new ItemAntiFood("antiChicken"); antiPork = new ItemAntiFood("antiPork"); antiFlesh = new ItemAntiFood("antiFlesh"); - antiBone = new ItemACBasic("antiBone").setCreativeTab(AbyssalCraft.tabItems); + antiBone = new ItemACBasic("antiBone"); antiSpider_eye = new ItemAntiFood("antiSpider_eye"); //crystals @@ -449,24 +454,25 @@ public void preInit(FMLPreInitializationEvent event) { crystalZinc = new ItemCrystal("crystalZinc", 0xD7D8D9, "Zn"); //Shadow items - shadowfragment = new ItemACBasic("SF").setCreativeTab(AbyssalCraft.tabItems); - shadowshard = new ItemACBasic("SS").setCreativeTab(AbyssalCraft.tabItems); - shadowgem = new ItemACBasic("SG").setCreativeTab(AbyssalCraft.tabItems); - oblivionshard = new ItemACBasic("OS").setCreativeTab(AbyssalCraft.tabItems); + shadowfragment = new ItemACBasic("SF"); + shadowshard = new ItemACBasic("SS"); + shadowgem = new ItemACBasic("SG"); + oblivionshard = new ItemACBasic("OS"); + shadowPlate = new ItemACBasic("shadowplate"); //Dread items - Dreadshard = new ItemACBasic("DSOA").setCreativeTab(AbyssalCraft.tabItems); - dreadchunk = new ItemACBasic("DAC").setCreativeTab(AbyssalCraft.tabItems); - dreadiumingot = new ItemACBasic("DI").setCreativeTab(AbyssalCraft.tabItems); - dreadfragment = new ItemACBasic("DF").setCreativeTab(AbyssalCraft.tabItems); - dreadcloth = new ItemACBasic("DC").setCreativeTab(AbyssalCraft.tabItems); - dreadplate = new ItemACBasic("DPP").setCreativeTab(AbyssalCraft.tabItems); - dreadblade = new ItemACBasic("DB").setCreativeTab(AbyssalCraft.tabItems); - dreadKey = new ItemACBasic("DK").setCreativeTab(AbyssalCraft.tabItems); + Dreadshard = new ItemACBasic("DSOA"); + dreadchunk = new ItemACBasic("DAC"); + dreadiumingot = new ItemACBasic("DI"); + dreadfragment = new ItemACBasic("DF"); + dreadcloth = new ItemACBasic("DC"); + dreadplate = new ItemACBasic("DPP"); + dreadblade = new ItemACBasic("DB"); + dreadKey = new ItemACBasic("DK"); //Abyssalnite items - abychunk = new ItemACBasic("AC").setCreativeTab(AbyssalCraft.tabItems); - abyingot = new ItemACBasic("AI").setCreativeTab(AbyssalCraft.tabItems); + abychunk = new ItemACBasic("AC"); + abyingot = new ItemACBasic("AI"); //Coralium items Coraliumcluster2 = new ItemCoraliumcluster("2").setCreativeTab(AbyssalCraft.tabItems).setUnlocalizedName("CGCA").setTextureName(modid + ":" + "CGCA"); @@ -477,88 +483,88 @@ public void preInit(FMLPreInitializationEvent event) { Coraliumcluster7 = new ItemCoraliumcluster("7").setCreativeTab(AbyssalCraft.tabItems).setUnlocalizedName("CGCF").setTextureName(modid + ":" + "CGCF"); Coraliumcluster8 = new ItemCoraliumcluster("8").setCreativeTab(AbyssalCraft.tabItems).setUnlocalizedName("CGCG").setTextureName(modid + ":" + "CGCG"); Coraliumcluster9 = new ItemCoraliumcluster("9").setCreativeTab(AbyssalCraft.tabItems).setUnlocalizedName("CGCH").setTextureName(modid + ":" + "CGCH"); - Cpearl = new ItemACBasic("CP").setCreativeTab(AbyssalCraft.tabItems); - Cchunk = new ItemACBasic("CC").setCreativeTab(AbyssalCraft.tabItems); - Cingot = new ItemACBasic("RCI").setCreativeTab(AbyssalCraft.tabItems); - Cplate = new ItemACBasic("CPP").setCreativeTab(AbyssalCraft.tabItems); - Coralium = new ItemACBasic("CG").setCreativeTab(AbyssalCraft.tabItems); + Cpearl = new ItemACBasic("CP"); + Cchunk = new ItemACBasic("CC"); + Cingot = new ItemACBasic("RCI"); + Cplate = new ItemACBasic("CPP"); + Coralium = new ItemACBasic("CG"); Corb = new ItemCorb().setCreativeTab(AbyssalCraft.tabTools).setUnlocalizedName("TG").setTextureName(modid + ":" + "TG"); Corflesh = new ItemCorflesh(2, 0.1F, false).setCreativeTab(AbyssalCraft.tabFood).setUnlocalizedName("CF").setTextureName(modid + ":" + "CF"); Corbone = new ItemCorbone(2, 0.1F, false).setCreativeTab(AbyssalCraft.tabFood).setUnlocalizedName("CB").setTextureName(modid + ":" + "CB"); corbow = new ItemCoraliumBow(20.0F, 0, 8, 16).setUnlocalizedName("Corbow").setTextureName(modid + ":" + "Corbow"); //Tools - pickaxe = new ItemDarkstonePickaxe(Enum.valueOf(ToolMaterial.class, "DARKSTONE")).setCreativeTab(AbyssalCraft.tabTools).setUnlocalizedName("DP").setTextureName(modid + ":" + "DP"); - axe = new ItemDarkstoneAxe(Enum.valueOf(ToolMaterial.class, "DARKSTONE")).setCreativeTab(AbyssalCraft.tabTools).setUnlocalizedName("DA").setTextureName(modid + ":" + "DA"); - shovel = new ItemDarkstoneShovel(Enum.valueOf(ToolMaterial.class, "DARKSTONE")).setCreativeTab(AbyssalCraft.tabTools).setUnlocalizedName("DS").setTextureName(modid + ":" + "DS"); + pickaxe = new ItemDarkstonePickaxe(AbyssalCraftAPI.darkstoneTool).setCreativeTab(AbyssalCraft.tabTools).setUnlocalizedName("DP").setTextureName(modid + ":" + "DP"); + axe = new ItemDarkstoneAxe(AbyssalCraftAPI.darkstoneTool).setCreativeTab(AbyssalCraft.tabTools).setUnlocalizedName("DA").setTextureName(modid + ":" + "DA"); + shovel = new ItemDarkstoneShovel(AbyssalCraftAPI.darkstoneTool).setCreativeTab(AbyssalCraft.tabTools).setUnlocalizedName("DS").setTextureName(modid + ":" + "DS"); sword = new ItemDarkstoneSword(EnumToolMaterialAC.DARKSTONE).setCreativeTab(AbyssalCraft.tabCombat).setUnlocalizedName("DSW").setTextureName(modid + ":" + "DSW"); - hoe = new ItemDarkstoneHoe(Enum.valueOf(ToolMaterial.class, "DARKSTONE")).setCreativeTab(AbyssalCraft.tabTools).setUnlocalizedName("DH").setTextureName(modid + ":" + "DH"); - pickaxeA = new ItemAbyssalnitePickaxe(Enum.valueOf(ToolMaterial.class, "ABYSSALNITE")).setCreativeTab(AbyssalCraft.tabTools).setUnlocalizedName("AP").setTextureName(modid + ":" + "AP"); - axeA = new ItemAbyssalniteAxe(Enum.valueOf(ToolMaterial.class, "ABYSSALNITE")).setCreativeTab(AbyssalCraft.tabTools).setUnlocalizedName("AA").setTextureName(modid + ":" + "AA"); - shovelA = new ItemAbyssalniteShovel(Enum.valueOf(ToolMaterial.class, "ABYSSALNITE")).setCreativeTab(AbyssalCraft.tabTools).setUnlocalizedName("AS").setTextureName(modid + ":" + "AS"); + hoe = new ItemDarkstoneHoe(AbyssalCraftAPI.darkstoneTool).setCreativeTab(AbyssalCraft.tabTools).setUnlocalizedName("DH").setTextureName(modid + ":" + "DH"); + pickaxeA = new ItemAbyssalnitePickaxe(AbyssalCraftAPI.abyssalniteTool).setCreativeTab(AbyssalCraft.tabTools).setUnlocalizedName("AP").setTextureName(modid + ":" + "AP"); + axeA = new ItemAbyssalniteAxe(AbyssalCraftAPI.abyssalniteTool).setCreativeTab(AbyssalCraft.tabTools).setUnlocalizedName("AA").setTextureName(modid + ":" + "AA"); + shovelA = new ItemAbyssalniteShovel(AbyssalCraftAPI.abyssalniteTool).setCreativeTab(AbyssalCraft.tabTools).setUnlocalizedName("AS").setTextureName(modid + ":" + "AS"); swordA = new ItemAbyssalniteSword(EnumToolMaterialAC.ABYSSALNITE).setCreativeTab(AbyssalCraft.tabCombat).setUnlocalizedName("ASW").setTextureName(modid + ":" + "ASW"); - hoeA = new ItemAbyssalniteHoe(Enum.valueOf(ToolMaterial.class, "ABYSSALNITE")).setCreativeTab(AbyssalCraft.tabTools).setUnlocalizedName("AH").setTextureName(modid + ":" + "AH"); - pickaxeC = new ItemAbyssalniteCPickaxe(Enum.valueOf(ToolMaterial.class, "ABYSSALNITE_C")).setCreativeTab(AbyssalCraft.tabTools).setUnlocalizedName("CIAP").setTextureName(modid + ":" + "CIAP"); - axeC = new ItemAbyssalniteCAxe(Enum.valueOf(ToolMaterial.class, "ABYSSALNITE_C")).setCreativeTab(AbyssalCraft.tabTools).setUnlocalizedName("CIAA").setTextureName(modid + ":" + "CIAA"); - shovelC = new ItemAbyssalniteCShovel(Enum.valueOf(ToolMaterial.class, "ABYSSALNITE_C")).setCreativeTab(AbyssalCraft.tabTools).setUnlocalizedName("CIAS").setTextureName(modid + ":" + "CIAS"); + hoeA = new ItemAbyssalniteHoe(AbyssalCraftAPI.abyssalniteTool).setCreativeTab(AbyssalCraft.tabTools).setUnlocalizedName("AH").setTextureName(modid + ":" + "AH"); + pickaxeC = new ItemAbyssalniteCPickaxe(AbyssalCraftAPI.coraliumInfusedAbyssalniteTool).setCreativeTab(AbyssalCraft.tabTools).setUnlocalizedName("CIAP").setTextureName(modid + ":" + "CIAP"); + axeC = new ItemAbyssalniteCAxe(AbyssalCraftAPI.coraliumInfusedAbyssalniteTool).setCreativeTab(AbyssalCraft.tabTools).setUnlocalizedName("CIAA").setTextureName(modid + ":" + "CIAA"); + shovelC = new ItemAbyssalniteCShovel(AbyssalCraftAPI.coraliumInfusedAbyssalniteTool).setCreativeTab(AbyssalCraft.tabTools).setUnlocalizedName("CIAS").setTextureName(modid + ":" + "CIAS"); swordC = new ItemAbyssalniteCSword(EnumToolMaterialAC.ABYSSALNITE_C).setCreativeTab(AbyssalCraft.tabCombat).setUnlocalizedName("CIASW").setTextureName(modid + ":" + "CIASW"); - hoeC = new ItemAbyssalniteCHoe(Enum.valueOf(ToolMaterial.class, "ABYSSALNITE_C")).setCreativeTab(AbyssalCraft.tabTools).setUnlocalizedName("CIAH").setTextureName(modid + ":" + "CIAH"); - Corpickaxe = new ItemCoraliumPickaxe(Enum.valueOf(ToolMaterial.class, "CORALIUM")).setCreativeTab(AbyssalCraft.tabTools).setUnlocalizedName("RCP").setTextureName(modid + ":" + "RCP"); - Coraxe = new ItemCoraliumAxe(Enum.valueOf(ToolMaterial.class, "CORALIUM")).setCreativeTab(AbyssalCraft.tabTools).setUnlocalizedName("RCA").setTextureName(modid + ":" + "RCA"); - Corshovel = new ItemCoraliumShovel(Enum.valueOf(ToolMaterial.class, "CORALIUM")).setCreativeTab(AbyssalCraft.tabTools).setUnlocalizedName("RCS").setTextureName(modid + ":" + "RCS"); + hoeC = new ItemAbyssalniteCHoe(AbyssalCraftAPI.coraliumInfusedAbyssalniteTool).setCreativeTab(AbyssalCraft.tabTools).setUnlocalizedName("CIAH").setTextureName(modid + ":" + "CIAH"); + Corpickaxe = new ItemCoraliumPickaxe(AbyssalCraftAPI.refinedCoraliumTool).setCreativeTab(AbyssalCraft.tabTools).setUnlocalizedName("RCP").setTextureName(modid + ":" + "RCP"); + Coraxe = new ItemCoraliumAxe(AbyssalCraftAPI.refinedCoraliumTool).setCreativeTab(AbyssalCraft.tabTools).setUnlocalizedName("RCA").setTextureName(modid + ":" + "RCA"); + Corshovel = new ItemCoraliumShovel(AbyssalCraftAPI.refinedCoraliumTool).setCreativeTab(AbyssalCraft.tabTools).setUnlocalizedName("RCS").setTextureName(modid + ":" + "RCS"); Corsword = new ItemCoraliumSword(EnumToolMaterialAC.CORALIUM).setCreativeTab(AbyssalCraft.tabCombat).setUnlocalizedName("RCSW").setTextureName(modid + ":" + "RCSW"); - Corhoe = new ItemCoraliumHoe(Enum.valueOf(ToolMaterial.class, "CORALIUM")).setCreativeTab(AbyssalCraft.tabTools).setUnlocalizedName("RCH").setTextureName(modid + ":" + "RCH"); - dreadiumpickaxe = new ItemDreadiumPickaxe(Enum.valueOf(ToolMaterial.class, "DREADIUM")).setCreativeTab(AbyssalCraft.tabTools).setUnlocalizedName("DDP").setTextureName(modid + ":" + "DDP"); - dreadiumaxe = new ItemDreadiumAxe(Enum.valueOf(ToolMaterial.class, "DREADIUM")).setCreativeTab(AbyssalCraft.tabTools).setUnlocalizedName("DDA").setTextureName(modid + ":" + "DDA"); - dreadiumshovel = new ItemDreadiumShovel(Enum.valueOf(ToolMaterial.class, "DREADIUM")).setCreativeTab(AbyssalCraft.tabTools).setUnlocalizedName("DDS").setTextureName(modid + ":" + "DDS"); + Corhoe = new ItemCoraliumHoe(AbyssalCraftAPI.refinedCoraliumTool).setCreativeTab(AbyssalCraft.tabTools).setUnlocalizedName("RCH").setTextureName(modid + ":" + "RCH"); + dreadiumpickaxe = new ItemDreadiumPickaxe(AbyssalCraftAPI.dreadiumTool).setCreativeTab(AbyssalCraft.tabTools).setUnlocalizedName("DDP").setTextureName(modid + ":" + "DDP"); + dreadiumaxe = new ItemDreadiumAxe(AbyssalCraftAPI.dreadiumTool).setCreativeTab(AbyssalCraft.tabTools).setUnlocalizedName("DDA").setTextureName(modid + ":" + "DDA"); + dreadiumshovel = new ItemDreadiumShovel(AbyssalCraftAPI.dreadiumTool).setCreativeTab(AbyssalCraft.tabTools).setUnlocalizedName("DDS").setTextureName(modid + ":" + "DDS"); dreadiumsword = new ItemDreadiumSword(EnumToolMaterialAC.DREADIUM).setCreativeTab(AbyssalCraft.tabCombat).setUnlocalizedName("DDSW").setTextureName(modid + ":" + "DDSW"); - dreadiumhoe = new ItemDreadiumHoe(Enum.valueOf(ToolMaterial.class, "DREADIUM")).setCreativeTab(AbyssalCraft.tabTools).setUnlocalizedName("DDH").setTextureName(modid + ":" + "DDH"); + dreadiumhoe = new ItemDreadiumHoe(AbyssalCraftAPI.dreadiumTool).setCreativeTab(AbyssalCraft.tabTools).setUnlocalizedName("DDH").setTextureName(modid + ":" + "DDH"); dreadhilt = new ItemDreadiumKatana("hilt", 5.0F, 200); dreadkatana = new ItemDreadiumKatana("katana", 20.0F, 2000); soulReaper = new ItemSoulReaper("soulReaper"); - ethPickaxe = new ItemEthaxiumPickaxe(Enum.valueOf(ToolMaterial.class, "ETHAXIUM")).setCreativeTab(AbyssalCraft.tabTools).setUnlocalizedName("EP").setTextureName(modid + ":" + "EP"); - ethAxe = new ItemEthaxiumAxe(Enum.valueOf(ToolMaterial.class, "ETHAXIUM")).setCreativeTab(AbyssalCraft.tabTools).setUnlocalizedName("EA").setTextureName(modid + ":" + "EA"); - ethShovel = new ItemEthaxiumShovel(Enum.valueOf(ToolMaterial.class, "ETHAXIUM")).setCreativeTab(AbyssalCraft.tabTools).setUnlocalizedName("ES").setTextureName(modid + ":" + "ES"); + ethPickaxe = new ItemEthaxiumPickaxe(AbyssalCraftAPI.ethaxiumTool).setCreativeTab(AbyssalCraft.tabTools).setUnlocalizedName("EP").setTextureName(modid + ":" + "EP"); + ethAxe = new ItemEthaxiumAxe(AbyssalCraftAPI.ethaxiumTool).setCreativeTab(AbyssalCraft.tabTools).setUnlocalizedName("EA").setTextureName(modid + ":" + "EA"); + ethShovel = new ItemEthaxiumShovel(AbyssalCraftAPI.ethaxiumTool).setCreativeTab(AbyssalCraft.tabTools).setUnlocalizedName("ES").setTextureName(modid + ":" + "ES"); ethSword = new ItemEthaxiumSword(EnumToolMaterialAC.ETHAXIUM).setCreativeTab(AbyssalCraft.tabCombat).setUnlocalizedName("ESW").setTextureName(modid + ":" + "ESW"); - ethHoe = new ItemEthaxiumHoe(Enum.valueOf(ToolMaterial.class, "ETHAXIUM")).setCreativeTab(AbyssalCraft.tabTools).setUnlocalizedName("EH").setTextureName(modid + ":" + "EH"); + ethHoe = new ItemEthaxiumHoe(AbyssalCraftAPI.ethaxiumTool).setCreativeTab(AbyssalCraft.tabTools).setUnlocalizedName("EH").setTextureName(modid + ":" + "EH"); //Armor - boots = new ItemAbyssalniteArmor(Enum.valueOf(ArmorMaterial.class, "Abyssalnite"), 5, 3).setUnlocalizedName("AAB").setTextureName(modid + ":" + "AAB"); - helmet = new ItemAbyssalniteArmor(Enum.valueOf(ArmorMaterial.class, "Abyssalnite"), 5, 0).setUnlocalizedName("AAH").setTextureName(modid + ":" + "AAh"); - plate = new ItemAbyssalniteArmor(Enum.valueOf(ArmorMaterial.class, "Abyssalnite"), 5, 1).setUnlocalizedName("AAC").setTextureName(modid + ":" + "AAC"); - legs = new ItemAbyssalniteArmor(Enum.valueOf(ArmorMaterial.class, "Abyssalnite"), 5, 2).setUnlocalizedName("AAP").setTextureName(modid + ":" + "AAP"); - bootsC = new ItemAbyssalniteCArmor(Enum.valueOf(ArmorMaterial.class, "AbyssalniteC"), 5, 3).setUnlocalizedName("ACIAB").setTextureName(modid + ":" + "ACIAB"); - helmetC = new ItemAbyssalniteCArmor(Enum.valueOf(ArmorMaterial.class, "AbyssalniteC"), 5, 0).setUnlocalizedName("ACIAH").setTextureName(modid + ":" + "ACIAH"); - plateC = new ItemAbyssalniteCArmor(Enum.valueOf(ArmorMaterial.class, "AbyssalniteC"), 5, 1).setUnlocalizedName("ACIAC").setTextureName(modid + ":" + "ACIAC"); - legsC = new ItemAbyssalniteCArmor(Enum.valueOf(ArmorMaterial.class, "AbyssalniteC"), 5, 2).setUnlocalizedName("ACIAP").setTextureName(modid + ":" + "ACIAP"); - bootsD = new ItemDreadArmor(Enum.valueOf(ArmorMaterial.class, "Dread"), 5, 3).setUnlocalizedName("ADAB").setTextureName(modid + ":" + "ADAB"); - helmetD = new ItemDreadArmor(Enum.valueOf(ArmorMaterial.class, "Dread"), 5, 0).setUnlocalizedName("ADAH").setTextureName(modid + ":" + "ADAH"); - plateD = new ItemDreadArmor(Enum.valueOf(ArmorMaterial.class, "Dread"), 5, 1).setUnlocalizedName("ADAC").setTextureName(modid + ":" + "ADAC"); - legsD = new ItemDreadArmor(Enum.valueOf(ArmorMaterial.class, "Dread"), 5, 2).setUnlocalizedName("ADAP").setTextureName(modid + ":" + "ADAP"); - Corboots = new ItemCoraliumArmor(Enum.valueOf(ArmorMaterial.class, "Coralium"), 5, 3).setUnlocalizedName("ACB").setTextureName(modid + ":" + "ACB"); - Corhelmet = new ItemCoraliumArmor(Enum.valueOf(ArmorMaterial.class, "Coralium"), 5, 0).setUnlocalizedName("ACH").setTextureName(modid + ":" + "ACH"); - Corplate = new ItemCoraliumArmor(Enum.valueOf(ArmorMaterial.class, "Coralium"), 5, 1).setUnlocalizedName("ACC").setTextureName(modid + ":" + "ACC"); - Corlegs = new ItemCoraliumArmor(Enum.valueOf(ArmorMaterial.class, "Coralium"), 5, 2).setUnlocalizedName("ACP").setTextureName(modid + ":" + "ACP"); - CorbootsP = new ItemCoraliumPArmor(Enum.valueOf(ArmorMaterial.class, "CoraliumP"), 5, 3).setUnlocalizedName("ACBP").setTextureName(modid + ":" + "ACBP"); - CorhelmetP = new ItemCoraliumPArmor(Enum.valueOf(ArmorMaterial.class, "CoraliumP"), 5, 0).setUnlocalizedName("ACHP").setTextureName(modid + ":" + "ACHP"); - CorplateP = new ItemCoraliumPArmor(Enum.valueOf(ArmorMaterial.class, "CoraliumP"), 5, 1).setUnlocalizedName("ACCP").setTextureName(modid + ":" + "ACCP"); - CorlegsP = new ItemCoraliumPArmor(Enum.valueOf(ArmorMaterial.class, "CoraliumP"), 5, 2).setUnlocalizedName("ACPP").setTextureName(modid + ":" + "ACPP"); - Depthsboots = new ItemDepthsArmor(Enum.valueOf(ArmorMaterial.class, "Depths"), 5, 3).setUnlocalizedName("ADB").setTextureName(modid + ":" + "ADB"); - Depthshelmet = new ItemDepthsArmor(Enum.valueOf(ArmorMaterial.class, "Depths"), 5, 0).setUnlocalizedName("ADH").setTextureName(modid + ":" + "ADH"); - Depthsplate = new ItemDepthsArmor(Enum.valueOf(ArmorMaterial.class, "Depths"), 5, 1).setUnlocalizedName("ADC").setTextureName(modid + ":" + "ADC"); - Depthslegs = new ItemDepthsArmor(Enum.valueOf(ArmorMaterial.class, "Depths"), 5, 2).setUnlocalizedName("ADP").setTextureName(modid + ":" + "ADP"); - dreadiumboots = new ItemDreadiumArmor(Enum.valueOf(ArmorMaterial.class, "Dreadium"), 5, 3).setUnlocalizedName("ADDB").setTextureName(modid + ":" + "ADDB"); - dreadiumhelmet = new ItemDreadiumArmor(Enum.valueOf(ArmorMaterial.class, "Dreadium"), 5, 0).setUnlocalizedName("ADDH").setTextureName(modid + ":" + "ADDH"); - dreadiumplate = new ItemDreadiumArmor(Enum.valueOf(ArmorMaterial.class, "Dreadium"), 5, 1).setUnlocalizedName("ADDC").setTextureName(modid + ":" + "ADDC"); - dreadiumlegs = new ItemDreadiumArmor(Enum.valueOf(ArmorMaterial.class, "Dreadium"), 5, 2).setUnlocalizedName("ADDP").setTextureName(modid + ":" + "ADDP"); - dreadiumSboots = new ItemDreadiumSamuraiArmor(Enum.valueOf(ArmorMaterial.class, "DreadiumS"), 5, 3).setUnlocalizedName("ADSB").setTextureName(modid + ":" + "ADSB"); - dreadiumShelmet = new ItemDreadiumSamuraiArmor(Enum.valueOf(ArmorMaterial.class, "DreadiumS"), 5, 0).setUnlocalizedName("ADSH").setTextureName(modid + ":" + "ADSH"); - dreadiumSplate = new ItemDreadiumSamuraiArmor(Enum.valueOf(ArmorMaterial.class, "DreadiumS"), 5, 1).setUnlocalizedName("ADSC").setTextureName(modid + ":" + "ADSC"); - dreadiumSlegs = new ItemDreadiumSamuraiArmor(Enum.valueOf(ArmorMaterial.class, "DreadiumS"), 5, 2).setUnlocalizedName("ADSP").setTextureName(modid + ":" + "ADSP"); - ethBoots = new ItemEthaxiumArmor(Enum.valueOf(ArmorMaterial.class, "Ethaxium"), 5, 3).setUnlocalizedName("AEB").setTextureName(modid + ":" + "AEB"); - ethHelmet = new ItemEthaxiumArmor(Enum.valueOf(ArmorMaterial.class, "Ethaxium"), 5, 0).setUnlocalizedName("AEH").setTextureName(modid + ":" + "AEH"); - ethPlate = new ItemEthaxiumArmor(Enum.valueOf(ArmorMaterial.class, "Ethaxium"), 5, 1).setUnlocalizedName("AEC").setTextureName(modid + ":" + "AEC"); - ethLegs = new ItemEthaxiumArmor(Enum.valueOf(ArmorMaterial.class, "Ethaxium"), 5, 2).setUnlocalizedName("AEP").setTextureName(modid + ":" + "AEP"); + boots = new ItemAbyssalniteArmor(AbyssalCraftAPI.abyssalniteArmor, 5, 3).setUnlocalizedName("AAB").setTextureName(modid + ":" + "AAB"); + helmet = new ItemAbyssalniteArmor(AbyssalCraftAPI.abyssalniteArmor, 5, 0).setUnlocalizedName("AAH").setTextureName(modid + ":" + "AAh"); + plate = new ItemAbyssalniteArmor(AbyssalCraftAPI.abyssalniteArmor, 5, 1).setUnlocalizedName("AAC").setTextureName(modid + ":" + "AAC"); + legs = new ItemAbyssalniteArmor(AbyssalCraftAPI.abyssalniteArmor, 5, 2).setUnlocalizedName("AAP").setTextureName(modid + ":" + "AAP"); + bootsC = new ItemAbyssalniteCArmor(AbyssalCraftAPI.coraliumInfusedAbyssalniteArmor, 5, 3).setUnlocalizedName("ACIAB").setTextureName(modid + ":" + "ACIAB"); + helmetC = new ItemAbyssalniteCArmor(AbyssalCraftAPI.coraliumInfusedAbyssalniteArmor, 5, 0).setUnlocalizedName("ACIAH").setTextureName(modid + ":" + "ACIAH"); + plateC = new ItemAbyssalniteCArmor(AbyssalCraftAPI.coraliumInfusedAbyssalniteArmor, 5, 1).setUnlocalizedName("ACIAC").setTextureName(modid + ":" + "ACIAC"); + legsC = new ItemAbyssalniteCArmor(AbyssalCraftAPI.coraliumInfusedAbyssalniteArmor, 5, 2).setUnlocalizedName("ACIAP").setTextureName(modid + ":" + "ACIAP"); + bootsD = new ItemDreadArmor(AbyssalCraftAPI.dreadedAbyssalniteArmor, 5, 3).setUnlocalizedName("ADAB").setTextureName(modid + ":" + "ADAB"); + helmetD = new ItemDreadArmor(AbyssalCraftAPI.dreadedAbyssalniteArmor, 5, 0).setUnlocalizedName("ADAH").setTextureName(modid + ":" + "ADAH"); + plateD = new ItemDreadArmor(AbyssalCraftAPI.dreadedAbyssalniteArmor, 5, 1).setUnlocalizedName("ADAC").setTextureName(modid + ":" + "ADAC"); + legsD = new ItemDreadArmor(AbyssalCraftAPI.dreadedAbyssalniteArmor, 5, 2).setUnlocalizedName("ADAP").setTextureName(modid + ":" + "ADAP"); + Corboots = new ItemCoraliumArmor(AbyssalCraftAPI.refinedCoraliumArmor, 5, 3).setUnlocalizedName("ACB").setTextureName(modid + ":" + "ACB"); + Corhelmet = new ItemCoraliumArmor(AbyssalCraftAPI.refinedCoraliumArmor, 5, 0).setUnlocalizedName("ACH").setTextureName(modid + ":" + "ACH"); + Corplate = new ItemCoraliumArmor(AbyssalCraftAPI.refinedCoraliumArmor, 5, 1).setUnlocalizedName("ACC").setTextureName(modid + ":" + "ACC"); + Corlegs = new ItemCoraliumArmor(AbyssalCraftAPI.refinedCoraliumArmor, 5, 2).setUnlocalizedName("ACP").setTextureName(modid + ":" + "ACP"); + CorbootsP = new ItemCoraliumPArmor(AbyssalCraftAPI.platedCoraliumArmor, 5, 3).setUnlocalizedName("ACBP").setTextureName(modid + ":" + "ACBP"); + CorhelmetP = new ItemCoraliumPArmor(AbyssalCraftAPI.platedCoraliumArmor, 5, 0).setUnlocalizedName("ACHP").setTextureName(modid + ":" + "ACHP"); + CorplateP = new ItemCoraliumPArmor(AbyssalCraftAPI.platedCoraliumArmor, 5, 1).setUnlocalizedName("ACCP").setTextureName(modid + ":" + "ACCP"); + CorlegsP = new ItemCoraliumPArmor(AbyssalCraftAPI.platedCoraliumArmor, 5, 2).setUnlocalizedName("ACPP").setTextureName(modid + ":" + "ACPP"); + Depthsboots = new ItemDepthsArmor(AbyssalCraftAPI.depthsArmor, 5, 3).setUnlocalizedName("ADB").setTextureName(modid + ":" + "ADB"); + Depthshelmet = new ItemDepthsArmor(AbyssalCraftAPI.depthsArmor, 5, 0).setUnlocalizedName("ADH").setTextureName(modid + ":" + "ADH"); + Depthsplate = new ItemDepthsArmor(AbyssalCraftAPI.depthsArmor, 5, 1).setUnlocalizedName("ADC").setTextureName(modid + ":" + "ADC"); + Depthslegs = new ItemDepthsArmor(AbyssalCraftAPI.depthsArmor, 5, 2).setUnlocalizedName("ADP").setTextureName(modid + ":" + "ADP"); + dreadiumboots = new ItemDreadiumArmor(AbyssalCraftAPI.dreadiumArmor, 5, 3).setUnlocalizedName("ADDB").setTextureName(modid + ":" + "ADDB"); + dreadiumhelmet = new ItemDreadiumArmor(AbyssalCraftAPI.dreadiumArmor, 5, 0).setUnlocalizedName("ADDH").setTextureName(modid + ":" + "ADDH"); + dreadiumplate = new ItemDreadiumArmor(AbyssalCraftAPI.dreadiumArmor, 5, 1).setUnlocalizedName("ADDC").setTextureName(modid + ":" + "ADDC"); + dreadiumlegs = new ItemDreadiumArmor(AbyssalCraftAPI.dreadiumArmor, 5, 2).setUnlocalizedName("ADDP").setTextureName(modid + ":" + "ADDP"); + dreadiumSboots = new ItemDreadiumSamuraiArmor(AbyssalCraftAPI.dreadiumSamuraiArmor, 5, 3).setUnlocalizedName("ADSB").setTextureName(modid + ":" + "ADSB"); + dreadiumShelmet = new ItemDreadiumSamuraiArmor(AbyssalCraftAPI.dreadiumSamuraiArmor, 5, 0).setUnlocalizedName("ADSH").setTextureName(modid + ":" + "ADSH"); + dreadiumSplate = new ItemDreadiumSamuraiArmor(AbyssalCraftAPI.dreadiumSamuraiArmor, 5, 1).setUnlocalizedName("ADSC").setTextureName(modid + ":" + "ADSC"); + dreadiumSlegs = new ItemDreadiumSamuraiArmor(AbyssalCraftAPI.dreadiumSamuraiArmor, 5, 2).setUnlocalizedName("ADSP").setTextureName(modid + ":" + "ADSP"); + ethBoots = new ItemEthaxiumArmor(AbyssalCraftAPI.ethaxiumArmor, 5, 3).setUnlocalizedName("AEB").setTextureName(modid + ":" + "AEB"); + ethHelmet = new ItemEthaxiumArmor(AbyssalCraftAPI.ethaxiumArmor, 5, 0).setUnlocalizedName("AEH").setTextureName(modid + ":" + "AEH"); + ethPlate = new ItemEthaxiumArmor(AbyssalCraftAPI.ethaxiumArmor, 5, 1).setUnlocalizedName("AEC").setTextureName(modid + ":" + "AEC"); + ethLegs = new ItemEthaxiumArmor(AbyssalCraftAPI.ethaxiumArmor, 5, 2).setUnlocalizedName("AEP").setTextureName(modid + ":" + "AEP"); //Upgrade kits CobbleU = new ItemUpgradeKit("Wood", "Cobblestone").setCreativeTab(AbyssalCraft.tabItems).setUnlocalizedName("CobU").setTextureName(modid + ":" + "CobU"); @@ -571,13 +577,13 @@ public void preInit(FMLPreInitializationEvent event) { EthaxiumU = new ItemUpgradeKit("Dreadium", "Ethaxium").setCreativeTab(AbyssalCraft.tabItems).setUnlocalizedName("EthU").setTextureName(modid + ":" + "EthU"); //Foodstuffs - ironp = new ItemACBasic("plate").setCreativeTab(AbyssalCraft.tabItems); + ironp = new ItemACBasic("plate"); MRE = new ItemPlatefood(255, 1F, false).setUnlocalizedName("MRE").setTextureName(modid + ":" + "MRE"); chickenp = new ItemPlatefood(12, 1.2F, false).setUnlocalizedName("ChiP").setTextureName(modid + ":" + "ChiP"); porkp = new ItemPlatefood(16, 1.6F, false).setUnlocalizedName("PorP").setTextureName(modid + ":" + "PorP"); beefp = new ItemPlatefood(6, 0.6F, false).setUnlocalizedName("BeeP").setTextureName(modid + ":" + "BeeP"); fishp = new ItemPlatefood(10, 1.2F, false).setUnlocalizedName("FisP").setTextureName(modid + ":" + "FisP"); - dirtyplate = new ItemACBasic("dirtyplate").setCreativeTab(AbyssalCraft.tabItems); + dirtyplate = new ItemACBasic("dirtyplate"); friedegg = new ItemFriedegg(5, 0.6F, false).setCreativeTab(AbyssalCraft.tabFood).setUnlocalizedName("friedegg").setTextureName(modid + ":" + "friedegg"); eggp = new ItemPlatefood(10, 1.2F, false).setUnlocalizedName("eggp").setTextureName(modid + ":" + "eggp"); cloth = new ItemWashCloth().setCreativeTab(AbyssalCraft.tabItems).setUnlocalizedName("cloth").setTextureName(modid + ":" + "cloth"); @@ -597,26 +603,27 @@ public void preInit(FMLPreInitializationEvent event) { GameRegistry.registerTileEntity(TileEntityChagarothSpawner.class, "tileEntityChagarothSpawner"); GameRegistry.registerTileEntity(TileEntityChagarothFistSpawner.class, "tileEntityChagarothFistSpawner"); GameRegistry.registerTileEntity(TileEntityODB.class, "tileEntityODB"); + GameRegistry.registerTileEntity(TileEntityEngraver.class, "tileEntityEngraver"); Cplague = new PotionCplague(100, true, 0x00FFFF).setIconIndex(1, 0).setPotionName("potion.Cplague"); - CoreRegistry.addPotionRequirements(Cplague.id, "0 & 1 & !2 & 3 & 0+6"); + AbyssalCraftAPI.addPotionRequirements(Cplague.id, "0 & 1 & !2 & 3 & 0+6"); crystalCoralium.setPotionEffect("+0+1-2+3&4+4+13"); Dplague = new PotionDplague(101, true, 0xAD1313).setIconIndex(1, 0).setPotionName("potion.Dplague"); - CoreRegistry.addPotionRequirements(Dplague.id, "0 & 1 & 2 & 3 & 2+6"); - CoreRegistry.addPotionAmplifiers(Dplague.id, "5"); + AbyssalCraftAPI.addPotionRequirements(Dplague.id, "0 & 1 & 2 & 3 & 2+6"); + AbyssalCraftAPI.addPotionAmplifiers(Dplague.id, "5"); crystalDreadium.setPotionEffect("0+1+2+3+13&4-4"); antiMatter = new PotionAntimatter(102, true, 0xFFFFFF).setIconIndex(1, 0).setPotionName("potion.Antimatter"); - CoreRegistry.addPotionRequirements(antiMatter.id, "0 & 1 & 2 & !3 & 2+6"); + AbyssalCraftAPI.addPotionRequirements(antiMatter.id, "0 & 1 & 2 & !3 & 2+6"); antibucket.setPotionEffect("0+1+2-3+13&4-4"); crystalSulfur.setPotionEffect(PotionHelper.spiderEyeEffect); crystalOxygen.setPotionEffect(PotionHelper.field_151423_m); crystalHydrogen.setPotionEffect("-0-1+2+3&4-4+13"); crystalNitrogen.setPotionEffect("-0+1-2+3&4-4+13"); - coraliumE = new EnchantmentWeaponInfusion(150, 2, "coralium"); - dreadE = new EnchantmentWeaponInfusion(151, 2, "dread"); - lightPierce = new EnchantmentLightPierce(152); - // ironWall = new EnchantmentIronWall(153, 2); + coraliumE = new EnchantmentWeaponInfusion(AbyssalCraftAPI.enchId1, 2, "coralium"); + dreadE = new EnchantmentWeaponInfusion(AbyssalCraftAPI.enchId2, 2, "dread"); + lightPierce = new EnchantmentLightPierce(AbyssalCraftAPI.enchId3); + ironWall = new EnchantmentIronWall(AbyssalCraftAPI.enchId4, 2); //Block Register GameRegistry.registerBlock(Darkstone, "darkstone"); @@ -731,9 +738,11 @@ public void preInit(FMLPreInitializationEvent event) { GameRegistry.registerBlock(ethaxiumslab2, ItemBlockColorName.class, "ethaxiumbrickslab2"); GameRegistry.registerBlock(ethaxiumfence, ItemBlockColorName.class, "ethaxiumfence"); GameRegistry.registerBlock(ethaxiumblock, ItemBlockColorName.class, "ethaxiumblock"); - // GameRegistry.registerBlock(omotholstone, "omotholstone"); - // GameRegistry.registerBlock(omotholportal, "omotholportal"); - // GameRegistry.registerBlock(omotholfire, "omotholfire"); + GameRegistry.registerBlock(omotholstone, "omotholstone"); + GameRegistry.registerBlock(omotholportal, "omotholportal"); + GameRegistry.registerBlock(omotholfire, "omotholfire"); + GameRegistry.registerBlock(engraver, "engraver"); + GameRegistry.registerBlock(engraver_on, "engraver_on"); //Item Register GameRegistry.registerItem(devsword, "devsword"); @@ -908,6 +917,17 @@ public void preInit(FMLPreInitializationEvent event) { GameRegistry.registerItem(ethHoe, "ethaxiumhoe"); GameRegistry.registerItem(EthaxiumU, "ethaxiumu"); GameRegistry.registerItem(coin, "coin"); + GameRegistry.registerItem(cthulhuCoin, "cthulhucoin"); + // GameRegistry.registerItem(elderCoin, "eldercoin"); + // GameRegistry.registerItem(jzaharCoin, "jzaharcoin"); + GameRegistry.registerItem(engravingBlank, "engraving_blank"); + GameRegistry.registerItem(engravingCthulhu, "engraving_cthulhu"); + // GameRegistry.registerItem(engravingElder, "engraving_elder"); + // GameRegistry.registerItem(engravingJzahar, "engraving_jzahar"); + // GameRegistry.registerItem(shoggothFlesh, "shoggothflesh"); + // GameRegistry.registerItem(eldritchScale, "eldritchscale"); + // GameRegistry.registerItem(omotholFlesh, "omotholflesh"); + // GameRegistry.registerItem(shadowPlate, "shadowplate"); FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluidStack(CFluid.getName(), FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(Cbucket), new ItemStack(Items.bucket)); BucketHandler.INSTANCE.buckets.put(Cwater, Cbucket); @@ -918,27 +938,27 @@ public void preInit(FMLPreInitializationEvent event) { //Biome if(dark1 == true){ BiomeDictionary.registerBiomeType(Darklands, Type.WASTELAND); - BiomeManager.warmBiomes.add(new BiomeEntry(AbyssalCraft.Darklands, 10)); + BiomeManager.warmBiomes.add(new BiomeEntry(AbyssalCraft.Darklands, darkWeight1)); } if(dark2 == true){ BiomeDictionary.registerBiomeType(DarklandsForest, Type.FOREST); - BiomeManager.warmBiomes.add(new BiomeEntry(AbyssalCraft.DarklandsForest, 10)); + BiomeManager.warmBiomes.add(new BiomeEntry(AbyssalCraft.DarklandsForest, darkWeight2)); } if(dark3 == true){ BiomeDictionary.registerBiomeType(DarklandsPlains, Type.PLAINS); - BiomeManager.warmBiomes.add(new BiomeEntry(AbyssalCraft.DarklandsPlains, 10)); + BiomeManager.warmBiomes.add(new BiomeEntry(AbyssalCraft.DarklandsPlains, darkWeight3)); } if(dark4 == true){ BiomeDictionary.registerBiomeType(DarklandsHills, Type.HILLS); - BiomeManager.warmBiomes.add(new BiomeEntry(AbyssalCraft.DarklandsHills, 10)); + BiomeManager.warmBiomes.add(new BiomeEntry(AbyssalCraft.DarklandsHills, darkWeight4)); } if(dark5 == true){ BiomeDictionary.registerBiomeType(DarklandsMountains, Type.MOUNTAIN); - BiomeManager.warmBiomes.add(new BiomeEntry(AbyssalCraft.DarklandsMountains, 10)); + BiomeManager.warmBiomes.add(new BiomeEntry(AbyssalCraft.DarklandsMountains, darkWeight5)); } if(coralium1 == true){ BiomeDictionary.registerBiomeType(corswamp, Type.SWAMP); - BiomeManager.warmBiomes.add(new BiomeEntry(AbyssalCraft.corswamp, 10)); + BiomeManager.warmBiomes.add(new BiomeEntry(AbyssalCraft.corswamp, coraliumWeight)); } if(coralium2 == true){ BiomeDictionary.registerBiomeType(corocean, Type.WATER); @@ -960,18 +980,15 @@ public void preInit(FMLPreInitializationEvent event) { BiomeManager.addSpawnBiome(AbyssalCraft.corocean); //Dimension - CoreRegistry.registerDimension("abyss", configDimId1, WorldProviderAbyss.class, true); - CoreRegistry.registerDimension("dreadlands", configDimId2, WorldProviderDreadlands.class, true); - // CoreRegistry.registerDimension("omothol", configDimId3, WorldProviderOmothol.class, true); - // CoreRegistry.registerDimension("darkrealm", configDimId4, WorldProviderDarkRealm.class, true); + registerDimension("abyss", configDimId1, WorldProviderAbyss.class, true); + registerDimension("dreadlands", configDimId2, WorldProviderDreadlands.class, true); + registerDimension("omothol", configDimId3, WorldProviderOmothol.class, true); + registerDimension("darkrealm", configDimId4, WorldProviderDarkRealm.class, true); //Mobs EntityRegistry.registerModEntity(EntityDepthsGhoul.class, "depthsghoul", 25, this, 80, 3, true); - EntityRegistry.addSpawn(EntityDepthsGhoul.class, 3, 1, 3, EnumCreatureType.monster, new BiomeGenBase[] { - BiomeGenBase.swampland, BiomeGenBase.ocean, BiomeGenBase.beach, - BiomeGenBase.river,AbyssalCraft.Darklands, AbyssalCraft.Wastelands, - AbyssalCraft.DarklandsForest, AbyssalCraft.DarklandsHills, - AbyssalCraft.DarklandsPlains}); + EntityRegistry.addSpawn(EntityDepthsGhoul.class, 10, 1, 3, EnumCreatureType.monster, new BiomeGenBase[] { + BiomeGenBase.swampland, BiomeGenBase.ocean, BiomeGenBase.beach, BiomeGenBase.river}); registerEntityEgg(EntityDepthsGhoul.class, 0x36A880, 0x012626); EntityRegistry.registerModEntity(EntityEvilpig.class, "evilpig", 26, this, 80, 3, true); @@ -983,12 +1000,9 @@ public void preInit(FMLPreInitializationEvent event) { registerEntityEgg(EntityEvilpig.class, 15771042, 14377823); EntityRegistry.registerModEntity(EntityAbyssalZombie.class, "abyssalzombie", 27, this, 80, 3, true); - EntityRegistry.addSpawn(EntityAbyssalZombie.class, 3, 1, 3, EnumCreatureType.monster, new BiomeGenBase[] { - BiomeGenBase.ocean, BiomeGenBase.beach, BiomeGenBase.river, - BiomeGenBase.jungle, BiomeGenBase.swampland, - BiomeGenBase.sky, AbyssalCraft.Darklands, AbyssalCraft.Wastelands, - AbyssalCraft.DarklandsForest, AbyssalCraft.DarklandsHills, - AbyssalCraft.DarklandsPlains}); + EntityRegistry.addSpawn(EntityAbyssalZombie.class, 10, 1, 3, EnumCreatureType.monster, new BiomeGenBase[] { + BiomeGenBase.ocean, BiomeGenBase.beach, BiomeGenBase.river, BiomeGenBase.jungle, + BiomeGenBase.swampland, BiomeGenBase.sky}); registerEntityEgg(EntityAbyssalZombie.class, 0x36A880, 0x052824); EntityRegistry.registerModEntity(EntityODBPrimed.class, "Primed ODB", 28, this, 80, 3, true); @@ -997,25 +1011,17 @@ public void preInit(FMLPreInitializationEvent event) { registerEntityEgg(EntityJzahar.class, 0x133133, 0x342122); EntityRegistry.registerModEntity(EntityAbygolem.class, "abygolem", 30, this, 80, 3, true); - EntityRegistry.addSpawn(EntityAbygolem.class, 5, 1, 5, EnumCreatureType.creature, new BiomeGenBase[] { - AbyssalCraft.AbyDreadlands}); registerEntityEgg(EntityAbygolem.class, 0x8A00E6, 0x6100A1); EntityRegistry.registerModEntity(EntityDreadgolem.class, "dreadgolem", 31, this, 80, 3, true); - EntityRegistry.addSpawn(EntityDreadgolem.class, 5, 1, 5, EnumCreatureType.monster, new BiomeGenBase[] { - AbyssalCraft.Dreadlands}); registerEntityEgg(EntityDreadgolem.class, 0x1E60000, 0xCC0000); EntityRegistry.registerModEntity(EntityDreadguard.class, "dreadguard", 32, this, 80, 3, true); - EntityRegistry.addSpawn(EntityDreadguard.class, 1, 1, 1, EnumCreatureType.monster, new BiomeGenBase[] { - AbyssalCraft.MountainDreadlands}); registerEntityEgg(EntityDreadguard.class, 0xE60000, 0xCC0000); EntityRegistry.registerModEntity(EntityPSDLTracker.class, "PowerstoneTracker", 33, this, 64, 10, true); EntityRegistry.registerModEntity(EntityDragonMinion.class, "dragonminion", 34, this, 80, 3, true); - EntityRegistry.addSpawn(EntityDragonMinion.class, 1, 0, 1, EnumCreatureType.monster, new BiomeGenBase[] { - AbyssalCraft.Wastelands}); registerEntityEgg(EntityDragonMinion.class, 0x433434, 0x344344); EntityRegistry.registerModEntity(EntityDragonBoss.class, "dragonboss", 35, this, 80, 3, true); @@ -1024,23 +1030,15 @@ public void preInit(FMLPreInitializationEvent event) { EntityRegistry.registerModEntity(EntityODBcPrimed.class, "Primed ODB Core", 36, this, 80, 3, true); EntityRegistry.registerModEntity(EntityShadowCreature.class, "shadowcreature", 37, this, 80, 3, true); - EntityRegistry.addSpawn(EntityShadowCreature.class, 3, 1, 3, EnumCreatureType.monster, new BiomeGenBase[] { - AbyssalCraft.DarklandsMountains}); registerEntityEgg(EntityShadowCreature.class, 0, 0xFFFFFF); EntityRegistry.registerModEntity(EntityShadowMonster.class, "shadowmonster", 38, this, 80, 3, true); - EntityRegistry.addSpawn(EntityShadowMonster.class, 2, 1, 2, EnumCreatureType.monster, new BiomeGenBase[] { - AbyssalCraft.DarklandsMountains}); registerEntityEgg(EntityShadowMonster.class, 0, 0xFFFFFF); EntityRegistry.registerModEntity(EntityDreadling.class, "dreadling", 39, this, 80, 3, true); - EntityRegistry.addSpawn(EntityDreadling.class, 3, 1, 3, EnumCreatureType.monster, new BiomeGenBase[] { - AbyssalCraft.Dreadlands}); registerEntityEgg(EntityDreadling.class, 0xE60000, 0xCC0000); EntityRegistry.registerModEntity(EntityDreadSpawn.class, "dreadspawn", 40, this, 80, 3, true); - EntityRegistry.addSpawn(EntityDreadSpawn.class, 3, 1, 3, EnumCreatureType.monster, new BiomeGenBase[] { - AbyssalCraft.ForestDreadlands}); registerEntityEgg(EntityDreadSpawn.class, 0xE60000, 0xCC0000); EntityRegistry.registerModEntity(EntityDemonPig.class, "demonpig", 41, this, 80, 3, true); @@ -1049,8 +1047,6 @@ public void preInit(FMLPreInitializationEvent event) { registerEntityEgg(EntityDemonPig.class, 15771042, 14377823); EntityRegistry.registerModEntity(EntitySkeletonGoliath.class, "gskeleton", 42, this, 80, 3, true); - EntityRegistry.addSpawn(EntitySkeletonGoliath.class, 1, 1, 1, EnumCreatureType.monster, new BiomeGenBase[] { - AbyssalCraft.Wastelands}); registerEntityEgg(EntitySkeletonGoliath.class, 0xD6D6C9, 0xC6C7AD); EntityRegistry.registerModEntity(EntityChagarothSpawn.class, "chagarothspawn", 43, this, 80, 3, true); @@ -1063,8 +1059,6 @@ public void preInit(FMLPreInitializationEvent event) { registerEntityEgg(EntityChagaroth.class, 0xE60000, 0xCC0000); EntityRegistry.registerModEntity(EntityShadowBeast.class, "shadowbeast", 46, this, 80, 3, true); - EntityRegistry.addSpawn(EntityShadowBeast.class, 1, 1, 1, EnumCreatureType.monster, new BiomeGenBase[] { - AbyssalCraft.DarklandsMountains}); registerEntityEgg(EntityShadowBeast.class, 0, 0xFFFFFF); EntityRegistry.registerModEntity(EntitySacthoth.class, "shadowboss", 47, this, 80, 3, true); @@ -1160,8 +1154,12 @@ public void Init(FMLInitializationEvent event) { secret1 = new Achievement("achievement.secret1", "secret1", 9, -9, AbyssalCraft.devsword, (Achievement)null).initIndependentStat().registerStat(); summonChagaroth = new Achievement("achievement.summonChagaroth", "summonChagaroth", 3, 12, AbyssalCraft.dreadaltarbottom, AbyssalCraft.enterdreadlands).registerStat(); killChagaroth = new Achievement("achievement.killChagaroth", "killChagaroth", 6, 12, AbyssalCraft.dreadKey, AbyssalCraft.summonChagaroth).setSpecial().registerStat(); + enterOmothol = new Achievement("achievement.enterOmothol", "enterOmothol", 6, 15, AbyssalCraft.omotholstone, AbyssalCraft.killChagaroth).setSpecial().registerStat(); + enterDarkRealm = new Achievement("achievement.darkRealm", "darkRealm", 3, 15, AbyssalCraft.Darkstone, (Achievement)null).registerStat(); - AchievementPage.registerAchievementPage(new AchievementPage("AbyssalCraft", new Achievement[]{mineDS, mineAby, killghoul, enterabyss, killdragon, summonAsorah, killAsorah, enterdreadlands, killdreadguard, ghoulhead, killPete, killWilson, killOrange, petehead, wilsonhead, orangehead, mineCorgem, mineCor, findPSDL, GK1, GK2, GK3, Jzhstaff, secret1, summonChagaroth, killChagaroth})); + AchievementPage.registerAchievementPage(new AchievementPage("AbyssalCraft", new Achievement[]{mineDS, mineAby, killghoul, enterabyss, killdragon, summonAsorah, killAsorah, + enterdreadlands, killdreadguard, ghoulhead, killPete, killWilson, killOrange, petehead, wilsonhead, orangehead, mineCorgem, mineCor, findPSDL, GK1, GK2, GK3, Jzhstaff, + secret1, summonChagaroth, killChagaroth, enterOmothol, enterDarkRealm})); proxy.init(); FMLCommonHandler.instance().bus().register(instance); @@ -1171,10 +1169,29 @@ public void Init(FMLInitializationEvent event) { StructureDreadlandsMinePieces.registerStructurePieces(); GameRegistry.registerWorldGenerator(new AbyssalCraftWorldGenerator(), 0); GameRegistry.registerFuelHandler(new FurnaceFuelHandler()); + registerVanillaSalvage(); AbyssalCrafting.addRecipes(); proxy.registerRenderThings(); } + @EventHandler + public void postInit(FMLPostInitializationEvent event) { + + ACLogger.info("Post-initializing AbyssalCraft"); + proxy.postInit(); + if(Loader.isModLoaded("Thaumcraft")){ + ACLogger.info("Thaumcraft is present, initializing evil stuff."); + ACThaumcraftIntegration.init(); + } + ACLogger.info("AbyssalCraft loaded."); + } + + @SubscribeEvent + public void onConfigChanged(ConfigChangedEvent.OnConfigChangedEvent eventArgs) { + if(eventArgs.modID.equals("abyssalcraft")) + syncConfig(); + } + public static void syncConfig(){ configDimId1 = cfg.get("dimensions", "The Abyssal Wasteland", 50, "The first dimension, full of undead monsters.").getInt(); @@ -1182,20 +1199,20 @@ public static void syncConfig(){ configDimId3 = cfg.get("dimensions", "Omothol", 52, "The third dimension, also known as \u00A7oThe Realm of J'zahar\u00A7r.").getInt(); configDimId4 = cfg.get("dimensions", "The Dark Realm", 53, "Hidden fourth dimension, reached by falling down from Omothol").getInt(); - configBiomeId1 = cfg.get("biomes", "Darklands", 100, "Dark biome that contains Abyssalnite").getInt(); - configBiomeId2 = cfg.get("biomes", "Abyssal Wasteland", 101, "Abyssal Wasteland biome, contains large quantities of Coralium").getInt(); - configBiomeId3 = cfg.get("biomes", "Dreadlands", 102, "Main Dreadlands biome, desolate.").getInt(); - configBiomeId4 = cfg.get("biomes", "Purified Dreadlands", 103, "Pre-Dreadlands biome, with larger quantities of pure Abyssalnite.").getInt(); - configBiomeId5 = cfg.get("biomes", "Dreadlands Forest", 104, "Forest taken over by the Dread Plague.").getInt(); - configBiomeId6 = cfg.get("biomes", "Dreadlands Mountains", 105, "Mountain equivalent to the Dreadlands biome.").getInt(); - configBiomeId7 = cfg.get("biomes", "Darklands Forest", 106, "Forest equivalent to the Darklands biome.").getInt(); - configBiomeId8 = cfg.get("biomes", "Darklands Plains", 107, "Plains equivalent to the Darklands biome.").getInt(); - configBiomeId9 = cfg.get("biomes", "Darklands Highland", 108, "Plateau version of the Darklands Plains biome.").getInt(); - configBiomeId10 = cfg.get("biomes", "Darklands Mountains", 109, "Mountain equivalent to the Darklands biome.").getInt(); - configBiomeId11 = cfg.get("biomes", "Coralium Infested Swamp", 110, "A swamp biome infested with Coralium.").getInt(); - configBiomeId12 = cfg.get("biomes", "Coralium Infested Ocean", 111, "A ocean biome infested with Coralium.").getInt(); - configBiomeId13 = cfg.get("biomes", "Omothol", 112, "Main biome in Omothol, the realm of J'zahar.").getInt(); - configBiomeId14 = cfg.get("biomes", "Dark Realm", 113, "Dark Realm biome, made out of Darkstone.").getInt(); + configBiomeId1 = cfg.get("biomes", "Darklands", 100, "Dark biome that contains Abyssalnite", 0, 255).getInt(); + configBiomeId2 = cfg.get("biomes", "Abyssal Wasteland", 101, "Abyssal Wasteland biome, contains large quantities of Coralium", 0, 255).getInt(); + configBiomeId3 = cfg.get("biomes", "Dreadlands", 102, "Main Dreadlands biome, desolate.", 0, 255).getInt(); + configBiomeId4 = cfg.get("biomes", "Purified Dreadlands", 103, "Pre-Dreadlands biome, with larger quantities of pure Abyssalnite.", 0, 255).getInt(); + configBiomeId5 = cfg.get("biomes", "Dreadlands Forest", 104, "Forest taken over by the Dread Plague.", 0, 255).getInt(); + configBiomeId6 = cfg.get("biomes", "Dreadlands Mountains", 105, "Mountain equivalent to the Dreadlands biome.", 0, 255).getInt(); + configBiomeId7 = cfg.get("biomes", "Darklands Forest", 106, "Forest equivalent to the Darklands biome.", 0, 255).getInt(); + configBiomeId8 = cfg.get("biomes", "Darklands Plains", 107, "Plains equivalent to the Darklands biome.", 0, 255).getInt(); + configBiomeId9 = cfg.get("biomes", "Darklands Highland", 108, "Plateau version of the Darklands Plains biome.", 0, 255).getInt(); + configBiomeId10 = cfg.get("biomes", "Darklands Mountains", 109, "Mountain equivalent to the Darklands biome.", 0, 255).getInt(); + configBiomeId11 = cfg.get("biomes", "Coralium Infested Swamp", 110, "A swamp biome infested with Coralium.", 0, 255).getInt(); + configBiomeId12 = cfg.get("biomes", "Coralium Infested Ocean", 111, "A ocean biome infested with Coralium.", 0, 255).getInt(); + configBiomeId13 = cfg.get("biomes", "Omothol", 112, "Main biome in Omothol, the realm of J'zahar.", 0, 255).getInt(); + configBiomeId14 = cfg.get("biomes", "Dark Realm", 113, "Dark Realm biome, made out of Darkstone.", 0, 255).getInt(); dark1 = cfg.get("biome_generation", "Darklands", true, "Set true for the Darklands biome to generate.").getBoolean(); dark2 = cfg.get("biome_generation", "Darklands Forest", true, "Set true for the Darklands Forest biome to generate.").getBoolean(); @@ -1218,6 +1235,21 @@ public static void syncConfig(){ breakLogic = cfg.get(Configuration.CATEGORY_GENERAL, "Liquid Coralium Physics", false, "Set true to allow the Liquid Coralium to break the laws of physics in terms of movement").getBoolean(); destroyOcean = cfg.get(Configuration.CATEGORY_GENERAL, "Oceanic Coralium Pollution", false, "Set true to allow the Liquid Coralium to spread across oceans. WARNING: The game can crash from this.").getBoolean(); + darkWeight1 = cfg.get("biome_weight", "Darklands", 10, "Biome weight for the Darklands biome, controls the chance of it generating").getInt(); + darkWeight2 = cfg.get("biome_weight", "Darklands Forest", 10, "Biome weight for the Darklands Forest biome, controls the chance of it generating").getInt(); + darkWeight3 = cfg.get("biome_weight", "Darklands Plains", 10, "Biome weight for the Darklands Plains biome, controls the chance of it generating").getInt(); + darkWeight4 = cfg.get("biome_weight", "Darklands Highland", 10, "Biome weight for the Darklands Highland biome, controls the chance of it generating").getInt(); + darkWeight5 = cfg.get("biome_weight", "Darklands Mountain", 10, "Biome weight for the Darklands Mountain biome, controls the chance of it generating").getInt(); + coraliumWeight = cfg.get("biome_weight", "Coralium Infested Swamp", 10, "Biome weight for the Coralium Infested Swamp biome, controls the chance of it generating").getInt(); + + AbyssalCraftAPI.enchId1 = cfg.get("enchantments", "Coralium Infusion", 230, "The Coralium enchantment.", 0, 255).getInt(); + AbyssalCraftAPI.enchId2 = cfg.get("enchantments", "Dread Infusion", 231, "The Dread enchantment.", 0, 255).getInt(); + AbyssalCraftAPI.enchId3 = cfg.get("enchantments", "Light Pierce", 232, "The Light Pierce enchantment.", 0, 255).getInt(); + AbyssalCraftAPI.enchId4 = cfg.get("enchantments", "Iron Wall", 233, "The Iron Wall enchantment.", 0, 255).getInt(); + + canRenderStarspawn = cfg.get("render", "RenderPlayer Override", true, "Whether or not to override the player model" + + "(set false for compatibility with other mods that alters the player model)").getBoolean(); + if(cfg.hasChanged()) cfg.save(); } @@ -1242,6 +1274,7 @@ public void addOreDictionaryStuff(){ OreDictionary.registerOre("plankWood", DLTplank); OreDictionary.registerOre("plankWood", dreadplanks); OreDictionary.registerOre("treeSapling", DLTSapling); + OreDictionary.registerOre("treeSapling", dreadsapling); OreDictionary.registerOre("treeLeaves", DLTLeaves); OreDictionary.registerOre("treeLeaves", dreadleaves); OreDictionary.registerOre("blockAbyssalnite", abyblock); @@ -1347,10 +1380,27 @@ public void addChestGenHooks(){ ChestGenHooks.addItem(ChestGenHooks.DUNGEON_CHEST, new WeightedRandomChestContent(new ItemStack(AbyssalCraft.Coralium), 1, 5, 8)); } - @SubscribeEvent - public void onConfigChanged(ConfigChangedEvent.OnConfigChangedEvent eventArgs) { - if(eventArgs.modID.equals("abyssalcraft")) - syncConfig(); + private void registerVanillaSalvage(){ + + SalvageHandler.INSTANCE.addBootsSalvage(Items.leather_boots, Items.leather); + SalvageHandler.INSTANCE.addHelmetSalvage(Items.leather_helmet, Items.leather); + SalvageHandler.INSTANCE.addChestplateSalvage(Items.leather_chestplate, Items.leather); + SalvageHandler.INSTANCE.addLeggingsSalvage(Items.leather_leggings, Items.leather); + + SalvageHandler.INSTANCE.addBootsSalvage(Items.iron_boots, Items.iron_ingot); + SalvageHandler.INSTANCE.addHelmetSalvage(Items.iron_helmet, Items.iron_ingot); + SalvageHandler.INSTANCE.addChestplateSalvage(Items.iron_chestplate, Items.iron_ingot); + SalvageHandler.INSTANCE.addLeggingsSalvage(Items.iron_leggings, Items.iron_ingot); + + SalvageHandler.INSTANCE.addBootsSalvage(Items.golden_boots, Items.gold_ingot); + SalvageHandler.INSTANCE.addHelmetSalvage(Items.golden_helmet, Items.gold_ingot); + SalvageHandler.INSTANCE.addChestplateSalvage(Items.golden_chestplate, Items.gold_ingot); + SalvageHandler.INSTANCE.addLeggingsSalvage(Items.golden_leggings, Items.gold_ingot); + + SalvageHandler.INSTANCE.addBootsSalvage(Items.diamond_boots, Items.diamond); + SalvageHandler.INSTANCE.addHelmetSalvage(Items.diamond_helmet, Items.diamond); + SalvageHandler.INSTANCE.addChestplateSalvage(Items.diamond_chestplate, Items.diamond); + SalvageHandler.INSTANCE.addLeggingsSalvage(Items.diamond_leggings, Items.diamond); } public static int getUniqueEntityId() { @@ -1368,12 +1418,9 @@ public static void registerEntityEgg(Class entity, int primary EntityList.entityEggs.put(id, new EntityEggInfo(id, primaryColor, secondaryColor)); } - @EventHandler - public void postInit(FMLPostInitializationEvent event) { - - ACLogger.info("Post-initializing AbyssalCraft"); - proxy.postInit(); - ACLogger.info("AbyssalCraft loaded."); + public static void registerDimension(String name, int id, Class provider, boolean keepLoaded){ + DimensionManager.registerProviderType(id, provider, keepLoaded); + DimensionManager.registerDimension(id, id); } @SubscribeEvent diff --git a/src/main/java/com/shinoow/abyssalcraft/api/AbyssalCraftAPI.java b/src/main/java/com/shinoow/abyssalcraft/api/AbyssalCraftAPI.java new file mode 100644 index 000000000..d1a71475e --- /dev/null +++ b/src/main/java/com/shinoow/abyssalcraft/api/AbyssalCraftAPI.java @@ -0,0 +1,765 @@ +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.shinoow.abyssalcraft.api; + +import java.lang.reflect.*; +import java.util.*; + +import net.minecraft.block.Block; +import net.minecraft.entity.*; +import net.minecraft.item.*; +import net.minecraft.item.Item.ToolMaterial; +import net.minecraft.item.ItemArmor.ArmorMaterial; +import net.minecraft.item.crafting.FurnaceRecipes; +import net.minecraft.potion.*; +import net.minecraft.util.DamageSource; +import net.minecraft.world.biome.BiomeGenBase; +import net.minecraftforge.common.util.EnumHelper; +import net.minecraftforge.oredict.OreDictionary; + +import com.google.common.collect.Lists; +import com.shinoow.abyssalcraft.api.item.ItemEngraving; +import com.shinoow.abyssalcraft.api.recipe.*; +import com.shinoow.abyssalcraft.common.util.ACLogger; + +import cpw.mods.fml.common.IFuelHandler; +import cpw.mods.fml.common.registry.*; + +/** + * Main API class for AbyssalCraft, has child classes for most features. + * + * @author shinoow + * + */ +public class AbyssalCraftAPI { + + /** + * Enchantment IDs, first one is the Coralium enchantment, second Dread enchantment, + * third the Light Pierce enchantment, and the fourth is the Iron Wall enchantment. + */ + public static int enchId1, enchId2, enchId3, enchId4; + + private static List crystallizerFuelHandlers = Lists.newArrayList(); + private static List transmutatorFuelHandlers = Lists.newArrayList(); + + private static HashMap potionRequirements = null; + private static HashMap potionAmplifiers = null; + + public static DamageSource coralium = new DamageSource("coralium").setDamageBypassesArmor().setMagicDamage(); + public static DamageSource dread = new DamageSource("dread").setDamageBypassesArmor().setMagicDamage(); + public static DamageSource antimatter = new DamageSource("antimatter").setDamageBypassesArmor().setMagicDamage(); + + /** + * {@link EnumCreatureAttribute} used for the Shadow mobs + */ + public static EnumCreatureAttribute SHADOW = EnumHelper.addCreatureAttribute("SHADOW"); + + public static ArmorMaterial abyssalniteArmor = EnumHelper.addArmorMaterial("Abyssalnite", 35, new int[]{3, 8, 6, 3}, 13); + public static ArmorMaterial coraliumInfusedAbyssalniteArmor = EnumHelper.addArmorMaterial("AbyssalniteC", 36, new int[]{3, 8, 6, 3}, 30); + public static ArmorMaterial dreadedAbyssalniteArmor = EnumHelper.addArmorMaterial("Dread", 36, new int[]{3, 8, 6, 3}, 15); + public static ArmorMaterial refinedCoraliumArmor = EnumHelper.addArmorMaterial("Coralium", 37, new int[]{3, 8, 6, 3}, 14); + public static ArmorMaterial platedCoraliumArmor = EnumHelper.addArmorMaterial("CoraliumP", 55, new int[]{4, 9, 7, 4}, 14); + public static ArmorMaterial depthsArmor = EnumHelper.addArmorMaterial("Depths", 33, new int[]{3, 8, 6, 3}, 25); + public static ArmorMaterial dreadiumArmor = EnumHelper.addArmorMaterial("Dreadium", 40, new int[]{3, 8, 6, 3}, 15); + public static ArmorMaterial dreadiumSamuraiArmor = EnumHelper.addArmorMaterial("DreadiumS", 45, new int[]{3, 8, 6, 3}, 20); + public static ArmorMaterial ethaxiumArmor = EnumHelper.addArmorMaterial("Ethaxium", 50, new int[]{3, 8, 6, 3}, 25); + + public static ToolMaterial darkstoneTool = EnumHelper.addToolMaterial("DARKSTONE", 1, 180, 5.0F, 1, 5); + public static ToolMaterial abyssalniteTool = EnumHelper.addToolMaterial("ABYSSALNITE", 4, 1261, 13.0F, 4, 13); + public static ToolMaterial refinedCoraliumTool = EnumHelper.addToolMaterial("CORALIUM", 5, 2000, 14.0F, 5, 14); + public static ToolMaterial dreadiumTool = EnumHelper.addToolMaterial("DREADIUM", 6, 3000, 15.0F, 6, 15); + public static ToolMaterial coraliumInfusedAbyssalniteTool = EnumHelper.addToolMaterial("ABYSSALNITE_C", 8, 8000, 20.0F, 8, 30); + public static ToolMaterial ethaxiumTool = EnumHelper.addToolMaterial("ETHAXIUM", 8, 4000, 16.0F, 8, 20); + + /** + * Initializes the reflection required for the Potion code, ignore it + * @param par1 Whether Reika's DragonAPI is present, will skip some reflection if it is. + */ + @SuppressWarnings("unchecked") + public static void initPotionReflection(boolean par1){ + if(!par1){ + Potion[] potionTypes = null; + for (Field f : Potion.class.getDeclaredFields()) { + f.setAccessible(true); + try { + if (f.getName().equals("potionTypes") || f.getName().equals("field_76425_a")) { + Field modfield = Field.class.getDeclaredField("modifiers"); + modfield.setAccessible(true); + modfield.setInt(f, f.getModifiers() & ~Modifier.FINAL); + + potionTypes = (Potion[])f.get(null); + final Potion[] newPotionTypes = new Potion[256]; + System.arraycopy(potionTypes, 0, newPotionTypes, 0, potionTypes.length); + f.set(null, newPotionTypes); + } + } + catch (Exception e) { + System.err.println("Whoops, something screwed up here, please report this to shinoow:"); + System.err.println(e); + } + } + } else + ACLogger.info("DragonAPI is present, skipping Potion array extension."); + for(Field f : PotionHelper.class.getDeclaredFields()) + try { + if(f.getName().equals("potionRequirements") || f.getName().equals("field_77927_l")){ + f.setAccessible(true); + try { + potionRequirements = (HashMap)f.get(null); + } catch (IllegalArgumentException e) { + System.err.println("Whoops, something screwed up here, please report this to shinoow:"); + e.printStackTrace(); + } catch (IllegalAccessException e) { + System.err.println("Whoops, something screwed up here, please report this to shinoow:"); + e.printStackTrace(); + } + } + if(f.getName().equals("potionAmplifiers") || f.getName().equals("field_77928_m")){ + f.setAccessible(true); + try { + potionAmplifiers = (HashMap)f.get(null); + } catch (IllegalArgumentException e) { + System.err.println("Whoops, something screwed up here, please report this to shinoow:"); + e.printStackTrace(); + } catch (IllegalAccessException e) { + System.err.println("Whoops, something screwed up here, please report this to shinoow:"); + e.printStackTrace(); + } + } + } catch (SecurityException e) { + System.err.println("Whoops, something screwed up here, please report this to shinoow:"); + e.printStackTrace(); + } + } + + /** + * Adds a bit sequence used to calculate the status on a potion. + * This description probably hardly makes any sense, deal with it. + * @param id The potion id + * @param requirements A bit sequence + */ + public static void addPotionRequirements(int id, String requirements){ + potionRequirements.put(Integer.valueOf(id), requirements); + } + + /** + * Adds an amplifier to a potion. + * This description probably hardly makes any sense, deal with it. + * @param id The potion id + * @param amplifier The potion amplifier value (usually 5) + */ + public static void addPotionAmplifiers(int id, String amplifier){ + potionAmplifiers.put(Integer.valueOf(id), amplifier); + } + + /** + * Basic Crystallization + * @param input The block to crystallize + * @param output1 The first crystal output + * @param output2 The second crystal output + * @param xp Amount of exp given + */ + public static void addCrystallization(Block input, ItemStack output1, ItemStack output2, float xp){ + CrystallizerRecipes.crystallization().crystallize(input, output1, output2, xp); + } + + /** + * Basic Crystallization + * @param input The item to crystallize + * @param output1 The first crystal output + * @param output2 The second crystal output + * @param xp Amount of exp given + */ + public static void addCrystallization(Item input, ItemStack output1, ItemStack output2, float xp){ + CrystallizerRecipes.crystallization().crystallize(input, output1, output2, xp); + } + + /** + * Basic Crystallization + * @param input The itemstack to crystallize + * @param output1 The first crystal output + * @param output2 The second crystal output + * @param xp Amount of exp given + */ + public static void addCrystallization(ItemStack input, ItemStack output1, ItemStack output2, float xp){ + CrystallizerRecipes.crystallization().crystallize(input, output1, output2, xp); + } + + /** + * Single-output Crystallization + * @param input The block to crystallize + * @param output The crystal output + * @param xp Amount of exp given + */ + public static void addSingleCrystallization(Block input, ItemStack output, float xp){ + addCrystallization(input, output, null, xp); + } + + /** + * Single-output Crystallization + * @param input The item to crystallize + * @param output The crystal output + * @param xp Amount of exp given + */ + public static void addSingleCrystallization(Item input, ItemStack output, float xp){ + addCrystallization(input, output, null, xp); + } + + /** + * Single-output Crystallization + * @param input The itemstack to crystallize + * @param output The crystal output + * @param xp Amount of exp given + */ + public static void addSingleCrystallization(ItemStack input, ItemStack output, float xp){ + addCrystallization(input, output, null, xp); + } + + /** + * Basic Transmutation + * @param input The block to transmutate + * @param output The transmutated output + * @param xp Amount of exp given + */ + public static void addTransmutation(Block input, ItemStack output, float xp){ + TransmutatorRecipes.transmutation().transmutate(input, output, xp); + } + + /** + * Basic Transmutation + * @param input The item to transmutate + * @param output The transmutated output + * @param xp Amount of exp given + */ + public static void addTransmutation(Item input, ItemStack output, float xp){ + TransmutatorRecipes.transmutation().transmutate(input, output, xp); + } + + /** + * Basic Transmutation + * @param input The itemstack to transmutate + * @param output The transmutated output + * @param xp Amount of exp given + */ + public static void addTransmutation(ItemStack input, ItemStack output, float xp){ + TransmutatorRecipes.transmutation().transmutate(input, output, xp); + } + + /** + * Smelting through the OreDictionary + * @param input The ore input + * @param output The ore output + * @param xp Amount of exp given + */ + public static void addOreSmelting(String input, String output, float xp){ + Iterator inputIter = OreDictionary.getOres(input).iterator(); + if(!OreDictionary.getOres(output).isEmpty()) + while(inputIter.hasNext()) + FurnaceRecipes.smelting().func_151394_a(inputIter.next(), OreDictionary.getOres(output).iterator().next(), xp); + } + + /** + * OreDictionary specific Crystallization + * @param input The ore input + * @param output1 The first ore output + * @param output2 The second ore output + * @param xp Amount of exp given + */ + public static void addCrystallization(String input, String output1, String output2, float xp){ + Iterator inputIter = OreDictionary.getOres(input).iterator(); + if(!OreDictionary.getOres(output1).isEmpty() && !OreDictionary.getOres(output2).isEmpty()) + while(inputIter.hasNext()) + addCrystallization(inputIter.next(), OreDictionary.getOres(output1).iterator().next(), OreDictionary.getOres(output2).iterator().next(), xp); + } + + /** + * OreDictionary specific Crystallization + * @param input The ore input + * @param output1 The first ore output + * @param out1 Quantity of the first output + * @param output2 The second ore output + * @param out2 Quantity of the second output + * @param xp Amount of exp given + */ + public static void addCrystallization(String input, String output1, int out1, String output2, int out2, float xp){ + Iterator inputIter = OreDictionary.getOres(input).iterator(); + if(!OreDictionary.getOres(output1).isEmpty() && !OreDictionary.getOres(output2).isEmpty()) + while(inputIter.hasNext()) + addCrystallization(inputIter.next(), new ItemStack(OreDictionary.getOres(output1).iterator().next().getItem(), out1), new ItemStack(OreDictionary.getOres(output2).iterator().next().getItem(), out2), xp); + } + + /** + * OreDictionary specific single-output Crystallization + * @param input The ore input + * @param output The ore output + * @param xp Amount of exp given + */ + public static void addSingleCrystallization(String input, String output, float xp){ + Iterator inputIter = OreDictionary.getOres(input).iterator(); + if(!OreDictionary.getOres(output).isEmpty()) + while(inputIter.hasNext()) + addSingleCrystallization(inputIter.next(), new ItemStack(OreDictionary.getOres(output).iterator().next().getItem()), xp); + } + + /** + * OreDictionary specific single-output Crystallization + * @param input The ore input + * @param output The ore output + * @param out The output quantity + * @param xp Amount of exp given + */ + public static void addSingleCrystallization(String input, String output, int out, float xp){ + Iterator inputIter = OreDictionary.getOres(input).iterator(); + if(!OreDictionary.getOres(output).isEmpty()) + while(inputIter.hasNext()) + addSingleCrystallization(inputIter.next(), new ItemStack(OreDictionary.getOres(output).iterator().next().getItem(), out), xp); + } + + /** + * OreDictionary specific Transmutation + * @param input The ore input + * @param output The ore output + * @param xp Amount of exp given + */ + public static void addTransmutation(String input, String output, float xp){ + Iterator inputIter = OreDictionary.getOres(input).iterator(); + if(!OreDictionary.getOres(output).isEmpty()) + while(inputIter.hasNext()) + addTransmutation(inputIter.next(), new ItemStack(OreDictionary.getOres(output).iterator().next().getItem()), xp); + } + + /** + * OreDictionary specific Transmutation + * @param input The ore input + * @param output The ore output + * @param out The output quantity + * @param xp Amount of exp given + */ + public static void addTransmutation(String input, String output, int out, float xp){ + Iterator inputIter = OreDictionary.getOres(input).iterator(); + if(!OreDictionary.getOres(output).isEmpty()) + while(inputIter.hasNext()) + addTransmutation(inputIter.next(), new ItemStack(OreDictionary.getOres(output).iterator().next().getItem(), out), xp); + } + + /** + * OreDictionary specific Transmutation + * @param input The ore input + * @param output The ore output + * @param out The output quantity + * @param meta The output metadata + * @param xp Amount of exp given + */ + public static void addTransmutation(String input, String output, int out, int meta, float xp){ + Iterator inputIter = OreDictionary.getOres(input).iterator(); + if(!OreDictionary.getOres(output).isEmpty()) + while(inputIter.hasNext()) + addTransmutation(inputIter.next(), new ItemStack(OreDictionary.getOres(output).iterator().next().getItem(), out, meta), xp); + } + + /** + * Basic Engraving + * @param input The ItemStack to engrave + * @param output The ItemStack output + * @param engraving The engraving template (must be an {@link ItemEngraving}) + * @param xp Amount of exp given + */ + public static void addEngraving(ItemStack input, ItemStack output, Item engraving, float xp){ + try{ + EngraverRecipes.engraving().engrave(input, output, (ItemEngraving)engraving, xp); + } catch(ClassCastException e){ + System.err.println("You're doing it wrong!"); + e.printStackTrace(); + } + } + + /** + * Basic Engraving + * @param input The Item to engrave + * @param output The ItemStack output + * @param engraving The engraving template (must be an {@link ItemEngraving}) + * @param xp Amount of exp given + */ + public static void addEngraving(Item input, ItemStack output, Item engraving, float xp){ + try{ + EngraverRecipes.engraving().engrave(input, output, (ItemEngraving)engraving, xp); + } catch(ClassCastException e){ + System.err.println("You're doing it wrong!"); + e.printStackTrace(); + } + } + + /** + * Fuel types, also has support for the vanilla furnace. + * @author shinoow + * + */ + public enum FuelType{ + CRYSTALLIZER, TRANSMUTATOR, FURNACE + } + + /** + * Registers a fuel handler for an AbyssalCraft fuel type + * @param handler The file that implements {@link IFuelHandler} + * @param type The fuel type + */ + public static void registerFuelHandler(IFuelHandler handler, FuelType type){ + switch(type){ + case CRYSTALLIZER: + crystallizerFuelHandlers.add(handler); + break; + case TRANSMUTATOR: + transmutatorFuelHandlers.add(handler); + break; + case FURNACE: + GameRegistry.registerFuelHandler(handler); + } + } + + /** + * Gets the fuel value from an ItemStack, depending on the fuel type + * @param itemStack The ItemStack getting checked + * @param type The fuel type + * @return The fuel value for the specified machine + */ + public static int getFuelValue(ItemStack itemStack, FuelType type){ + int fuelValue = 0; + switch(type){ + case CRYSTALLIZER: + for (IFuelHandler handler : crystallizerFuelHandlers) + fuelValue = Math.max(fuelValue, handler.getBurnTime(itemStack)); + break; + case TRANSMUTATOR: + for (IFuelHandler handler : transmutatorFuelHandlers) + fuelValue = Math.max(fuelValue, handler.getBurnTime(itemStack)); + break; + case FURNACE: + GameRegistry.getFuelValue(itemStack); + } + return fuelValue; + } + + /** + * Adds biomes for a Depths Ghoul to spawn in + * @param weightedProb The chance of this mob spawning + * @param min Min mobs to spawn + * @param max Max mobs to spawn + * @param biomes Biomes where the mob will spawn + */ + public static void addDepthsGhoulSpawning(int weightedProb, int min, int max, BiomeGenBase[] biomes){ + EntityRegistry.addSpawn(ACEntities.mobNames[0], weightedProb, min, max, EnumCreatureType.monster, biomes); + } + + /** + * Adds biomes for a Evil Pig to spawn in + * @param weightedProb The chance of this mob spawning + * @param min Min mobs to spawn + * @param max Max mobs to spawn + * @param biomes Biomes where the mob will spawn + */ + public static void addEvilPigSpawning(int weightedProb, int min, int max, BiomeGenBase[] biomes){ + EntityRegistry.addSpawn(ACEntities.mobNames[1], weightedProb, min, max, EnumCreatureType.creature, biomes); + } + + /** + * Adds biomes for a Abyssal Zombie to spawn in + * @param weightedProb The chance of this mob spawning + * @param min Min mobs to spawn + * @param max Max mobs to spawn + * @param biomes Biomes where the mob will spawn + */ + public static void addAbyssalZombieSpawning(int weightedProb, int min, int max, BiomeGenBase[] biomes){ + EntityRegistry.addSpawn(ACEntities.mobNames[2], weightedProb, min, max, EnumCreatureType.monster, biomes); + } + + /** + * Adds biomes for a Abyssalnite Golem to spawn in + * @param weightedProb The chance of this mob spawning + * @param min Min mobs to spawn + * @param max Max mobs to spawn + * @param biomes Biomes where the mob will spawn + */ + public static void addAbyssalniteGolemSpawning(int weightedProb, int min, int max, BiomeGenBase[] biomes){ + EntityRegistry.addSpawn(ACEntities.mobNames[4], weightedProb, min, max, EnumCreatureType.creature, biomes); + } + + /** + * Adds biomes for a Dreaded Abyssalnite Golem to spawn in + * @param weightedProb The chance of this mob spawning + * @param min Min mobs to spawn + * @param max Max mobs to spawn + * @param biomes Biomes where the mob will spawn + */ + public static void addDreadedAbyssalniteGolemSpawning(int weightedProb, int min, int max, BiomeGenBase[] biomes){ + EntityRegistry.addSpawn(ACEntities.mobNames[5], weightedProb, min, max, EnumCreatureType.monster, biomes); + } + + /** + * Adds biomes for a Dreadguard to spawn in + * @param weightedProb The chance of this mob spawning + * @param min Min mobs to spawn + * @param max Max mobs to spawn + * @param biomes Biomes where the mob will spawn + */ + public static void addDreadguardSpawning(int weightedProb, int min, int max, BiomeGenBase[] biomes){ + EntityRegistry.addSpawn(ACEntities.mobNames[6], weightedProb, min, max, EnumCreatureType.monster, biomes); + } + + /** + * Adds biomes for a Spectral Dragon to spawn in + * @param weightedProb The chance of this mob spawning + * @param min Min mobs to spawn + * @param max Max mobs to spawn + * @param biomes Biomes where the mob will spawn + */ + public static void addSpectralDragonSpawning(int weightedProb, int min, int max, BiomeGenBase[] biomes){ + EntityRegistry.addSpawn(ACEntities.mobNames[7], weightedProb, min, max, EnumCreatureType.monster, biomes); + } + + /** + * Adds biomes for a Shadow Creature to spawn in + * @param weightedProb The chance of this mob spawning + * @param min Min mobs to spawn + * @param max Max mobs to spawn + * @param biomes Biomes where the mob will spawn + */ + public static void addShadowCreatureSpawning(int weightedProb, int min, int max, BiomeGenBase[] biomes){ + EntityRegistry.addSpawn(ACEntities.mobNames[9], weightedProb, min, max, EnumCreatureType.monster, biomes); + } + + /** + * Adds biomes for a Shadow Monster to spawn in + * @param weightedProb The chance of this mob spawning + * @param min Min mobs to spawn + * @param max Max mobs to spawn + * @param biomes Biomes where the mob will spawn + */ + public static void addShadowMonsterSpawning(int weightedProb, int min, int max, BiomeGenBase[] biomes){ + EntityRegistry.addSpawn(ACEntities.mobNames[10], weightedProb, min, max, EnumCreatureType.monster, biomes); + } + + /** + * Adds biomes for a Dreadling to spawn in + * @param weightedProb The chance of this mob spawning + * @param min Min mobs to spawn + * @param max Max mobs to spawn + * @param biomes Biomes where the mob will spawn + */ + public static void addDreadlingSpawning(int weightedProb, int min, int max, BiomeGenBase[] biomes){ + EntityRegistry.addSpawn(ACEntities.mobNames[11], weightedProb, min, max, EnumCreatureType.monster, biomes); + } + + /** + * Adds biomes for a Dread Spawn to spawn in + * @param weightedProb The chance of this mob spawning + * @param min Min mobs to spawn + * @param max Max mobs to spawn + * @param biomes Biomes where the mob will spawn + */ + public static void addDreadSpawnSpawning(int weightedProb, int min, int max, BiomeGenBase[] biomes){ + EntityRegistry.addSpawn(ACEntities.mobNames[12], weightedProb, min, max, EnumCreatureType.monster, biomes); + } + + /** + * Adds biomes for a Demon Pig to spawn in + * @param weightedProb The chance of this mob spawning + * @param min Min mobs to spawn + * @param max Max mobs to spawn + * @param biomes Biomes where the mob will spawn + */ + public static void addDemonPigSpawning(int weightedProb, int min, int max, BiomeGenBase[] biomes){ + EntityRegistry.addSpawn(ACEntities.mobNames[13], weightedProb, min, max, EnumCreatureType.monster, biomes); + } + + /** + * Adds biomes for a Skeleton Goliath to spawn in + * @param weightedProb The chance of this mob spawning + * @param min Min mobs to spawn + * @param max Max mobs to spawn + * @param biomes Biomes where the mob will spawn + */ + public static void addSkeletonGoliathSpawning(int weightedProb, int min, int max, BiomeGenBase[] biomes){ + EntityRegistry.addSpawn(ACEntities.mobNames[14], weightedProb, min, max, EnumCreatureType.monster, biomes); + } + + /** + * Adds biomes for a Spawn of Cha'garoth to spawn in + * @param weightedProb The chance of this mob spawning + * @param min Min mobs to spawn + * @param max Max mobs to spawn + * @param biomes Biomes where the mob will spawn + */ + public static void addSpawnofChagarothSpawning(int weightedProb, int min, int max, BiomeGenBase[] biomes){ + EntityRegistry.addSpawn(ACEntities.mobNames[15], weightedProb, min, max, EnumCreatureType.monster, biomes); + } + + /** + * Adds biomes for a Fist of Cha'garoth to spawn in + * @param weightedProb The chance of this mob spawning + * @param min Min mobs to spawn + * @param max Max mobs to spawn + * @param biomes Biomes where the mob will spawn + */ + public static void addFistofChagarothSpawning(int weightedProb, int min, int max, BiomeGenBase[] biomes){ + EntityRegistry.addSpawn(ACEntities.mobNames[16], weightedProb, min, max, EnumCreatureType.monster, biomes); + } + + /** + * Adds biomes for a Shadow Beast to spawn in + * @param weightedProb The chance of this mob spawning + * @param min Min mobs to spawn + * @param max Max mobs to spawn + * @param biomes Biomes where the mob will spawn + */ + public static void addShadowBeastSpawning(int weightedProb, int min, int max, BiomeGenBase[] biomes){ + EntityRegistry.addSpawn(ACEntities.mobNames[18], weightedProb, min, max, EnumCreatureType.monster, biomes); + } + + /** + * Adds biomes for a Lesser Shoggoth to spawn in + * @param weightedProb The chance of this mob spawning + * @param min Min mobs to spawn + * @param max Max mobs to spawn + * @param biomes Biomes where the mob will spawn + */ + public static void addLesserShoggothSpawning(int weightedProb, int min, int max, BiomeGenBase[] biomes){ + EntityRegistry.addSpawn(ACEntities.mobNames[31], weightedProb, min, max, EnumCreatureType.monster, biomes); + } + + /** + * Adds biomes for a Shadow Titan to spawn in + * @param weightedProb The chance of this mob spawning + * @param min Min mobs to spawn + * @param max Max mobs to spawn + * @param biomes Biomes where the mob will spawn + */ + public static void addShadowTitanSpawning(int weightedProb, int min, int max, BiomeGenBase[] biomes){ + EntityRegistry.addSpawn(ACEntities.mobNames[32], weightedProb, min, max, EnumCreatureType.monster, biomes); + } + + /** + * Adds biomes for a Omothol Warden to spawn in + * @param weightedProb The chance of this mob spawning + * @param min Min mobs to spawn + * @param max Max mobs to spawn + * @param biomes Biomes where the mob will spawn + */ + public static void addOmotholWardenSpawning(int weightedProb, int min, int max, BiomeGenBase[] biomes){ + EntityRegistry.addSpawn(ACEntities.mobNames[33], weightedProb, min, max, EnumCreatureType.monster, biomes); + } + + /** + * Adds biomes for a Minion of The Gatekeeper to spawn in + * @param weightedProb The chance of this mob spawning + * @param min Min mobs to spawn + * @param max Max mobs to spawn + * @param biomes Biomes where the mob will spawn + */ + public static void addGatekeeperMinionSpawning(int weightedProb, int min, int max, BiomeGenBase[] biomes){ + EntityRegistry.addSpawn(ACEntities.mobNames[34], weightedProb, min, max, EnumCreatureType.monster, biomes); + } + + /** + * Adds biomes for a Omothol Ghoul to spawn in + * @param weightedProb The chance of this mob spawning + * @param min Min mobs to spawn + * @param max Max mobs to spawn + * @param biomes Biomes where the mob will spawn + */ + public static void addOmotholGhoulSpawning(int weightedProb, int min, int max, BiomeGenBase[] biomes){ + EntityRegistry.addSpawn(ACEntities.mobNames[35], weightedProb, min, max, EnumCreatureType.monster, biomes); + } + + /** + * Adds biomes for a Remnant to spawn in + * @param weightedProb The chance of this mob spawning + * @param min Min mobs to spawn + * @param max Max mobs to spawn + * @param biomes Biomes where the mob will spawn + */ + public static void addRemnantSpawning(int weightedProb, int min, int max, BiomeGenBase[] biomes){ + EntityRegistry.addSpawn(ACEntities.mobNames[36], weightedProb, min, max, EnumCreatureType.monster, biomes); + } + + /** + * Contains the names of all mobs added in AbyssalCraft. + * Use the methods in the main API class to make them spawn in your biome(s). + * + * @author shinoow + * + */ + public static class ACEntities { + + private static String[] mobNames = {"depthsghoul", "evilpig", "abyssalzombie", "Jzahar", "abygolem", "dreadgolem", + "dreadguard", "dragonminion", "dragonboss", "shadowcreature", "shadowmonster", "dreadling", "dreadspawn", + "demonpig", "gskeleton", "chagarothspawn", "chagarothfist", "chagaroth", "shadowbeast", "shadowboss", + "antiabyssalzombie", "antibat", "antichicken", "anticow", "anticreeper", "antighoul", "antipig", "antiplayer", + "antiskeleton", "antispider", "antizombie", "lessershoggoth", "shadowtitan", "omotholwarden", "jzaharminion", + "omotholghoul", "remnant"}; + + public static String depths_ghoul = mobNames[0]; + public static String evil_pig = mobNames[1]; + public static String abyssal_zombie = mobNames[2]; + public static String jzahar = mobNames[3]; + public static String abyssalnite_golem = mobNames[4]; + public static String dreaded_abyssalnite_golem = mobNames[5]; + public static String dreadguard = mobNames[6]; + public static String spectral_dragon = mobNames[7]; + public static String asorah = mobNames[8]; + public static String shadow_creature = mobNames[9]; + public static String shadow_monster = mobNames[10]; + public static String dreadling = mobNames[11]; + public static String dread_spawn = mobNames[12]; + public static String demon_pig = mobNames[13]; + public static String skeleton_goliath = mobNames[14]; + public static String spawn_of_chagaroth = mobNames[15]; + public static String fist_of_chagaroth = mobNames[16]; + public static String chagaroth = mobNames[17]; + public static String shadow_beast = mobNames[18]; + public static String sacthoth = mobNames[19]; + public static String abyssal_anti_zombie = mobNames[20]; + public static String anti_bat = mobNames[21]; + public static String anti_chicken = mobNames[22]; + public static String anti_cow = mobNames[23]; + public static String anti_creeper = mobNames[24]; + public static String anti_ghoul = mobNames[25]; + public static String anti_pig = mobNames[26]; + public static String anti_player = mobNames[27]; + public static String anti_skeleton = mobNames[28]; + public static String anti_spider = mobNames[29]; + public static String anti_zombie = mobNames[30]; + public static String lesser_shoggoth = mobNames[31]; + public static String shadow_titan = mobNames[32]; + public static String omothol_warden = mobNames[33]; + public static String minion_of_the_gatekeeper = mobNames[34]; + public static String omothol_ghoul = mobNames[35]; + public static String remnant = mobNames[36]; + } + + /** + * Contains all potion effects added in AbyssalCraft + * + * @author shinoow + * + */ + public static class ACPotions { + + public static Potion Coralium_plague = Potion.potionTypes[100]; + public static Potion Dread_plague = Potion.potionTypes[101]; + public static Potion Antimatter = Potion.potionTypes[102]; + } +} \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/core/api/addon/ACAddon.java b/src/main/java/com/shinoow/abyssalcraft/api/addon/ACAddon.java similarity index 56% rename from src/main/java/com/shinoow/abyssalcraft/core/api/addon/ACAddon.java rename to src/main/java/com/shinoow/abyssalcraft/api/addon/ACAddon.java index 2bd8f9c11..473c66db7 100644 --- a/src/main/java/com/shinoow/abyssalcraft/core/api/addon/ACAddon.java +++ b/src/main/java/com/shinoow/abyssalcraft/api/addon/ACAddon.java @@ -1,19 +1,20 @@ -/**AbyssalCraft Core - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ -package com.shinoow.abyssalcraft.core.api.addon; +package com.shinoow.abyssalcraft.api.addon; import java.lang.annotation.*; diff --git a/src/main/java/com/shinoow/abyssalcraft/api/addon/IACAddon.java b/src/main/java/com/shinoow/abyssalcraft/api/addon/IACAddon.java new file mode 100644 index 000000000..bb2630602 --- /dev/null +++ b/src/main/java/com/shinoow/abyssalcraft/api/addon/IACAddon.java @@ -0,0 +1,44 @@ +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.shinoow.abyssalcraft.api.addon; + +import com.shinoow.abyssalcraft.api.addon.ACAddon.AddonType; + +/** + * Coremod interface for AbyssalCraft add-ons, + * implement it in the dummy class + * @author shinoow + * + */ +public interface IACAddon { + + /** + * ModId, used for indexing multiple add-ons + */ + String getModId(); + + /** + * Name of the add-on (same as mod name) + */ + String getName(); + + /** + * What kind of add-on (can be multiple kinds) + */ + AddonType[] getType(); + +} \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/api/addon/package-info.java b/src/main/java/com/shinoow/abyssalcraft/api/addon/package-info.java new file mode 100644 index 000000000..99833ebb2 --- /dev/null +++ b/src/main/java/com/shinoow/abyssalcraft/api/addon/package-info.java @@ -0,0 +1,3 @@ +@API(apiVersion="1.2.0",owner="abyssalcraft",provides="AbyssalCraftAPI") +package com.shinoow.abyssalcraft.api.addon; +import cpw.mods.fml.common.API; \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/core/api/block/ACBlocks.java b/src/main/java/com/shinoow/abyssalcraft/api/block/ACBlocks.java similarity index 92% rename from src/main/java/com/shinoow/abyssalcraft/core/api/block/ACBlocks.java rename to src/main/java/com/shinoow/abyssalcraft/api/block/ACBlocks.java index 4b70b9588..b1c0e96ca 100644 --- a/src/main/java/com/shinoow/abyssalcraft/core/api/block/ACBlocks.java +++ b/src/main/java/com/shinoow/abyssalcraft/api/block/ACBlocks.java @@ -1,19 +1,20 @@ -/**AbyssalCraft Core - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ -package com.shinoow.abyssalcraft.core.api.block; +package com.shinoow.abyssalcraft.api.block; import net.minecraft.block.Block; import cpw.mods.fml.common.registry.GameRegistry; @@ -136,4 +137,6 @@ public class ACBlocks { public static Block block_of_ethaxium = GameRegistry.findBlock(modId, "ethaxiumblock"); public static Block omothol_gateway = GameRegistry.findBlock(modId, "omotholportal"); public static Block omothol_fire = GameRegistry.findBlock(modId, "omotholfire"); + public static Block engraver = GameRegistry.findBlock(modId, "engraver"); + public static Block engraver_active = GameRegistry.findBlock(modId, "engraver_on"); } \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/api/block/package-info.java b/src/main/java/com/shinoow/abyssalcraft/api/block/package-info.java new file mode 100644 index 000000000..61a7f94d2 --- /dev/null +++ b/src/main/java/com/shinoow/abyssalcraft/api/block/package-info.java @@ -0,0 +1,3 @@ +@API(apiVersion="1.2.0",owner="abyssalcraft",provides="AbyssalCraftAPI") +package com.shinoow.abyssalcraft.api.block; +import cpw.mods.fml.common.API; \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/api/entity/IAntiEntity.java b/src/main/java/com/shinoow/abyssalcraft/api/entity/IAntiEntity.java new file mode 100644 index 000000000..fc7a62b21 --- /dev/null +++ b/src/main/java/com/shinoow/abyssalcraft/api/entity/IAntiEntity.java @@ -0,0 +1,26 @@ +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.shinoow.abyssalcraft.api.entity; + +/** + * Interface to define a entity that's immune to the Antimatter potion effect + * @author shinoow + * + */ +public interface IAntiEntity { + +} \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/api/entity/ICoraliumEntity.java b/src/main/java/com/shinoow/abyssalcraft/api/entity/ICoraliumEntity.java new file mode 100644 index 000000000..100a9c047 --- /dev/null +++ b/src/main/java/com/shinoow/abyssalcraft/api/entity/ICoraliumEntity.java @@ -0,0 +1,26 @@ +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.shinoow.abyssalcraft.api.entity; + +/** + * Interface to define a entity that's immune to the Coralium Plague + * @author shinoow + * + */ +public interface ICoraliumEntity { + +} \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/api/entity/IDreadEntity.java b/src/main/java/com/shinoow/abyssalcraft/api/entity/IDreadEntity.java new file mode 100644 index 000000000..06dced1e1 --- /dev/null +++ b/src/main/java/com/shinoow/abyssalcraft/api/entity/IDreadEntity.java @@ -0,0 +1,26 @@ +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.shinoow.abyssalcraft.api.entity; + +/** + * Interface to define a entity that's immune to the Dread Plague + * @author shinoow + * + */ +public interface IDreadEntity { + +} \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/api/entity/package-info.java b/src/main/java/com/shinoow/abyssalcraft/api/entity/package-info.java new file mode 100644 index 000000000..3a8e44c5b --- /dev/null +++ b/src/main/java/com/shinoow/abyssalcraft/api/entity/package-info.java @@ -0,0 +1,3 @@ +@API(apiVersion="1.2.0",owner="abyssalcraft",provides="AbyssalCraftAPI") +package com.shinoow.abyssalcraft.api.entity; +import cpw.mods.fml.common.API; \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/core/api/item/ACItems.java b/src/main/java/com/shinoow/abyssalcraft/api/item/ACItems.java similarity index 94% rename from src/main/java/com/shinoow/abyssalcraft/core/api/item/ACItems.java rename to src/main/java/com/shinoow/abyssalcraft/api/item/ACItems.java index 41e31ea92..52b751dd6 100644 --- a/src/main/java/com/shinoow/abyssalcraft/core/api/item/ACItems.java +++ b/src/main/java/com/shinoow/abyssalcraft/api/item/ACItems.java @@ -1,19 +1,20 @@ -/**AbyssalCraft Core - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ -package com.shinoow.abyssalcraft.core.api.item; +package com.shinoow.abyssalcraft.api.item; import net.minecraft.item.Item; import cpw.mods.fml.common.registry.GameRegistry; @@ -200,4 +201,8 @@ public class ACItems { public static Item ethaxium_upgrade_kit = GameRegistry.findItem(modId, "ethaxiumu"); /** Metadata item, has indexes 0, 1, 2, 3, 4, 5, 6 */ public static Item coin = GameRegistry.findItem(modId, "coin"); + /** Metadata item, has indexes 0, 1, 2, 3, 4, 5, 6 */ + public static Item cthulhu_engraved_coin = GameRegistry.findItem(modId, "cthulhucoin"); + public static Item blank_engraving = GameRegistry.findItem(modId, "engraving_blank"); + public static Item cthulhu_engraving = GameRegistry.findItem(modId, "engraving_cthulhu"); } \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/api/item/ItemEngraving.java b/src/main/java/com/shinoow/abyssalcraft/api/item/ItemEngraving.java new file mode 100644 index 000000000..9294a81e2 --- /dev/null +++ b/src/main/java/com/shinoow/abyssalcraft/api/item/ItemEngraving.java @@ -0,0 +1,48 @@ +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.shinoow.abyssalcraft.api.item; + +import java.util.List; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +/** + * The "fuel" in Coin Engraving. Use this class if you want to make your own engravings. + * @author shinoow + * + */ +public class ItemEngraving extends Item { + + /** + * The "fuel" in Coin Engraving. Use this class if you want to make your own engravings. + * @param par1 The unlocalized name, will be prefixed by "engraving." + * @param par2 The item damage, used as a durability check + */ + public ItemEngraving(String par1, int par2){ + super(); + setUnlocalizedName("engraving." + par1); + setMaxDamage(par2); + } + + @SuppressWarnings({ "rawtypes", "unchecked" }) + @Override + public void addInformation(ItemStack is, EntityPlayer player, List l, boolean B){ + l.add(getMaxDamage() - getDamage(is) +"/"+ is.getMaxDamage()); + } +} \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/core/api/item/ItemUpgradeKit.java b/src/main/java/com/shinoow/abyssalcraft/api/item/ItemUpgradeKit.java similarity index 61% rename from src/main/java/com/shinoow/abyssalcraft/core/api/item/ItemUpgradeKit.java rename to src/main/java/com/shinoow/abyssalcraft/api/item/ItemUpgradeKit.java index 116837029..fea82bfa2 100644 --- a/src/main/java/com/shinoow/abyssalcraft/core/api/item/ItemUpgradeKit.java +++ b/src/main/java/com/shinoow/abyssalcraft/api/item/ItemUpgradeKit.java @@ -1,27 +1,26 @@ -/**AbyssalCraft Core - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ -package com.shinoow.abyssalcraft.core.api.item; +package com.shinoow.abyssalcraft.api.item; import java.util.List; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.item.*; +import cpw.mods.fml.relauncher.*; /** * Use this class to create Upgrade Kits for tools/armor. diff --git a/src/main/java/com/shinoow/abyssalcraft/api/item/package-info.java b/src/main/java/com/shinoow/abyssalcraft/api/item/package-info.java new file mode 100644 index 000000000..cc6be5890 --- /dev/null +++ b/src/main/java/com/shinoow/abyssalcraft/api/item/package-info.java @@ -0,0 +1,3 @@ +@API(apiVersion="1.2.0",owner="abyssalcraft",provides="AbyssalCraftAPI") +package com.shinoow.abyssalcraft.api.item; +import cpw.mods.fml.common.API; \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/api/package-info.java b/src/main/java/com/shinoow/abyssalcraft/api/package-info.java new file mode 100644 index 000000000..bc161daa9 --- /dev/null +++ b/src/main/java/com/shinoow/abyssalcraft/api/package-info.java @@ -0,0 +1,3 @@ +@API(apiVersion="1.2.0",owner="abyssalcraft",provides="AbyssalCraftAPI") +package com.shinoow.abyssalcraft.api; +import cpw.mods.fml.common.API; \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/core/util/recipes/CrystallizerRecipes.java b/src/main/java/com/shinoow/abyssalcraft/api/recipe/CrystallizerRecipes.java similarity index 70% rename from src/main/java/com/shinoow/abyssalcraft/core/util/recipes/CrystallizerRecipes.java rename to src/main/java/com/shinoow/abyssalcraft/api/recipe/CrystallizerRecipes.java index 42cbaac61..7e60d75b3 100644 --- a/src/main/java/com/shinoow/abyssalcraft/core/util/recipes/CrystallizerRecipes.java +++ b/src/main/java/com/shinoow/abyssalcraft/api/recipe/CrystallizerRecipes.java @@ -1,28 +1,27 @@ -/**AbyssalCraft Core - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ -package com.shinoow.abyssalcraft.core.util.recipes; +package com.shinoow.abyssalcraft.api.recipe; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; +import java.util.*; import java.util.Map.Entry; import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; +import net.minecraftforge.oredict.OreDictionary; public class CrystallizerRecipes { @@ -48,7 +47,7 @@ public void crystallize(Block input, ItemStack output1, ItemStack output2, float public void crystallize(Item input, ItemStack output1, ItemStack output2, float xp) { - crystallize(new ItemStack(input, 1, 32767), output1, output2, xp); + crystallize(new ItemStack(input, 1, OreDictionary.WILDCARD_VALUE), output1, output2, xp); } public void crystallize(ItemStack input, ItemStack output1, ItemStack output2, float xp) @@ -79,7 +78,7 @@ public ItemStack[] getCrystallizationResult(ItemStack par1ItemStack) private boolean areStacksEqual(ItemStack par1ItemStack, ItemStack par2ItemStack) { - return par2ItemStack.getItem() == par1ItemStack.getItem() && (par2ItemStack.getItemDamage() == 32767 || par2ItemStack.getItemDamage() == par1ItemStack.getItemDamage()); + return par2ItemStack.getItem() == par1ItemStack.getItem() && (par2ItemStack.getItemDamage() == OreDictionary.WILDCARD_VALUE|| par2ItemStack.getItemDamage() == par1ItemStack.getItemDamage()); } public Map getCrystallizationList() diff --git a/src/main/java/com/shinoow/abyssalcraft/api/recipe/EngraverRecipes.java b/src/main/java/com/shinoow/abyssalcraft/api/recipe/EngraverRecipes.java new file mode 100644 index 000000000..be7ef5861 --- /dev/null +++ b/src/main/java/com/shinoow/abyssalcraft/api/recipe/EngraverRecipes.java @@ -0,0 +1,152 @@ +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.shinoow.abyssalcraft.api.recipe; + +import java.util.*; +import java.util.Map.Entry; + +import com.shinoow.abyssalcraft.api.item.ItemEngraving; + +import net.minecraft.item.*; +import net.minecraftforge.oredict.OreDictionary; + +public class EngraverRecipes { + + private static final EngraverRecipes engravingBase = new EngraverRecipes(); + /** The list of engraving results. */ + private Map engravingList = new HashMap(); + private Map experienceList = new HashMap(); + /** List of Engraving Templates with Associated Engraved Coins */ + private Map engravingOutputs = new HashMap(); + private Map engravingInputs = new HashMap(); + + public static EngraverRecipes engraving() + { + return engravingBase; + } + + private EngraverRecipes(){} + + public void engrave(Item input, ItemStack output, ItemEngraving engraving, float xp) + { + engrave(new ItemStack(input, 1, OreDictionary.WILDCARD_VALUE), output, engraving, xp); + } + + public void engrave(ItemStack input, ItemStack output, ItemEngraving engraving, float xp) + { + engravingList.put(input, output); + experienceList.put(output, Float.valueOf(xp)); + engravingOutputs.put(engraving, output); + engravingInputs.put(engraving, input); + } + + /** + * Returns the engraving result of an item. + */ + public ItemStack getEngravingResult(ItemStack par1ItemStack) + { + Iterator iterator = engravingList.entrySet().iterator(); + Entry entry; + + do + { + if (!iterator.hasNext()) + return null; + + entry = (Entry)iterator.next(); + } + while (!areStacksEqual(par1ItemStack, (ItemStack)entry.getKey())); + + return (ItemStack)entry.getValue(); + } + + /** + * Returns the engraving result of an item. + */ + public ItemStack getEngravingResult(ItemStack par1ItemStack, ItemEngraving par2Engraving) + { + ItemEngraving engraving = getEngravingTemplate(par1ItemStack, par2Engraving); + Iterator iterator = engravingInputs.entrySet().iterator(); + Entry entry; + + do + { + if (!iterator.hasNext()) + return null; + + entry = (Entry)iterator.next(); + } + while (!areEngravingsEqual(engraving, (ItemEngraving)entry.getKey())); + + return (ItemStack)entry.getValue(); + } + + public ItemEngraving getEngravingTemplate(ItemStack par1ItemStack, ItemEngraving engraving) + { + Iterator iterator = engravingInputs.entrySet().iterator(); + Entry entry; + + do + { + if (!iterator.hasNext()) + return null; + + entry = (Entry)iterator.next(); + } + while (!areStacksEqual(par1ItemStack, (ItemStack)entry.getValue())); + + return (ItemEngraving)entry.getKey() == engraving ? engraving : null; + } + + private boolean areStacksEqual(ItemStack par1ItemStack, ItemStack par2ItemStack) + { + return par2ItemStack.getItem() == par1ItemStack.getItem() && (par2ItemStack.getItemDamage() == OreDictionary.WILDCARD_VALUE || par2ItemStack.getItemDamage() == par1ItemStack.getItemDamage()); + } + + private boolean areEngravingsEqual(ItemEngraving par1, ItemEngraving par2){ + return par1 == par2; + } + + public Map getEngravingList() + { + return engravingList; + } + + public Map getEngravingTemplates(){ + return engravingOutputs; + } + + public float getExperience(ItemStack par1ItemStack) + { + float ret = par1ItemStack.getItem().getSmeltingExperience(par1ItemStack); + if (ret != -1) return ret; + + Iterator iterator = experienceList.entrySet().iterator(); + Entry entry; + + do + { + if (!iterator.hasNext()) + return 0.0F; + + entry = (Entry)iterator.next(); + } + while (!areStacksEqual(par1ItemStack, (ItemStack)entry.getKey())); + + return ((Float)entry.getValue()).floatValue(); + } +} \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/core/util/recipes/TransmutatorRecipes.java b/src/main/java/com/shinoow/abyssalcraft/api/recipe/TransmutatorRecipes.java similarity index 74% rename from src/main/java/com/shinoow/abyssalcraft/core/util/recipes/TransmutatorRecipes.java rename to src/main/java/com/shinoow/abyssalcraft/api/recipe/TransmutatorRecipes.java index b74b5f948..f723622af 100644 --- a/src/main/java/com/shinoow/abyssalcraft/core/util/recipes/TransmutatorRecipes.java +++ b/src/main/java/com/shinoow/abyssalcraft/api/recipe/TransmutatorRecipes.java @@ -1,30 +1,28 @@ -/**AbyssalCraft Core - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ -package com.shinoow.abyssalcraft.core.util.recipes; +package com.shinoow.abyssalcraft.api.recipe; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; +import java.util.*; import java.util.Map.Entry; import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.init.*; +import net.minecraft.item.*; +import net.minecraftforge.oredict.OreDictionary; public class TransmutatorRecipes { @@ -60,7 +58,7 @@ public void transmutate(Block input, ItemStack output, float xp) public void transmutate(Item input, ItemStack output, float xp) { - transmutate(new ItemStack(input, 1, 32767), output, xp); + transmutate(new ItemStack(input, 1, OreDictionary.WILDCARD_VALUE), output, xp); } public void transmutate(ItemStack input, ItemStack output, float xp) @@ -91,7 +89,7 @@ public ItemStack getTransmutationResult(ItemStack par1ItemStack) private boolean areStacksEqual(ItemStack par1ItemStack, ItemStack par2ItemStack) { - return par2ItemStack.getItem() == par1ItemStack.getItem() && (par2ItemStack.getItemDamage() == 32767 || par2ItemStack.getItemDamage() == par1ItemStack.getItemDamage()); + return par2ItemStack.getItem() == par1ItemStack.getItem() && (par2ItemStack.getItemDamage() == OreDictionary.WILDCARD_VALUE || par2ItemStack.getItemDamage() == par1ItemStack.getItemDamage()); } public Map getTransmutationList() diff --git a/src/main/java/com/shinoow/abyssalcraft/api/recipe/package-info.java b/src/main/java/com/shinoow/abyssalcraft/api/recipe/package-info.java new file mode 100644 index 000000000..a25c191d0 --- /dev/null +++ b/src/main/java/com/shinoow/abyssalcraft/api/recipe/package-info.java @@ -0,0 +1,3 @@ +@API(apiVersion="1.2.0",owner="abyssalcraft",provides="AbyssalCraftAPI") +package com.shinoow.abyssalcraft.api.recipe; +import cpw.mods.fml.common.API; \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/core/api/render/Block3DRender.java b/src/main/java/com/shinoow/abyssalcraft/api/render/Block3DRender.java similarity index 66% rename from src/main/java/com/shinoow/abyssalcraft/core/api/render/Block3DRender.java rename to src/main/java/com/shinoow/abyssalcraft/api/render/Block3DRender.java index adeb8e870..2dba06a4f 100644 --- a/src/main/java/com/shinoow/abyssalcraft/core/api/render/Block3DRender.java +++ b/src/main/java/com/shinoow/abyssalcraft/api/render/Block3DRender.java @@ -1,19 +1,20 @@ -/**AbyssalCraft Core - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ -package com.shinoow.abyssalcraft.core.api.render; +package com.shinoow.abyssalcraft.api.render; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/shinoow/abyssalcraft/api/render/package-info.java b/src/main/java/com/shinoow/abyssalcraft/api/render/package-info.java new file mode 100644 index 000000000..b27992278 --- /dev/null +++ b/src/main/java/com/shinoow/abyssalcraft/api/render/package-info.java @@ -0,0 +1,3 @@ +@API(apiVersion="1.2.0",owner="abyssalcraft",provides="AbyssalCraftAPI") +package com.shinoow.abyssalcraft.api.render; +import cpw.mods.fml.common.API; \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/client/ACParticleFX.java b/src/main/java/com/shinoow/abyssalcraft/client/ACParticleFX.java index c122922e2..2cc1aa5be 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/ACParticleFX.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/ACParticleFX.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/ClientProxy.java b/src/main/java/com/shinoow/abyssalcraft/client/ClientProxy.java index eb294dc9e..e6cab7db0 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/ClientProxy.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/ClientProxy.java @@ -1,36 +1,39 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client; import net.minecraft.client.model.*; import net.minecraft.client.renderer.entity.RenderSnowball; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraftforge.client.MinecraftForgeClient; import com.shinoow.abyssalcraft.AbyssalCraft; +import com.shinoow.abyssalcraft.api.render.Block3DRender; import com.shinoow.abyssalcraft.client.model.entity.*; import com.shinoow.abyssalcraft.client.model.item.ModelDreadiumSamuraiArmor; import com.shinoow.abyssalcraft.client.render.block.*; import com.shinoow.abyssalcraft.client.render.entity.*; import com.shinoow.abyssalcraft.client.render.item.*; +import com.shinoow.abyssalcraft.client.render.player.RenderPlayerAC; import com.shinoow.abyssalcraft.common.CommonProxy; import com.shinoow.abyssalcraft.common.blocks.tile.*; import com.shinoow.abyssalcraft.common.entity.*; import com.shinoow.abyssalcraft.common.entity.anti.*; -import com.shinoow.abyssalcraft.core.api.render.Block3DRender; import cpw.mods.fml.client.registry.*; import cpw.mods.fml.relauncher.*; @@ -67,6 +70,8 @@ public void registerRenderThings() { RenderingRegistry.registerEntityRenderingHandler(EntityChagaroth.class, new RenderChagaroth()); RenderingRegistry.registerEntityRenderingHandler(EntityShadowBeast.class, new RenderShadowBeast()); RenderingRegistry.registerEntityRenderingHandler(EntitySacthoth.class, new RenderSacthoth()); + if(AbyssalCraft.canRenderStarspawn == true) + RenderingRegistry.registerEntityRenderingHandler(EntityPlayer.class, new RenderPlayerAC()); RenderingRegistry.registerEntityRenderingHandler(EntityAntiAbyssalZombie.class, new RenderAntiAbyssalZombie()); RenderingRegistry.registerEntityRenderingHandler(EntityAntiBat.class, new RenderAntiBat()); @@ -89,12 +94,15 @@ public void registerRenderThings() { ClientRegistry.bindTileEntitySpecialRenderer(TileEntityDreadAltarBottom.class, new TileEntityDreadAltarBottomRenderer()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityDreadAltarTop.class, new TileEntityDreadAltarTopRenderer()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityODB.class, new TileEntityODBRenderer()); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityEngraver.class, new TileEntityEngraverRenderer()); MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(AbyssalCraft.PSDL), new Block3DRender(new TileEntityPSDLRenderer(), new TileEntityPSDL())); MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(AbyssalCraft.Altar), new Block3DRender(new TileEntityAltarRenderer(), new TileEntityAltar())); MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(AbyssalCraft.ODB), new Block3DRender(new TileEntityODBRenderer(), new TileEntityODB())); MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(AbyssalCraft.dreadaltarbottom), new Block3DRender(new TileEntityDreadAltarBottomRenderer(), new TileEntityDreadAltarBottom())); MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(AbyssalCraft.dreadaltartop), new Block3DRender(new TileEntityDreadAltarTopRenderer(), new TileEntityDreadAltarTop())); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(AbyssalCraft.engraver), new Block3DRender(new TileEntityEngraverRenderer(), new TileEntityEngraver())); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(AbyssalCraft.engraver_on), new Block3DRender(new TileEntityEngraverRenderer(), new TileEntityEngraver())); MinecraftForgeClient.registerItemRenderer(AbyssalCraft.Staff, new RenderStaff()); MinecraftForgeClient.registerItemRenderer(AbyssalCraft.cudgel, new RenderCudgel()); MinecraftForgeClient.registerItemRenderer(AbyssalCraft.dreadhilt, new RenderHilt()); diff --git a/src/main/java/com/shinoow/abyssalcraft/client/config/ACConfigGUI.java b/src/main/java/com/shinoow/abyssalcraft/client/config/ACConfigGUI.java index 55086fa1e..e309ffa64 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/config/ACConfigGUI.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/config/ACConfigGUI.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.config; @@ -40,7 +41,10 @@ private static List getConfigElements(){ list.add(new DummyCategoryElement(StatCollector.translateToLocal("ac_biomes"), "ac_biomes", BiomeEntry.class)); list.add(new DummyCategoryElement(StatCollector.translateToLocal("ac_biomegen"), "ac_biomegen", BiomeGenerationEntry.class)); list.add(new DummyCategoryElement(StatCollector.translateToLocal("ac_biomespawn"), "ac_biomespawn", BiomeSpawnEntry.class)); + list.add(new DummyCategoryElement(StatCollector.translateToLocal("ac_biomeweight"), "ac_biomeweight", BiomeWeightEntry.class)); list.add(new DummyCategoryElement(StatCollector.translateToLocal("ac_general"), "ac_general", GeneralEntry.class)); + list.add(new DummyCategoryElement(StatCollector.translateToLocal("ac_enchantment"), "ac_enchantment", EnchantmentEntry.class)); + list.add(new DummyCategoryElement(StatCollector.translateToLocal("ac_render"), "ac_render", RenderEntry.class)); return list; } @@ -89,6 +93,17 @@ protected GuiScreen buildChildScreen(){ return new GuiConfig(owningScreen, new ConfigElement(AbyssalCraft.cfg.getCategory("biome_spawning")).getChildElements(), "abyssalcraft", "biome_spawning", true, true, StatCollector.translateToLocal("ac_biomespawn")); } } + public static class BiomeWeightEntry extends CategoryEntry{ + + public BiomeWeightEntry(GuiConfig owningScreen, GuiConfigEntries owningEntryList, IConfigElement configElement) { + super(owningScreen, owningEntryList, configElement); + } + + @Override + protected GuiScreen buildChildScreen(){ + return new GuiConfig(owningScreen, new ConfigElement(AbyssalCraft.cfg.getCategory("biome_weight")).getChildElements(), "abyssalcraft", "biome_weight", true, true, StatCollector.translateToLocal("ac_biomeweight")); + } + } public static class GeneralEntry extends CategoryEntry{ public GeneralEntry(GuiConfig owningScreen, GuiConfigEntries owningEntryList, IConfigElement configElement) { @@ -101,4 +116,28 @@ protected GuiScreen buildChildScreen(){ } } + public static class EnchantmentEntry extends CategoryEntry{ + + public EnchantmentEntry(GuiConfig owningScreen, GuiConfigEntries owningEntryList, IConfigElement configElement) { + super(owningScreen, owningEntryList, configElement); + } + + @Override + protected GuiScreen buildChildScreen(){ + return new GuiConfig(owningScreen, new ConfigElement(AbyssalCraft.cfg.getCategory("enchantments")).getChildElements(), "abyssalcraft", "enchantments", true, true, StatCollector.translateToLocal("ac_enchantment")); + + } + } + public static class RenderEntry extends CategoryEntry{ + + public RenderEntry(GuiConfig owningScreen, GuiConfigEntries owningEntryList, IConfigElement configElement) { + super(owningScreen, owningEntryList, configElement); + } + + @Override + protected GuiScreen buildChildScreen(){ + return new GuiConfig(owningScreen, new ConfigElement(AbyssalCraft.cfg.getCategory("render")).getChildElements(), "abyssalcraft", "render", true, true, StatCollector.translateToLocal("ac_render")); + + } + } } \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/client/config/ACGuiFactory.java b/src/main/java/com/shinoow/abyssalcraft/client/config/ACGuiFactory.java index 71212cdd9..c8e3da576 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/config/ACGuiFactory.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/config/ACGuiFactory.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.config; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/gui/GuiCrystallizer.java b/src/main/java/com/shinoow/abyssalcraft/client/gui/GuiCrystallizer.java index 3c22a544b..426b0b8fd 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/gui/GuiCrystallizer.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/gui/GuiCrystallizer.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.gui; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/gui/GuiEngraver.java b/src/main/java/com/shinoow/abyssalcraft/client/gui/GuiEngraver.java new file mode 100644 index 000000000..c5bcc32c3 --- /dev/null +++ b/src/main/java/com/shinoow/abyssalcraft/client/gui/GuiEngraver.java @@ -0,0 +1,60 @@ +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.shinoow.abyssalcraft.client.gui; + +import org.lwjgl.opengl.GL11; + +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.resources.I18n; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.util.ResourceLocation; + +import com.shinoow.abyssalcraft.common.blocks.tile.TileEntityEngraver; +import com.shinoow.abyssalcraft.common.inventory.ContainerEngraver; + +public class GuiEngraver extends GuiContainer { + + private static final ResourceLocation engraverGuiTexture = new ResourceLocation("abyssalcraft:textures/gui/container/engraver.png"); + private TileEntityEngraver tileEngraver; + + public GuiEngraver(InventoryPlayer par1InventoryPlayer, TileEntityEngraver par2TileEntityEngraver) { + super(new ContainerEngraver(par1InventoryPlayer, par2TileEntityEngraver)); + tileEngraver = par2TileEntityEngraver; + } + + @Override + protected void drawGuiContainerForegroundLayer(int par1, int par2) + { + String s = tileEngraver.hasCustomInventoryName() ? tileEngraver.getInventoryName() : I18n.format(tileEngraver.getInventoryName(), new Object[0]); + fontRendererObj.drawString(s, xSize / 2 - fontRendererObj.getStringWidth(s) / 2, 6, 4210752); + fontRendererObj.drawString(I18n.format("container.inventory", new Object[0]), 8, ySize - 96 + 2, 4210752); + } + + @Override + protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) + { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + mc.getTextureManager().bindTexture(engraverGuiTexture); + int k = (width - xSize) / 2; + int l = (height - ySize) / 2; + drawTexturedModalRect(k, l, 0, 0, xSize, ySize); + int i1; + + i1 = tileEngraver.getProcessProgressScaled(24); + drawTexturedModalRect(k + 79, l + 34, 176, 14, i1 + 1, 16); + } +} \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/client/gui/GuiTransmutator.java b/src/main/java/com/shinoow/abyssalcraft/client/gui/GuiTransmutator.java index fd7eecf01..8d14c5630 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/gui/GuiTransmutator.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/gui/GuiTransmutator.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.gui; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/lib/ParticleEffects.java b/src/main/java/com/shinoow/abyssalcraft/client/lib/ParticleEffects.java index 3188e0612..62c18fc26 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/lib/ParticleEffects.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/lib/ParticleEffects.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.lib; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/model/block/ModelAltar.java b/src/main/java/com/shinoow/abyssalcraft/client/model/block/ModelAltar.java index 8695ec7b9..6a0ff94aa 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/model/block/ModelAltar.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/model/block/ModelAltar.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.model.block; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/model/block/ModelDGhead.java b/src/main/java/com/shinoow/abyssalcraft/client/model/block/ModelDGhead.java index 79844f328..1f23b06ee 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/model/block/ModelDGhead.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/model/block/ModelDGhead.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.model.block; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/model/block/ModelDreadAltarBottom.java b/src/main/java/com/shinoow/abyssalcraft/client/model/block/ModelDreadAltarBottom.java index d7716e752..bd21ec964 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/model/block/ModelDreadAltarBottom.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/model/block/ModelDreadAltarBottom.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.model.block; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/model/block/ModelDreadAltarTop.java b/src/main/java/com/shinoow/abyssalcraft/client/model/block/ModelDreadAltarTop.java index ebb627aec..dd9d5de56 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/model/block/ModelDreadAltarTop.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/model/block/ModelDreadAltarTop.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.model.block; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/model/block/ModelEngraver.java b/src/main/java/com/shinoow/abyssalcraft/client/model/block/ModelEngraver.java new file mode 100644 index 000000000..5a40e7b9e --- /dev/null +++ b/src/main/java/com/shinoow/abyssalcraft/client/model/block/ModelEngraver.java @@ -0,0 +1,141 @@ +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.shinoow.abyssalcraft.client.model.block; + +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.entity.Entity; + +public class ModelEngraver extends ModelBase { + + ModelRenderer anvilbottom; + ModelRenderer anvilcenter; + ModelRenderer anviltop; + ModelRenderer engraver1; + ModelRenderer crank; + ModelRenderer handle1; + ModelRenderer handle2; + ModelRenderer engraver2; + ModelRenderer engraver3; + ModelRenderer engraver4; + ModelRenderer engraver5; + + public ModelEngraver() + { + textureWidth = 64; + textureHeight = 32; + + anvilbottom = new ModelRenderer(this, 31, 16); + anvilbottom.addBox(0F, 0F, 0F, 7, 1, 9); + anvilbottom.setRotationPoint(-1.5F, 23F, -4.5F); + anvilbottom.setTextureSize(64, 32); + anvilbottom.mirror = true; + setRotation(anvilbottom, 0F, 0F, 0F); + anvilcenter = new ModelRenderer(this, 36, 6); + anvilcenter.addBox(0F, 0F, 0F, 5, 3, 7); + anvilcenter.setRotationPoint(-0.5F, 20F, -3.5F); + anvilcenter.setTextureSize(64, 32); + anvilcenter.mirror = true; + setRotation(anvilcenter, 0F, 0F, 0F); + anviltop = new ModelRenderer(this, 0, 0); + anviltop.addBox(0F, 0F, 0F, 8, 2, 10); + anviltop.setRotationPoint(-2F, 18F, -5F); + anviltop.setTextureSize(64, 32); + anviltop.mirror = true; + setRotation(anviltop, 0F, 0F, 0F); + engraver1 = new ModelRenderer(this, 0, 12); + engraver1.addBox(0F, 0F, 0F, 3, 13, 4); + engraver1.setRotationPoint(-5F, 11F, -2F); + engraver1.setTextureSize(64, 32); + engraver1.mirror = true; + setRotation(engraver1, 0F, 0F, 0F); + crank = new ModelRenderer(this, 26, 0); + crank.addBox(0F, 0F, 0F, 1, 1, 7); + crank.setRotationPoint(-6F, 16F, -3F); + crank.setTextureSize(64, 32); + crank.mirror = true; + setRotation(crank, -0.3717861F, 0F, 0F); + handle1 = new ModelRenderer(this, 0, 0); + handle1.addBox(-1F, 0F, 0F, 2, 1, 1); + handle1.setRotationPoint(-7F, 16F, -3F); + handle1.setTextureSize(64, 32); + handle1.mirror = true; + setRotation(handle1, -0.37179F, 0F, 0F); + handle2 = new ModelRenderer(this, 0, 0); + handle2.addBox(-1F, 0F, 0F, 2, 1, 1); + handle2.setRotationPoint(-7F, 18.2F, 2.6F); + handle2.setTextureSize(64, 32); + handle2.mirror = true; + setRotation(handle2, -0.37179F, 0F, 0F); + engraver2 = new ModelRenderer(this, 36, 0); + engraver2.addBox(0F, 0F, 0F, 5, 1, 5); + engraver2.setRotationPoint(-0.5F, 17F, -2.5F); + engraver2.setTextureSize(64, 32); + engraver2.mirror = true; + setRotation(engraver2, 0F, 0F, 0F); + engraver3 = new ModelRenderer(this, 14, 14); + engraver3.addBox(0F, 0F, 0F, 9, 3, 4); + engraver3.setRotationPoint(-5F, 8F, -2F); + engraver3.setTextureSize(64, 32); + engraver3.mirror = true; + setRotation(engraver3, 0F, 0F, 0F); + engraver4 = new ModelRenderer(this, 14, 21); + engraver4.addBox(0F, 0F, 0F, 2, 5, 2); + engraver4.setRotationPoint(1F, 9F, -1F); + engraver4.setTextureSize(64, 32); + engraver4.mirror = true; + setRotation(engraver4, 0F, 0F, 0F); + engraver5 = new ModelRenderer(this, 36, 0); + engraver5.addBox(0F, 0F, 0F, 5, 1, 5); + engraver5.setRotationPoint(-0.5F, 14F, -2.5F); + engraver5.setTextureSize(64, 32); + engraver5.mirror = true; + setRotation(engraver5, 0F, 0F, 0F); + } + + @Override + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) + { + super.render(entity, f, f1, f2, f3, f4, f5); + setRotationAngles(f, f1, f2, f3, f4, f5, entity); + anvilbottom.render(f5); + anvilcenter.render(f5); + anviltop.render(f5); + engraver1.render(f5); + crank.render(f5); + handle1.render(f5); + handle2.render(f5); + engraver2.render(f5); + engraver3.render(f5); + engraver4.render(f5); + engraver5.render(f5); + } + + private void setRotation(ModelRenderer model, float x, float y, float z) + { + model.rotateAngleX = x; + model.rotateAngleY = y; + model.rotateAngleZ = z; + } + + @Override + public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) + { + super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); + } + +} diff --git a/src/main/java/com/shinoow/abyssalcraft/client/model/block/ModelODB.java b/src/main/java/com/shinoow/abyssalcraft/client/model/block/ModelODB.java index 1a3c375f2..d7cabddb9 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/model/block/ModelODB.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/model/block/ModelODB.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.model.block; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelAntiBat.java b/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelAntiBat.java index 9ae12de3e..e332ce880 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelAntiBat.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelAntiBat.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.model.entity; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelAntiSkeleton.java b/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelAntiSkeleton.java index f74a07a35..2ddaa912e 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelAntiSkeleton.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelAntiSkeleton.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.model.entity; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelChagaroth.java b/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelChagaroth.java index de3d6e1f7..910c92110 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelChagaroth.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelChagaroth.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.model.entity; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelChagarothFist.java b/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelChagarothFist.java index 2cc03c803..672a3c9f8 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelChagarothFist.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelChagarothFist.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.model.entity; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelChagarothSpawn.java b/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelChagarothSpawn.java index 9cc2e8805..aeb8d4792 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelChagarothSpawn.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelChagarothSpawn.java @@ -1,3 +1,19 @@ +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.shinoow.abyssalcraft.client.model.entity; import net.minecraft.client.model.ModelBase; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelDG.java b/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelDG.java index d57694299..f1abbddbe 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelDG.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelDG.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.model.entity; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelDragonBoss.java b/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelDragonBoss.java index 775653f53..0cf85905e 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelDragonBoss.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelDragonBoss.java @@ -1,3 +1,19 @@ +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.shinoow.abyssalcraft.client.model.entity; import net.minecraft.client.model.ModelBase; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelDragonMinion.java b/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelDragonMinion.java index da2b06801..68c336f10 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelDragonMinion.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelDragonMinion.java @@ -1,3 +1,19 @@ +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.shinoow.abyssalcraft.client.model.entity; import net.minecraft.client.model.ModelBase; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelDreadSpawn.java b/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelDreadSpawn.java index 12d220122..82d6b8acd 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelDreadSpawn.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelDreadSpawn.java @@ -1,3 +1,19 @@ +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.shinoow.abyssalcraft.client.model.entity; import net.minecraft.client.model.ModelBase; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelDreadling.java b/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelDreadling.java index dd57f07cb..b221804ad 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelDreadling.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelDreadling.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.model.entity; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelJzahar.java b/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelJzahar.java index 110a9913e..01e7bb3bf 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelJzahar.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelJzahar.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.model.entity; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelSacthoth.java b/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelSacthoth.java index 7a0aca2c2..2be4b113e 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelSacthoth.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelSacthoth.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.model.entity; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelShadowBeast.java b/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelShadowBeast.java index d7ba1ff10..c4df06fda 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelShadowBeast.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelShadowBeast.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.model.entity; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelShadowCreature.java b/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelShadowCreature.java index d866f0a7d..a3d948b86 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelShadowCreature.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelShadowCreature.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.model.entity; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelShadowMonster.java b/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelShadowMonster.java index 402a7e2a7..9aa0ed8cc 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelShadowMonster.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelShadowMonster.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.model.entity; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelSkeletonGoliath.java b/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelSkeletonGoliath.java index 995a54d2c..db2159b78 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelSkeletonGoliath.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/model/entity/ModelSkeletonGoliath.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.model.entity; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/model/item/ModelCudgel.java b/src/main/java/com/shinoow/abyssalcraft/client/model/item/ModelCudgel.java index 56cbe0f48..3917e146d 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/model/item/ModelCudgel.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/model/item/ModelCudgel.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.model.item; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/model/item/ModelDreadiumSamuraiArmor.java b/src/main/java/com/shinoow/abyssalcraft/client/model/item/ModelDreadiumSamuraiArmor.java index bab6e9ba6..af5f374cd 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/model/item/ModelDreadiumSamuraiArmor.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/model/item/ModelDreadiumSamuraiArmor.java @@ -1,3 +1,19 @@ +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.shinoow.abyssalcraft.client.model.item; import net.minecraft.client.model.ModelBiped; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/model/item/ModelHilt.java b/src/main/java/com/shinoow/abyssalcraft/client/model/item/ModelHilt.java index 0722ea2fd..e4a7ee02d 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/model/item/ModelHilt.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/model/item/ModelHilt.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.model.item; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/model/item/ModelKatana.java b/src/main/java/com/shinoow/abyssalcraft/client/model/item/ModelKatana.java index 504cd907d..e7a2cbf58 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/model/item/ModelKatana.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/model/item/ModelKatana.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.model.item; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/model/item/ModelStaff.java b/src/main/java/com/shinoow/abyssalcraft/client/model/item/ModelStaff.java index 496825492..c84d6b5f2 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/model/item/ModelStaff.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/model/item/ModelStaff.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.model.item; diff --git a/src/main/java/com/shinoow/abyssalcraft/core/client/model/ModelStarSpawnPlayer.java b/src/main/java/com/shinoow/abyssalcraft/client/model/player/ModelStarSpawnPlayer.java similarity index 93% rename from src/main/java/com/shinoow/abyssalcraft/core/client/model/ModelStarSpawnPlayer.java rename to src/main/java/com/shinoow/abyssalcraft/client/model/player/ModelStarSpawnPlayer.java index 17fa99d92..2be9250f4 100644 --- a/src/main/java/com/shinoow/abyssalcraft/core/client/model/ModelStarSpawnPlayer.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/model/player/ModelStarSpawnPlayer.java @@ -1,19 +1,20 @@ -/**AbyssalCraft Core - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ -package com.shinoow.abyssalcraft.core.client.model; +package com.shinoow.abyssalcraft.client.model.player; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/render/block/RenderODB.java b/src/main/java/com/shinoow/abyssalcraft/client/render/block/RenderODB.java index ab82f4efd..2a2baa635 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/render/block/RenderODB.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/render/block/RenderODB.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.render.block; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/render/block/RenderODBc.java b/src/main/java/com/shinoow/abyssalcraft/client/render/block/RenderODBc.java index 52580ba63..34f7081fb 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/render/block/RenderODBc.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/render/block/RenderODBc.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.render.block; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/render/block/TileEntityAltarRenderer.java b/src/main/java/com/shinoow/abyssalcraft/client/render/block/TileEntityAltarRenderer.java index 3b2f39336..a43c34357 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/render/block/TileEntityAltarRenderer.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/render/block/TileEntityAltarRenderer.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.render.block; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/render/block/TileEntityDGheadRenderer.java b/src/main/java/com/shinoow/abyssalcraft/client/render/block/TileEntityDGheadRenderer.java index 43f4cc3af..bb9f1f3a0 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/render/block/TileEntityDGheadRenderer.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/render/block/TileEntityDGheadRenderer.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.render.block; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/render/block/TileEntityDreadAltarBottomRenderer.java b/src/main/java/com/shinoow/abyssalcraft/client/render/block/TileEntityDreadAltarBottomRenderer.java index 27cecec73..8a1eb985d 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/render/block/TileEntityDreadAltarBottomRenderer.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/render/block/TileEntityDreadAltarBottomRenderer.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.render.block; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/render/block/TileEntityDreadAltarTopRenderer.java b/src/main/java/com/shinoow/abyssalcraft/client/render/block/TileEntityDreadAltarTopRenderer.java index 7992f11f2..48a1b438c 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/render/block/TileEntityDreadAltarTopRenderer.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/render/block/TileEntityDreadAltarTopRenderer.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.render.block; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/render/block/TileEntityEngraverRenderer.java b/src/main/java/com/shinoow/abyssalcraft/client/render/block/TileEntityEngraverRenderer.java new file mode 100644 index 000000000..286788179 --- /dev/null +++ b/src/main/java/com/shinoow/abyssalcraft/client/render/block/TileEntityEngraverRenderer.java @@ -0,0 +1,68 @@ +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.shinoow.abyssalcraft.client.render.block; + +import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.entity.Entity; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.World; + +import org.lwjgl.opengl.GL11; + +import com.shinoow.abyssalcraft.client.model.block.ModelEngraver; +import com.shinoow.abyssalcraft.common.blocks.tile.TileEntityEngraver; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class TileEntityEngraverRenderer extends TileEntitySpecialRenderer { + + ModelEngraver model = new ModelEngraver(); + private static final ResourceLocation Resourcelocation = new ResourceLocation("abyssalcraft:textures/model/blocks/Engraver.png"); + + @Override + public void renderTileEntityAt(TileEntity te, double x, double y, double z, float scale) { + + GL11.glPushMatrix(); + GL11.glTranslatef((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F); + GL11.glPushMatrix(); + GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); + + Minecraft.getMinecraft().renderEngine.bindTexture(Resourcelocation); + model.render((Entity)null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F); + + GL11.glPopMatrix(); + GL11.glPopMatrix(); + } + + public void renderBlockEngraver(TileEntityEngraver tl, World world, int i, int j, int k, Block block) { + Tessellator tessellator = Tessellator.instance; + + float f = block.getLightOpacity(world, i, j, k); + int l = world.getLightBrightnessForSkyBlocks(i, j, k, 0); + int l1 = l % 65536; + int l2 = l / 65536; + tessellator.setColorOpaque_F(f, f, f); + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, l1, l2); + } +} \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/client/render/block/TileEntityODBRenderer.java b/src/main/java/com/shinoow/abyssalcraft/client/render/block/TileEntityODBRenderer.java index 07613345b..02ff67e54 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/render/block/TileEntityODBRenderer.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/render/block/TileEntityODBRenderer.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.render.block; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/render/block/TileEntityOheadRenderer.java b/src/main/java/com/shinoow/abyssalcraft/client/render/block/TileEntityOheadRenderer.java index 04f6242ee..ef97f2a18 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/render/block/TileEntityOheadRenderer.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/render/block/TileEntityOheadRenderer.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.render.block; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/render/block/TileEntityPSDLRenderer.java b/src/main/java/com/shinoow/abyssalcraft/client/render/block/TileEntityPSDLRenderer.java index 6b27cebf2..07441e6db 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/render/block/TileEntityPSDLRenderer.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/render/block/TileEntityPSDLRenderer.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.render.block; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/render/block/TileEntityPheadRenderer.java b/src/main/java/com/shinoow/abyssalcraft/client/render/block/TileEntityPheadRenderer.java index b76a510e0..1fe783764 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/render/block/TileEntityPheadRenderer.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/render/block/TileEntityPheadRenderer.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.render.block; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/render/block/TileEntityWheadRenderer.java b/src/main/java/com/shinoow/abyssalcraft/client/render/block/TileEntityWheadRenderer.java index 5e35251d9..22bebf553 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/render/block/TileEntityWheadRenderer.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/render/block/TileEntityWheadRenderer.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.render.block; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderAbyssalZombie.java b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderAbyssalZombie.java index 3d4003de8..0d93998db 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderAbyssalZombie.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderAbyssalZombie.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.render.entity; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderAntiAbyssalZombie.java b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderAntiAbyssalZombie.java index 41ba64c6a..8bce6c1d6 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderAntiAbyssalZombie.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderAntiAbyssalZombie.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.render.entity; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderAntiBat.java b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderAntiBat.java index 21038805e..61804569d 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderAntiBat.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderAntiBat.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.render.entity; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderAntiChicken.java b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderAntiChicken.java index b60bcf144..db965ec16 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderAntiChicken.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderAntiChicken.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.render.entity; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderAntiCow.java b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderAntiCow.java index 2329eb92c..3dc5a7c29 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderAntiCow.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderAntiCow.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.render.entity; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderAntiCreeper.java b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderAntiCreeper.java index 673e287a1..cffabcaf8 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderAntiCreeper.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderAntiCreeper.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.render.entity; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderAntiGhoul.java b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderAntiGhoul.java index 6378f6e76..fd8a9e847 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderAntiGhoul.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderAntiGhoul.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.render.entity; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderAntiPig.java b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderAntiPig.java index 94c219bb5..912f8891a 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderAntiPig.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderAntiPig.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.render.entity; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderAntiPlayer.java b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderAntiPlayer.java index d698b0433..d9c19963c 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderAntiPlayer.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderAntiPlayer.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.render.entity; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderAntiSkeleton.java b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderAntiSkeleton.java index c846eb199..828abd584 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderAntiSkeleton.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderAntiSkeleton.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.render.entity; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderAntiSpider.java b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderAntiSpider.java index b06270ff0..50b9d6a00 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderAntiSpider.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderAntiSpider.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.render.entity; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderAntiZombie.java b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderAntiZombie.java index ed831ef0a..d6a5a9a01 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderAntiZombie.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderAntiZombie.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.render.entity; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderChagaroth.java b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderChagaroth.java index b4026dcbc..b66554370 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderChagaroth.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderChagaroth.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.render.entity; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderChagarothFist.java b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderChagarothFist.java index ec9920675..eb09c9dc0 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderChagarothFist.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderChagarothFist.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.render.entity; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderChagarothSpawn.java b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderChagarothSpawn.java index 4ad4e92a6..cf4578a9f 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderChagarothSpawn.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderChagarothSpawn.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.render.entity; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderDemonPig.java b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderDemonPig.java index 07113ff60..392e4be81 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderDemonPig.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderDemonPig.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.render.entity; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderDepthsghoul.java b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderDepthsghoul.java index baef0d9fe..ed972e51c 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderDepthsghoul.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderDepthsghoul.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.render.entity; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderDragonBoss.java b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderDragonBoss.java index 51713cffc..4650f03d0 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderDragonBoss.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderDragonBoss.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.render.entity; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderDragonMinion.java b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderDragonMinion.java index e778f341f..b27ff9b49 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderDragonMinion.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderDragonMinion.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.render.entity; @@ -96,7 +97,10 @@ protected void renderDragonModel(EntityDragonMinion par1EntityDragonMinion, floa } bindEntityTexture(par1EntityDragonMinion); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); mainModel.render(par1EntityDragonMinion, par2, par3, par4, par5, par6, par7); + GL11.glDisable(GL11.GL_BLEND); if (par1EntityDragonMinion.hurtTime > 0) { diff --git a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderDreadSpawn.java b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderDreadSpawn.java index 7a5f7e18c..924924484 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderDreadSpawn.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderDreadSpawn.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.render.entity; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderDreadling.java b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderDreadling.java index 5c6a4f16b..3a587edd1 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderDreadling.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderDreadling.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.render.entity; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderJzahar.java b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderJzahar.java index dc5d01222..67f6e64bc 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderJzahar.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderJzahar.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.render.entity; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderPig.java b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderPig.java index 13625f2de..c2ff50200 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderPig.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderPig.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.render.entity; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderSacthoth.java b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderSacthoth.java index bdf9e7091..60c8c35ee 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderSacthoth.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderSacthoth.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.render.entity; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderShadowBeast.java b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderShadowBeast.java index 7df09d571..b1b5014e4 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderShadowBeast.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderShadowBeast.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.render.entity; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderShadowCreature.java b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderShadowCreature.java index 98aeb64c2..6226b84ec 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderShadowCreature.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderShadowCreature.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.render.entity; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderShadowMonster.java b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderShadowMonster.java index 8c8f65d67..43cb03f7d 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderShadowMonster.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderShadowMonster.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.render.entity; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderSkeletonGoliath.java b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderSkeletonGoliath.java index bbe9654de..ba5b07a9a 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderSkeletonGoliath.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/RenderSkeletonGoliath.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.render.entity; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/Renderabygolem.java b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/Renderabygolem.java index 94720d259..6d44d472e 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/Renderabygolem.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/Renderabygolem.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.render.entity; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/Renderdreadgolem.java b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/Renderdreadgolem.java index 416c686a6..d570e0be9 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/Renderdreadgolem.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/Renderdreadgolem.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.render.entity; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/Renderdreadguard.java b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/Renderdreadguard.java index ce7e4dd2a..895a26c03 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/render/entity/Renderdreadguard.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/render/entity/Renderdreadguard.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.render.entity; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/render/item/RenderCudgel.java b/src/main/java/com/shinoow/abyssalcraft/client/render/item/RenderCudgel.java index fbdcfc427..a1e61accb 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/render/item/RenderCudgel.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/render/item/RenderCudgel.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.render.item; import net.minecraft.entity.Entity; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/render/item/RenderHilt.java b/src/main/java/com/shinoow/abyssalcraft/client/render/item/RenderHilt.java index d0140dd0b..3a698685b 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/render/item/RenderHilt.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/render/item/RenderHilt.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.render.item; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/render/item/RenderKatana.java b/src/main/java/com/shinoow/abyssalcraft/client/render/item/RenderKatana.java index 32648fc39..9fcea147d 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/render/item/RenderKatana.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/render/item/RenderKatana.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.render.item; import net.minecraft.entity.Entity; diff --git a/src/main/java/com/shinoow/abyssalcraft/client/render/item/RenderStaff.java b/src/main/java/com/shinoow/abyssalcraft/client/render/item/RenderStaff.java index d6a4ebc78..f58876b43 100644 --- a/src/main/java/com/shinoow/abyssalcraft/client/render/item/RenderStaff.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/render/item/RenderStaff.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.client.render.item; import net.minecraft.entity.Entity; diff --git a/src/main/java/com/shinoow/abyssalcraft/core/client/render/RenderPlayerAC.java b/src/main/java/com/shinoow/abyssalcraft/client/render/player/RenderPlayerAC.java similarity index 92% rename from src/main/java/com/shinoow/abyssalcraft/core/client/render/RenderPlayerAC.java rename to src/main/java/com/shinoow/abyssalcraft/client/render/player/RenderPlayerAC.java index 414650b55..2446bc1d8 100644 --- a/src/main/java/com/shinoow/abyssalcraft/core/client/render/RenderPlayerAC.java +++ b/src/main/java/com/shinoow/abyssalcraft/client/render/player/RenderPlayerAC.java @@ -1,4 +1,20 @@ -package com.shinoow.abyssalcraft.core.client.render; +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.shinoow.abyssalcraft.client.render.player; import static net.minecraftforge.client.IItemRenderer.ItemRenderType.EQUIPPED; import static net.minecraftforge.client.IItemRenderer.ItemRendererHelper.BLOCK_3D; @@ -9,20 +25,17 @@ import net.minecraft.client.renderer.entity.RenderPlayer; import net.minecraft.client.renderer.tileentity.TileEntitySkullRenderer; import net.minecraft.init.Items; -import net.minecraft.item.EnumAction; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.client.MinecraftForgeClient; +import net.minecraftforge.client.*; import net.minecraftforge.client.event.RenderPlayerEvent; import net.minecraftforge.common.MinecraftForge; import org.lwjgl.opengl.GL11; -import com.shinoow.abyssalcraft.core.api.item.ACItems; -import com.shinoow.abyssalcraft.core.client.model.ModelStarSpawnPlayer; +import com.shinoow.abyssalcraft.AbyssalCraft; +import com.shinoow.abyssalcraft.client.model.player.ModelStarSpawnPlayer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -207,7 +220,7 @@ else if (itemstack.getItem() == Items.skull) GL11.glRotatef(45.0F, 0.0F, 1.0F, 0.0F); GL11.glScalef(-f3, -f3, f3); } - else if (itemstack1.getItem() == Items.bow || itemstack1.getItem() == ACItems.coralium_longbow) + else if (itemstack1.getItem() == Items.bow || itemstack1.getItem() == AbyssalCraft.corbow) { f3 = 0.625F; GL11.glTranslatef(0.0F, 0.125F, 0.3125F); diff --git a/src/main/java/com/shinoow/abyssalcraft/common/AbyssalCrafting.java b/src/main/java/com/shinoow/abyssalcraft/common/AbyssalCrafting.java index 474e5e479..f19918742 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/AbyssalCrafting.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/AbyssalCrafting.java @@ -1,45 +1,43 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common; import net.minecraft.init.*; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.*; + import com.shinoow.abyssalcraft.AbyssalCraft; -import com.shinoow.abyssalcraft.core.util.*; +import com.shinoow.abyssalcraft.api.AbyssalCraftAPI; +import com.shinoow.abyssalcraft.common.util.SalvageHandler; + import cpw.mods.fml.common.registry.GameRegistry; public class AbyssalCrafting { public static void addRecipes() { - //Block crafting addBlockCrafting(); - //Block smelting addBlockSmelting(); - //Item crafting addItemCrafting(); - //Item smelting addItemSmelting(); - //Salvaging (special smelting) addSalvage(); - //Crystallization addCrystallization(); - //Transmutation addTransmutation(); + addEngraving(); } private static void addBlockCrafting(){ @@ -128,13 +126,14 @@ private static void addBlockCrafting(){ GameRegistry.addRecipe(new ItemStack(AbyssalCraft.ethaxiumstairs, 4), new Object[] {"# ", "## ", "###", '#', new ItemStack(AbyssalCraft.ethaxiumbrick, 0)}); GameRegistry.addRecipe(new ItemStack(AbyssalCraft.ethaxiumslab1, 6), new Object[] {"AAA", 'A', new ItemStack(AbyssalCraft.ethaxiumbrick, 0)}); GameRegistry.addRecipe(new ItemStack(AbyssalCraft.ethaxiumfence, 6), new Object[] {"###", "###", '#', new ItemStack(AbyssalCraft.ethaxiumbrick, 0)}); + GameRegistry.addRecipe(new ItemStack(AbyssalCraft.engraver, 1), new Object[] {"#% ", "#%&", "@% ", '#', AbyssalCraft.engravingBlank, '%', Blocks.stone, '&', Blocks.lever, '@', Blocks.anvil}); } private static void addBlockSmelting(){ GameRegistry.addSmelting(AbyssalCraft.Darkstone_cobble, new ItemStack(AbyssalCraft.Darkstone, 1), 0.1F); - CoreRegistry.addOreSmelting("oreAbyssalnite", "ingotAbyssalnite", 3F); - CoreRegistry.addOreSmelting("oreCoralium", "gemCoralium", 3F); + AbyssalCraftAPI.addOreSmelting("oreAbyssalnite", "ingotAbyssalnite", 3F); + AbyssalCraftAPI.addOreSmelting("oreCoralium", "gemCoralium", 3F); GameRegistry.addSmelting(AbyssalCraft.DLTLog, new ItemStack(Items.coal, 1, 1), 1F); GameRegistry.addSmelting(AbyssalCraft.CoraliumInfusedStone, new ItemStack(AbyssalCraft.Cpearl), 3F); GameRegistry.addSmelting(AbyssalCraft.AbyPCorOre, new ItemStack(AbyssalCraft.Cpearl), 3F); @@ -173,11 +172,11 @@ private static void addItemCrafting(){ GameRegistry.addRecipe(new ItemStack(AbyssalCraft.abyingot, 9), new Object[] {"#", '#', AbyssalCraft.abyblock}); GameRegistry.addRecipe(new ItemStack(AbyssalCraft.Corb, 1), new Object[] {"#%#", "@$@", "#%#", '#', Items.blaze_powder, '%', Items.diamond, '@', Items.ender_pearl, '$', AbyssalCraft.Cpearl}); GameRegistry.addRecipe(new ItemStack(AbyssalCraft.Corb, 1), new Object[] {"#%#", "@$@", "#%#", '#', Items.blaze_powder, '%', Items.ender_pearl, '@', Items.diamond, '$', AbyssalCraft.Cpearl}); - GameRegistry.addRecipe(new ItemStack(AbyssalCraft.pickaxeC, 1), new Object[] {"#%#", " & ", " @ ", '#', AbyssalCraft.abyingot, '%', AbyssalCraft.Corb, '&', AbyssalCraft.pickaxeA, '@', Items.blaze_rod}); - GameRegistry.addRecipe(new ItemStack(AbyssalCraft.axeC, 1), new Object[] {"#% ", "#& ", " @ ", '#', AbyssalCraft.abyingot, '%', AbyssalCraft.Corb, '&', AbyssalCraft.axeA, '@', Items.blaze_rod}); - GameRegistry.addRecipe(new ItemStack(AbyssalCraft.shovelC, 1), new Object[] {"#%#", " & ", " @ ", '#', AbyssalCraft.abyingot, '%', AbyssalCraft.Corb, '&', AbyssalCraft.shovelA, '@', Items.blaze_rod}); - GameRegistry.addRecipe(new ItemStack(AbyssalCraft.swordC, 1), new Object[] {"#%#", "#&#", " @ ", '#', AbyssalCraft.abyingot, '%', AbyssalCraft.Corb, '&', AbyssalCraft.swordA, '@', Items.blaze_rod}); - GameRegistry.addRecipe(new ItemStack(AbyssalCraft.hoeC, 1), new Object[] {"#% ", " & ", " @ ", '#', AbyssalCraft.abyingot, '%', AbyssalCraft.Corb, '&', AbyssalCraft.hoeA, '@', Items.blaze_rod}); + GameRegistry.addRecipe(new ItemStack(AbyssalCraft.pickaxeC, 1), new Object[] {"#%#", " & ", " @ ", '#', AbyssalCraft.abyblock, '%', AbyssalCraft.Corb, '&', AbyssalCraft.pickaxeA, '@', Items.blaze_rod}); + GameRegistry.addRecipe(new ItemStack(AbyssalCraft.axeC, 1), new Object[] {"#% ", "#& ", " @ ", '#', AbyssalCraft.abyblock, '%', AbyssalCraft.Corb, '&', AbyssalCraft.axeA, '@', Items.blaze_rod}); + GameRegistry.addRecipe(new ItemStack(AbyssalCraft.shovelC, 1), new Object[] {"#%#", " & ", " @ ", '#', AbyssalCraft.abyblock, '%', AbyssalCraft.Corb, '&', AbyssalCraft.shovelA, '@', Items.blaze_rod}); + GameRegistry.addRecipe(new ItemStack(AbyssalCraft.swordC, 1), new Object[] {"#%#", "#&#", " @ ", '#', AbyssalCraft.abyblock, '%', AbyssalCraft.Corb, '&', AbyssalCraft.swordA, '@', Items.blaze_rod}); + GameRegistry.addRecipe(new ItemStack(AbyssalCraft.hoeC, 1), new Object[] {"#% ", " & ", " @ ", '#', AbyssalCraft.abyblock, '%', AbyssalCraft.Corb, '&', AbyssalCraft.hoeA, '@', Items.blaze_rod}); GameRegistry.addRecipe(new ItemStack(AbyssalCraft.Cplate, 1), new Object[] {"#%#", "#%#", "#%#", '#', AbyssalCraft.Cingot, '%', AbyssalCraft.Cpearl}); GameRegistry.addRecipe(new ItemStack(AbyssalCraft.Cchunk, 1), new Object[] {"###", "#%#", "###", '#', AbyssalCraft.Coraliumcluster9, '%', AbyssalCraft.abystone}); GameRegistry.addRecipe(new ItemStack(AbyssalCraft.PSDLfinder, 4), new Object[] {"###", "#%#", "###", '#', AbyssalCraft.Coralium, '%', Items.ender_eye}); @@ -230,13 +229,15 @@ private static void addItemCrafting(){ GameRegistry.addRecipe(new ItemStack(AbyssalCraft.ethShovel, 1), new Object[] {"#", "%", "%", '#', AbyssalCraft.ethaxiumIngot, '%', AbyssalCraft.ethaxium_brick}); GameRegistry.addRecipe(new ItemStack(AbyssalCraft.ethSword, 1), new Object[] {"#", "#", "%", '#', AbyssalCraft.ethaxiumIngot, '%', AbyssalCraft.ethaxium_brick}); GameRegistry.addRecipe(new ItemStack(AbyssalCraft.ethHoe, 1), new Object[] {"##", " %", " %", '#', AbyssalCraft.ethaxiumIngot, '%', AbyssalCraft.ethaxium_brick}); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(AbyssalCraft.coin, 1, 0), true, new Object[] {" # ", "# #", " # ", '#', "ingotCopper"})); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(AbyssalCraft.coin, 1, 1), true, new Object[] {" # ", "# #", " # ", '#', "ingotIron"})); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(AbyssalCraft.coin, 1, 2), true, new Object[] {" # ", "# #", " # ", '#', "ingotGold"})); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(AbyssalCraft.coin, 1, 3), true, new Object[] {" # ", "# #", " # ", '#', "ingotTin"})); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(AbyssalCraft.coin, 1, 4), true, new Object[] {" # ", "# #", " # ", '#', "ingotAbyssalnite"})); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(AbyssalCraft.coin, 1, 5), true, new Object[] {" # ", "# #", " # ", '#', "ingotCoralium"})); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(AbyssalCraft.coin, 1, 6), true, new Object[] {" # ", "# #", " # ", '#', "ingotDreadium"})); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(AbyssalCraft.coin, 1, 0), true, new Object[] {" # ", "#%#", " # ", '#', "ingotCopper", '%', Items.flint})); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(AbyssalCraft.coin, 1, 1), true, new Object[] {" # ", "#%#", " # ", '#', "ingotIron", '%', Items.flint})); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(AbyssalCraft.coin, 1, 2), true, new Object[] {" # ", "#%#", " # ", '#', "ingotGold", '%', Items.flint})); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(AbyssalCraft.coin, 1, 3), true, new Object[] {" # ", "#%#", " # ", '#', "ingotTin", '%', Items.flint})); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(AbyssalCraft.coin, 1, 4), true, new Object[] {" # ", "#%#", " # ", '#', "ingotAbyssalnite", '%', Items.flint})); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(AbyssalCraft.coin, 1, 5), true, new Object[] {" # ", "#%#", " # ", '#', "ingotCoralium", '%', Items.flint})); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(AbyssalCraft.coin, 1, 6), true, new Object[] {" # ", "#%#", " # ", '#', "ingotDreadium", '%', Items.flint})); + GameRegistry.addRecipe(new ItemStack(AbyssalCraft.engravingBlank, 1), new Object[] {"###", "#%#", "###", '#', new ItemStack(Blocks.stone_slab, 1, 0), '%', Items.iron_ingot}); + GameRegistry.addRecipe(new ItemStack(AbyssalCraft.engravingCthulhu, 1), new Object[] {"#", "%", '#', AbyssalCraft.engravingBlank, '%', AbyssalCraft.ethaxiumIngot}); GameRegistry.addShapelessRecipe(new ItemStack(AbyssalCraft.lifeCrystal), AbyssalCraft.crystalCarbon, AbyssalCraft.crystalHydrogen, AbyssalCraft.crystalNitrogen, AbyssalCraft.crystalOxygen, AbyssalCraft.crystalPhosphorus, AbyssalCraft.crystalSulfur); @@ -306,10 +307,10 @@ private static void addItemCrafting(){ GameRegistry.addRecipe(new ItemStack(AbyssalCraft.helmet, 1), new Object[] {"###", "# #", '#', AbyssalCraft.abyingot}); GameRegistry.addRecipe(new ItemStack(AbyssalCraft.plate, 1), new Object[] {"# #", "###", "###",'#', AbyssalCraft.abyingot}); GameRegistry.addRecipe(new ItemStack(AbyssalCraft.legs, 1), new Object[] {"###", "# #", "# #",'#', AbyssalCraft.abyingot}); - GameRegistry.addRecipe(new ItemStack(AbyssalCraft.bootsC, 1), new Object[] {"#%#", "#&#", '#', AbyssalCraft.abyingot, '%', AbyssalCraft.Corb, '&', AbyssalCraft.boots}); - GameRegistry.addRecipe(new ItemStack(AbyssalCraft.helmetC, 1), new Object[] {"###", "#%#", " & ", '#', AbyssalCraft.abyingot, '%', AbyssalCraft.Corb, '&', AbyssalCraft.helmet}); - GameRegistry.addRecipe(new ItemStack(AbyssalCraft.plateC, 1), new Object[] {"#%#", "#&#", "###", '#', AbyssalCraft.abyingot, '%', AbyssalCraft.plate, '&', AbyssalCraft.Corb}); - GameRegistry.addRecipe(new ItemStack(AbyssalCraft.legsC, 1), new Object[] {"#%#", "#&#", "# #", '#', AbyssalCraft.abyingot, '%', AbyssalCraft.Corb, '&', AbyssalCraft.legs}); + GameRegistry.addRecipe(new ItemStack(AbyssalCraft.bootsC, 1), new Object[] {"#%#", "#&#", '#', AbyssalCraft.abyblock, '%', AbyssalCraft.Corb, '&', AbyssalCraft.boots}); + GameRegistry.addRecipe(new ItemStack(AbyssalCraft.helmetC, 1), new Object[] {"###", "#%#", " & ", '#', AbyssalCraft.abyblock, '%', AbyssalCraft.Corb, '&', AbyssalCraft.helmet}); + GameRegistry.addRecipe(new ItemStack(AbyssalCraft.plateC, 1), new Object[] {"#%#", "#&#", "###", '#', AbyssalCraft.abyblock, '%', AbyssalCraft.plate, '&', AbyssalCraft.Corb}); + GameRegistry.addRecipe(new ItemStack(AbyssalCraft.legsC, 1), new Object[] {"#%#", "#&#", "# #", '#', AbyssalCraft.abyblock, '%', AbyssalCraft.Corb, '&', AbyssalCraft.legs}); GameRegistry.addRecipe(new ItemStack(AbyssalCraft.Corboots, 1), new Object[] {"# #", "# #", '#', AbyssalCraft.Cingot}); GameRegistry.addRecipe(new ItemStack(AbyssalCraft.Corhelmet, 1), new Object[] {"###", "# #", '#', AbyssalCraft.Cingot}); GameRegistry.addRecipe(new ItemStack(AbyssalCraft.Corplate, 1), new Object[] {"# #", "###", "###",'#', AbyssalCraft.Cingot}); @@ -456,30 +457,18 @@ private static void addItemSmelting(){ GameRegistry.addSmelting(Items.egg, new ItemStack(AbyssalCraft.friedegg, 1), 0F); GameRegistry.addSmelting(AbyssalCraft.dreadchunk, new ItemStack(AbyssalCraft.abyingot), 3F); GameRegistry.addSmelting(AbyssalCraft.Cbucket, new ItemStack(AbyssalCraft.cstone, 1), 0.2F); + + GameRegistry.addSmelting(new ItemStack(AbyssalCraft.coin, 1, 0), new ItemStack(AbyssalCraft.copperIngot, 4), 0.5F); + GameRegistry.addSmelting(new ItemStack(AbyssalCraft.coin, 1, 1), new ItemStack(Items.iron_ingot, 4), 0.5F); + GameRegistry.addSmelting(new ItemStack(AbyssalCraft.coin, 1, 2), new ItemStack(Items.gold_ingot, 4), 0.5F); + GameRegistry.addSmelting(new ItemStack(AbyssalCraft.coin, 1, 3), new ItemStack(AbyssalCraft.tinIngot, 4), 0.5F); + GameRegistry.addSmelting(new ItemStack(AbyssalCraft.coin, 1, 4), new ItemStack(AbyssalCraft.abyingot, 4), 0.5F); + GameRegistry.addSmelting(new ItemStack(AbyssalCraft.coin, 1, 5), new ItemStack(AbyssalCraft.Cingot, 4), 0.5F); + GameRegistry.addSmelting(new ItemStack(AbyssalCraft.coin, 1, 6), new ItemStack(AbyssalCraft.dreadiumingot, 4), 0.5F); } private static void addSalvage(){ - SalvageHandler.INSTANCE.addBootsSalvage(Items.leather_boots, Items.leather); - SalvageHandler.INSTANCE.addHelmetSalvage(Items.leather_helmet, Items.leather); - SalvageHandler.INSTANCE.addChestplateSalvage(Items.leather_chestplate, Items.leather); - SalvageHandler.INSTANCE.addLeggingsSalvage(Items.leather_leggings, Items.leather); - - SalvageHandler.INSTANCE.addBootsSalvage(Items.iron_boots, Items.iron_ingot); - SalvageHandler.INSTANCE.addHelmetSalvage(Items.iron_helmet, Items.iron_ingot); - SalvageHandler.INSTANCE.addChestplateSalvage(Items.iron_chestplate, Items.iron_ingot); - SalvageHandler.INSTANCE.addLeggingsSalvage(Items.iron_leggings, Items.iron_ingot); - - SalvageHandler.INSTANCE.addBootsSalvage(Items.golden_boots, Items.gold_ingot); - SalvageHandler.INSTANCE.addHelmetSalvage(Items.golden_helmet, Items.gold_ingot); - SalvageHandler.INSTANCE.addChestplateSalvage(Items.golden_chestplate, Items.gold_ingot); - SalvageHandler.INSTANCE.addLeggingsSalvage(Items.golden_leggings, Items.gold_ingot); - - SalvageHandler.INSTANCE.addBootsSalvage(Items.diamond_boots, Items.diamond); - SalvageHandler.INSTANCE.addHelmetSalvage(Items.diamond_helmet, Items.diamond); - SalvageHandler.INSTANCE.addChestplateSalvage(Items.diamond_chestplate, Items.diamond); - SalvageHandler.INSTANCE.addLeggingsSalvage(Items.diamond_leggings, Items.diamond); - SalvageHandler.INSTANCE.addBootsSalvage(AbyssalCraft.boots, AbyssalCraft.abyingot); SalvageHandler.INSTANCE.addHelmetSalvage(AbyssalCraft.helmet, AbyssalCraft.abyingot); SalvageHandler.INSTANCE.addChestplateSalvage(AbyssalCraft.plate, AbyssalCraft.abyingot); @@ -503,115 +492,170 @@ private static void addSalvage(){ private static void addCrystallization(){ - CoreRegistry.addSingleCrystallization(AbyssalCraft.Cwater, new ItemStack(AbyssalCraft.crystalCoralium, 2), 0.4F); - CoreRegistry.addSingleCrystallization(AbyssalCraft.Cbucket, new ItemStack(AbyssalCraft.crystalCoralium, 2), 0.2F); - CoreRegistry.addSingleCrystallization(AbyssalCraft.Cingot, new ItemStack(AbyssalCraft.crystalCoralium), 0.1F); - CoreRegistry.addSingleCrystallization(AbyssalCraft.Cchunk, new ItemStack(AbyssalCraft.crystalCoralium), 0.1F); - CoreRegistry.addSingleCrystallization(AbyssalCraft.AbyLCorOre, new ItemStack(AbyssalCraft.crystalCoralium), 0.1F); - CoreRegistry.addSingleCrystallization(AbyssalCraft.abyingot, new ItemStack(AbyssalCraft.crystalAbyssalnite), 0.1F); - CoreRegistry.addSingleCrystallization(AbyssalCraft.abychunk, new ItemStack(AbyssalCraft.crystalAbyssalnite), 0.1F); - CoreRegistry.addSingleCrystallization(AbyssalCraft.dreadiumingot, new ItemStack(AbyssalCraft.crystalDreadium), 0.1F); - CoreRegistry.addSingleCrystallization(AbyssalCraft.sulfur, new ItemStack(AbyssalCraft.crystalSulfur), 0.1F); - CoreRegistry.addSingleCrystallization(Items.iron_ingot, new ItemStack(AbyssalCraft.crystalIron), 0.1F); - CoreRegistry.addSingleCrystallization(Items.gold_ingot, new ItemStack(AbyssalCraft.crystalGold), 0.1F); - CoreRegistry.addSingleCrystallization(Items.redstone, new ItemStack(AbyssalCraft.crystalRedstone), 0.1F); - CoreRegistry.addSingleCrystallization(Items.coal, new ItemStack(AbyssalCraft.crystalCarbon), 0.1F); - CoreRegistry.addSingleCrystallization(Items.blaze_powder, new ItemStack(AbyssalCraft.crystalBlaze), 0.1F); - CoreRegistry.addSingleCrystallization(new ItemStack(Items.dye, 1, 15), new ItemStack(AbyssalCraft.crystalPhosphorus), 0.0F); - CoreRegistry.addSingleCrystallization("oreAbyssalnite", "crystalAbyssalnite", 0.1F); - CoreRegistry.addSingleCrystallization("oreCoralium", "crystalCoralium", 0.1F); - CoreRegistry.addSingleCrystallization("oreIron", "crystalIron", 0.1F); - CoreRegistry.addSingleCrystallization("oreGold", "crystalGold", 0.1F); - CoreRegistry.addSingleCrystallization("ingotTin", "crystalTin", 0.1F); - CoreRegistry.addSingleCrystallization("oreTin", "crystalTin", 0.1F); - CoreRegistry.addSingleCrystallization("ingotCopper", "crystalCopper", 0.1F); - CoreRegistry.addSingleCrystallization("oreCopper", "crystalCopper", 0.1F); - CoreRegistry.addSingleCrystallization("ingotAluminum", "crystalAluminium", 0.1F); - CoreRegistry.addSingleCrystallization("ingotAluminium", "crystalAluminium", 0.1F); - CoreRegistry.addSingleCrystallization("oreAluminum", "crystalAluminium", 0.1F); - CoreRegistry.addSingleCrystallization("blockCopper", "crystalCopper", 9, 0.9F); - CoreRegistry.addSingleCrystallization("blockTin", "crystalTin", 9, 0.9F); - CoreRegistry.addSingleCrystallization(Blocks.gold_block, new ItemStack(AbyssalCraft.crystalGold, 9), 0.9F); - CoreRegistry.addSingleCrystallization(Blocks.iron_block, new ItemStack(AbyssalCraft.crystalIron, 9), 0.9F); - CoreRegistry.addSingleCrystallization(AbyssalCraft.abyblock, new ItemStack(AbyssalCraft.crystalAbyssalnite, 9), 0.9F); - CoreRegistry.addSingleCrystallization(AbyssalCraft.corblock, new ItemStack(AbyssalCraft.crystalCoralium, 9), 0.9F); - CoreRegistry.addSingleCrystallization(AbyssalCraft.dreadiumblock, new ItemStack(AbyssalCraft.crystalDreadium, 9), 0.9F); - CoreRegistry.addSingleCrystallization(Blocks.coal_ore, new ItemStack(AbyssalCraft.crystalCarbon), 0.1F); - CoreRegistry.addSingleCrystallization(Blocks.coal_block, new ItemStack(AbyssalCraft.crystalCarbon, 9), 0.9F); - CoreRegistry.addSingleCrystallization(Blocks.redstone_ore, new ItemStack(AbyssalCraft.crystalRedstone), 0.1F); - CoreRegistry.addSingleCrystallization(Blocks.redstone_block, new ItemStack(AbyssalCraft.crystalRedstone, 9), 0.9F); - CoreRegistry.addSingleCrystallization("ingotZinc", "crystalZinc", 0.1F); - CoreRegistry.addSingleCrystallization("oreZinc", "crystalZinc", 0.1F); - CoreRegistry.addCrystallization(AbyssalCraft.dreadchunk, new ItemStack(AbyssalCraft.crystalAbyssalnite), new ItemStack(AbyssalCraft.crystalDreadium), 0.2F); - CoreRegistry.addCrystallization(AbyssalCraft.dreadore, new ItemStack(AbyssalCraft.crystalAbyssalnite), new ItemStack(AbyssalCraft.crystalDreadium), 0.2F); - CoreRegistry.addCrystallization(Blocks.water, new ItemStack(AbyssalCraft.crystalHydrogen, 4), new ItemStack(AbyssalCraft.crystalOxygen, 2), 0.4F); - CoreRegistry.addCrystallization(Items.water_bucket, new ItemStack(AbyssalCraft.crystalHydrogen, 4), new ItemStack(AbyssalCraft.crystalOxygen, 2), 0.1F); - CoreRegistry.addCrystallization(new ItemStack(Items.potionitem, 1, 0), new ItemStack(AbyssalCraft.crystalHydrogen, 2), new ItemStack(AbyssalCraft.crystalOxygen), 0.1F); - CoreRegistry.addCrystallization(new ItemStack(Items.dye, 1, 4), new ItemStack(AbyssalCraft.crystalSilica, 6), new ItemStack(AbyssalCraft.crystalSulfur, 4), 0.15F); - CoreRegistry.addCrystallization(AbyssalCraft.methane, new ItemStack(AbyssalCraft.crystalCarbon), new ItemStack(AbyssalCraft.crystalHydrogen, 4), 0.1F); - CoreRegistry.addCrystallization(Items.gunpowder, new ItemStack(AbyssalCraft.crystalNitrate, 4), new ItemStack(AbyssalCraft.crystalSulfur), 0.1F); - CoreRegistry.addCrystallization("materialSaltpeter", "crystalPotassium", "crystalNitrate", 0.1F); - CoreRegistry.addCrystallization("oreSaltpeter", "crystalPotassium", "crystalNitrate", 0.1F); - CoreRegistry.addCrystallization(Blocks.obsidian, new ItemStack(AbyssalCraft.crystalSilica), new ItemStack(AbyssalCraft.crystalMagnesia), 0.1F); - CoreRegistry.addCrystallization(Blocks.stone, new ItemStack(AbyssalCraft.crystalSilica), new ItemStack(AbyssalCraft.crystalAlumina), 0.1F); - CoreRegistry.addCrystallization(AbyssalCraft.crystalSilica, new ItemStack(AbyssalCraft.crystalSilicon), new ItemStack(AbyssalCraft.crystalOxygen, 2), 0.1F); - CoreRegistry.addCrystallization(AbyssalCraft.crystalAlumina, new ItemStack(AbyssalCraft.crystalAluminium, 2), new ItemStack(AbyssalCraft.crystalOxygen, 3), 0.1F); - CoreRegistry.addCrystallization(AbyssalCraft.crystalMagnesia, new ItemStack(AbyssalCraft.crystalMagnesium), new ItemStack(AbyssalCraft.crystalOxygen), 0.1F); - CoreRegistry.addCrystallization("ingotBronze", "crystalCopper", 1, "crystalTin", 3, 0.4F); - CoreRegistry.addCrystallization(AbyssalCraft.crystalMethane, new ItemStack(AbyssalCraft.crystalCarbon), new ItemStack(AbyssalCraft.crystalHydrogen), 0.1F); - CoreRegistry.addCrystallization(AbyssalCraft.crystalNitrate, new ItemStack(AbyssalCraft.crystalNitrogen), new ItemStack(AbyssalCraft.crystalOxygen, 3), 0.1F); - CoreRegistry.addCrystallization(Blocks.lapis_ore, new ItemStack(AbyssalCraft.crystalSilica, 6), new ItemStack(AbyssalCraft.crystalSulfur, 4), 0.15F); - CoreRegistry.addCrystallization(Blocks.lapis_block, new ItemStack(AbyssalCraft.crystalSilica, 24), new ItemStack(AbyssalCraft.crystalSulfur, 16), 1.0F); - CoreRegistry.addCrystallization("ingotBrass", "crystalCopper", 3, "crystalZinc", 2, 0.5F); - CoreRegistry.addCrystallization("oreBrass", "crystalCopper", 3, "crystalZinc", 2, 0.5F); + AbyssalCraftAPI.addSingleCrystallization(AbyssalCraft.Cwater, new ItemStack(AbyssalCraft.crystalCoralium, 2), 0.4F); + AbyssalCraftAPI.addSingleCrystallization(AbyssalCraft.Cbucket, new ItemStack(AbyssalCraft.crystalCoralium, 2), 0.2F); + AbyssalCraftAPI.addSingleCrystallization(AbyssalCraft.Cingot, new ItemStack(AbyssalCraft.crystalCoralium), 0.1F); + AbyssalCraftAPI.addSingleCrystallization(AbyssalCraft.Cchunk, new ItemStack(AbyssalCraft.crystalCoralium), 0.1F); + AbyssalCraftAPI.addSingleCrystallization(AbyssalCraft.AbyLCorOre, new ItemStack(AbyssalCraft.crystalCoralium), 0.1F); + AbyssalCraftAPI.addSingleCrystallization(AbyssalCraft.abyingot, new ItemStack(AbyssalCraft.crystalAbyssalnite), 0.1F); + AbyssalCraftAPI.addSingleCrystallization(AbyssalCraft.abychunk, new ItemStack(AbyssalCraft.crystalAbyssalnite), 0.1F); + AbyssalCraftAPI.addSingleCrystallization(AbyssalCraft.dreadiumingot, new ItemStack(AbyssalCraft.crystalDreadium), 0.1F); + AbyssalCraftAPI.addSingleCrystallization(AbyssalCraft.sulfur, new ItemStack(AbyssalCraft.crystalSulfur), 0.1F); + AbyssalCraftAPI.addSingleCrystallization(Items.iron_ingot, new ItemStack(AbyssalCraft.crystalIron), 0.1F); + AbyssalCraftAPI.addSingleCrystallization(Items.gold_ingot, new ItemStack(AbyssalCraft.crystalGold), 0.1F); + AbyssalCraftAPI.addSingleCrystallization(Items.redstone, new ItemStack(AbyssalCraft.crystalRedstone), 0.1F); + AbyssalCraftAPI.addSingleCrystallization(Items.coal, new ItemStack(AbyssalCraft.crystalCarbon), 0.1F); + AbyssalCraftAPI.addSingleCrystallization(Items.blaze_powder, new ItemStack(AbyssalCraft.crystalBlaze), 0.1F); + AbyssalCraftAPI.addSingleCrystallization(new ItemStack(Items.dye, 1, 15), new ItemStack(AbyssalCraft.crystalPhosphorus), 0.0F); + AbyssalCraftAPI.addSingleCrystallization("oreAbyssalnite", "crystalAbyssalnite", 0.1F); + AbyssalCraftAPI.addSingleCrystallization("oreCoralium", "crystalCoralium", 0.1F); + AbyssalCraftAPI.addSingleCrystallization("oreIron", "crystalIron", 0.1F); + AbyssalCraftAPI.addSingleCrystallization("oreGold", "crystalGold", 0.1F); + AbyssalCraftAPI.addSingleCrystallization("ingotTin", "crystalTin", 0.1F); + AbyssalCraftAPI.addSingleCrystallization("oreTin", "crystalTin", 0.1F); + AbyssalCraftAPI.addSingleCrystallization("ingotCopper", "crystalCopper", 0.1F); + AbyssalCraftAPI.addSingleCrystallization("oreCopper", "crystalCopper", 0.1F); + AbyssalCraftAPI.addSingleCrystallization("ingotAluminum", "crystalAluminium", 0.1F); + AbyssalCraftAPI.addSingleCrystallization("ingotAluminium", "crystalAluminium", 0.1F); + AbyssalCraftAPI.addSingleCrystallization("oreAluminum", "crystalAluminium", 0.1F); + AbyssalCraftAPI.addSingleCrystallization("blockCopper", "crystalCopper", 9, 0.9F); + AbyssalCraftAPI.addSingleCrystallization("blockTin", "crystalTin", 9, 0.9F); + AbyssalCraftAPI.addSingleCrystallization(Blocks.gold_block, new ItemStack(AbyssalCraft.crystalGold, 9), 0.9F); + AbyssalCraftAPI.addSingleCrystallization(Blocks.iron_block, new ItemStack(AbyssalCraft.crystalIron, 9), 0.9F); + AbyssalCraftAPI.addSingleCrystallization(AbyssalCraft.abyblock, new ItemStack(AbyssalCraft.crystalAbyssalnite, 9), 0.9F); + AbyssalCraftAPI.addSingleCrystallization(AbyssalCraft.corblock, new ItemStack(AbyssalCraft.crystalCoralium, 9), 0.9F); + AbyssalCraftAPI.addSingleCrystallization(AbyssalCraft.dreadiumblock, new ItemStack(AbyssalCraft.crystalDreadium, 9), 0.9F); + AbyssalCraftAPI.addSingleCrystallization(Blocks.coal_ore, new ItemStack(AbyssalCraft.crystalCarbon), 0.1F); + AbyssalCraftAPI.addSingleCrystallization(Blocks.coal_block, new ItemStack(AbyssalCraft.crystalCarbon, 9), 0.9F); + AbyssalCraftAPI.addSingleCrystallization(Blocks.redstone_ore, new ItemStack(AbyssalCraft.crystalRedstone), 0.1F); + AbyssalCraftAPI.addSingleCrystallization(Blocks.redstone_block, new ItemStack(AbyssalCraft.crystalRedstone, 9), 0.9F); + AbyssalCraftAPI.addSingleCrystallization("ingotZinc", "crystalZinc", 0.1F); + AbyssalCraftAPI.addSingleCrystallization("oreZinc", "crystalZinc", 0.1F); + AbyssalCraftAPI.addCrystallization(AbyssalCraft.dreadchunk, new ItemStack(AbyssalCraft.crystalAbyssalnite), new ItemStack(AbyssalCraft.crystalDreadium), 0.2F); + AbyssalCraftAPI.addCrystallization(AbyssalCraft.dreadore, new ItemStack(AbyssalCraft.crystalAbyssalnite), new ItemStack(AbyssalCraft.crystalDreadium), 0.2F); + AbyssalCraftAPI.addCrystallization(Blocks.water, new ItemStack(AbyssalCraft.crystalHydrogen, 4), new ItemStack(AbyssalCraft.crystalOxygen, 2), 0.4F); + AbyssalCraftAPI.addCrystallization(Items.water_bucket, new ItemStack(AbyssalCraft.crystalHydrogen, 4), new ItemStack(AbyssalCraft.crystalOxygen, 2), 0.1F); + AbyssalCraftAPI.addCrystallization(new ItemStack(Items.potionitem, 1, 0), new ItemStack(AbyssalCraft.crystalHydrogen, 2), new ItemStack(AbyssalCraft.crystalOxygen), 0.1F); + AbyssalCraftAPI.addCrystallization(new ItemStack(Items.dye, 1, 4), new ItemStack(AbyssalCraft.crystalSilica, 6), new ItemStack(AbyssalCraft.crystalSulfur, 4), 0.15F); + AbyssalCraftAPI.addCrystallization(AbyssalCraft.methane, new ItemStack(AbyssalCraft.crystalCarbon), new ItemStack(AbyssalCraft.crystalHydrogen, 4), 0.1F); + AbyssalCraftAPI.addCrystallization(Items.gunpowder, new ItemStack(AbyssalCraft.crystalNitrate, 4), new ItemStack(AbyssalCraft.crystalSulfur), 0.1F); + AbyssalCraftAPI.addCrystallization("materialSaltpeter", "crystalPotassium", "crystalNitrate", 0.1F); + AbyssalCraftAPI.addCrystallization("oreSaltpeter", "crystalPotassium", "crystalNitrate", 0.1F); + AbyssalCraftAPI.addCrystallization(Blocks.obsidian, new ItemStack(AbyssalCraft.crystalSilica), new ItemStack(AbyssalCraft.crystalMagnesia), 0.1F); + AbyssalCraftAPI.addCrystallization(Blocks.stone, new ItemStack(AbyssalCraft.crystalSilica), new ItemStack(AbyssalCraft.crystalAlumina), 0.1F); + AbyssalCraftAPI.addCrystallization(AbyssalCraft.crystalSilica, new ItemStack(AbyssalCraft.crystalSilicon), new ItemStack(AbyssalCraft.crystalOxygen, 2), 0.1F); + AbyssalCraftAPI.addCrystallization(AbyssalCraft.crystalAlumina, new ItemStack(AbyssalCraft.crystalAluminium, 2), new ItemStack(AbyssalCraft.crystalOxygen, 3), 0.1F); + AbyssalCraftAPI.addCrystallization(AbyssalCraft.crystalMagnesia, new ItemStack(AbyssalCraft.crystalMagnesium), new ItemStack(AbyssalCraft.crystalOxygen), 0.1F); + AbyssalCraftAPI.addCrystallization("ingotBronze", "crystalCopper", 1, "crystalTin", 3, 0.4F); + AbyssalCraftAPI.addCrystallization(AbyssalCraft.crystalMethane, new ItemStack(AbyssalCraft.crystalCarbon), new ItemStack(AbyssalCraft.crystalHydrogen), 0.1F); + AbyssalCraftAPI.addCrystallization(AbyssalCraft.crystalNitrate, new ItemStack(AbyssalCraft.crystalNitrogen), new ItemStack(AbyssalCraft.crystalOxygen, 3), 0.1F); + AbyssalCraftAPI.addCrystallization(Blocks.lapis_ore, new ItemStack(AbyssalCraft.crystalSilica, 6), new ItemStack(AbyssalCraft.crystalSulfur, 4), 0.15F); + AbyssalCraftAPI.addCrystallization(Blocks.lapis_block, new ItemStack(AbyssalCraft.crystalSilica, 24), new ItemStack(AbyssalCraft.crystalSulfur, 16), 1.0F); + AbyssalCraftAPI.addCrystallization("ingotBrass", "crystalCopper", 3, "crystalZinc", 2, 0.5F); + AbyssalCraftAPI.addCrystallization("oreBrass", "crystalCopper", 3, "crystalZinc", 2, 0.5F); + AbyssalCraftAPI.addSingleCrystallization(Items.rotten_flesh, new ItemStack(AbyssalCraft.crystalPhosphorus, 2), 0.1F); + // AbyssalCraftAPI.addSingleCrystallization(new ItemStack(AbyssalCraft.shoggothFlesh, 1, 0), new ItemStack(AbyssalCraft.crystalPhosphorus, 2), 0.2F); + // AbyssalCraftAPI.addCrystallization(new ItemStack(AbyssalCraft.shoggothFlesh, 1, 1), new ItemStack(AbyssalCraft.crystalPhosphorus, 2), new ItemStack(AbyssalCraft.crystalCoralium, 1), 0.2F); + // AbyssalCraftAPI.addCrystallization(new ItemStack(AbyssalCraft.shoggothFlesh, 1, 2), new ItemStack(AbyssalCraft.crystalPhosphorus, 2), new ItemStack(AbyssalCraft.crystalDreadium, 1), 0.2F); + // AbyssalCraftAPI.addCrystallization(new ItemStack(AbyssalCraft.shoggothFlesh, 1, 3), new ItemStack(AbyssalCraft.crystalPhosphorus, 2), new ItemStack(AbyssalCraft.crystalCarbon, 2), 0.2F); + // AbyssalCraftAPI.addCrystallization(new ItemStack(AbyssalCraft.shoggothFlesh, 1, 4), new ItemStack(AbyssalCraft.crystalPhosphorus, 2), new ItemStack(AbyssalCraft.shadowgem, 1), 0.2F); //Crystallization for dusts - CoreRegistry.addSingleCrystallization("dustIron", "crystalIron", 0.1F); - CoreRegistry.addSingleCrystallization("dustGold", "crystalGold", 0.1F); - CoreRegistry.addSingleCrystallization("dustTin", "crystalTin", 0.1F); - CoreRegistry.addSingleCrystallization("dustCopper", "crystalCopper", 0.1F); - CoreRegistry.addSingleCrystallization("dustCoal", "crystalCarbon", 0.1F); - CoreRegistry.addSingleCrystallization("dustAluminium", "crystalAluminium", 0.1F); - CoreRegistry.addCrystallization("dustBronze", "crystalCopper", 1, "crystalTin", 3, 0.1F); - CoreRegistry.addCrystallization("dustBrass", "crystalCopper", 3, "crystalZinc", 2, 0.1F); + AbyssalCraftAPI.addSingleCrystallization("dustIron", "crystalIron", 0.1F); + AbyssalCraftAPI.addSingleCrystallization("dustGold", "crystalGold", 0.1F); + AbyssalCraftAPI.addSingleCrystallization("dustTin", "crystalTin", 0.1F); + AbyssalCraftAPI.addSingleCrystallization("dustCopper", "crystalCopper", 0.1F); + AbyssalCraftAPI.addSingleCrystallization("dustCoal", "crystalCarbon", 0.1F); + AbyssalCraftAPI.addSingleCrystallization("dustAluminium", "crystalAluminium", 0.1F); + AbyssalCraftAPI.addCrystallization("dustBronze", "crystalCopper", 1, "crystalTin", 3, 0.1F); + AbyssalCraftAPI.addCrystallization("dustBrass", "crystalCopper", 3, "crystalZinc", 2, 0.1F); } private static void addTransmutation(){ - CoreRegistry.addTransmutation(AbyssalCraft.crystalAbyssalnite, new ItemStack(AbyssalCraft.abyingot, 1), 0.2F); - CoreRegistry.addTransmutation(AbyssalCraft.crystalCoralium, new ItemStack(AbyssalCraft.Cingot, 1), 0.2F); - CoreRegistry.addTransmutation(AbyssalCraft.crystalDreadium, new ItemStack(AbyssalCraft.dreadiumingot, 1), 0.2F); - CoreRegistry.addTransmutation(AbyssalCraft.Dreadshard, new ItemStack(AbyssalCraft.dreadiumingot, 1), 0.2F); - CoreRegistry.addTransmutation(AbyssalCraft.crystalIron, new ItemStack(Items.iron_ingot, 1), 0.2F); - CoreRegistry.addTransmutation(AbyssalCraft.crystalGold, new ItemStack(Items.gold_ingot, 1), 0.2F); - CoreRegistry.addTransmutation(AbyssalCraft.crystalSulfur, new ItemStack(AbyssalCraft.sulfur, 1), 0.2F); - CoreRegistry.addTransmutation(AbyssalCraft.crystalBlaze, new ItemStack(Items.blaze_powder, 1), 0.2F); - CoreRegistry.addTransmutation(AbyssalCraft.crystalRedstone, new ItemStack(Items.redstone, 1), 0.2F); - CoreRegistry.addTransmutation(AbyssalCraft.crystalHydrogen, new ItemStack(AbyssalCraft.crystalHydrogen), 0.2F); - CoreRegistry.addTransmutation(AbyssalCraft.crystalOxygen, new ItemStack(AbyssalCraft.crystalOxygen), 0.2F); - CoreRegistry.addTransmutation(AbyssalCraft.crystalNitrogen, new ItemStack(AbyssalCraft.crystalNitrogen), 0.2F); - CoreRegistry.addTransmutation(AbyssalCraft.crystalMethane, new ItemStack(AbyssalCraft.methane, 1), 0.2F); - CoreRegistry.addTransmutation(AbyssalCraft.crystalTin, new ItemStack(AbyssalCraft.tinIngot, 1), 0.2F); - CoreRegistry.addTransmutation(AbyssalCraft.crystalCopper, new ItemStack(AbyssalCraft.copperIngot, 1), 0.2F); - CoreRegistry.addTransmutation(AbyssalCraft.Darkstone, new ItemStack(Blocks.stone, 1), 0.0F); - CoreRegistry.addTransmutation(Blocks.stone, new ItemStack(AbyssalCraft.Darkstone, 1), 0.0F); - CoreRegistry.addTransmutation(Blocks.stonebrick, new ItemStack(AbyssalCraft.Darkstone_brick, 1), 0.0F); - CoreRegistry.addTransmutation(AbyssalCraft.Darkstone_brick, new ItemStack(Blocks.stonebrick), 0.0F); - CoreRegistry.addTransmutation(Blocks.cobblestone, new ItemStack(AbyssalCraft.Darkstone_cobble, 1), 0.0F); - CoreRegistry.addTransmutation(AbyssalCraft.Darkstone_cobble, new ItemStack(Blocks.cobblestone, 1), 0.0F); - CoreRegistry.addTransmutation(AbyssalCraft.cstonebrick, new ItemStack(AbyssalCraft.cbrick, 4), 0.0F); - CoreRegistry.addTransmutation(AbyssalCraft.cbrick, new ItemStack(AbyssalCraft.cstone, 1), 0.0F); - CoreRegistry.addTransmutation(AbyssalCraft.Cbucket, new ItemStack(AbyssalCraft.Cwater, 1), 0.0F); - CoreRegistry.addTransmutation(AbyssalCraft.Cwater, new ItemStack(AbyssalCraft.cstone, 8), 0.0F); - CoreRegistry.addTransmutation(AbyssalCraft.antibucket, new ItemStack(AbyssalCraft.anticwater, 1), 0.0F); - CoreRegistry.addTransmutation(AbyssalCraft.denseCarbonCluster, new ItemStack(Items.diamond), 0.5F); - CoreRegistry.addTransmutation(AbyssalCraft.dreadKey, new ItemStack(AbyssalCraft.portalPlacerJzh), 1.0F); - CoreRegistry.addTransmutation("crystalAluminium", "ingotAluminum", 0.2F); - CoreRegistry.addTransmutation("crystalAluminium", "ingotAluminium", 0.2F); - CoreRegistry.addTransmutation("crystalZinc", "ingotZinc", 0.2F); - CoreRegistry.addTransmutation(Blocks.lava, new ItemStack(AbyssalCraft.solidLava), 0.0F); - CoreRegistry.addTransmutation(Blocks.end_stone, new ItemStack(AbyssalCraft.ethaxium), 0.0F); - CoreRegistry.addTransmutation(AbyssalCraft.ethaxium, new ItemStack(Blocks.end_stone), 0.0F); - CoreRegistry.addTransmutation(new ItemStack(AbyssalCraft.ethaxiumbrick, 1, 0), new ItemStack(AbyssalCraft.ethaxium), 0.0F); + AbyssalCraftAPI.addTransmutation(AbyssalCraft.crystalAbyssalnite, new ItemStack(AbyssalCraft.abyingot, 1), 0.2F); + AbyssalCraftAPI.addTransmutation(AbyssalCraft.crystalCoralium, new ItemStack(AbyssalCraft.Cingot, 1), 0.2F); + AbyssalCraftAPI.addTransmutation(AbyssalCraft.crystalDreadium, new ItemStack(AbyssalCraft.dreadiumingot, 1), 0.2F); + AbyssalCraftAPI.addTransmutation(AbyssalCraft.Dreadshard, new ItemStack(AbyssalCraft.dreadiumingot, 1), 0.2F); + AbyssalCraftAPI.addTransmutation(AbyssalCraft.crystalIron, new ItemStack(Items.iron_ingot, 1), 0.2F); + AbyssalCraftAPI.addTransmutation(AbyssalCraft.crystalGold, new ItemStack(Items.gold_ingot, 1), 0.2F); + AbyssalCraftAPI.addTransmutation(AbyssalCraft.crystalSulfur, new ItemStack(AbyssalCraft.sulfur, 1), 0.2F); + AbyssalCraftAPI.addTransmutation(AbyssalCraft.crystalBlaze, new ItemStack(Items.blaze_powder, 1), 0.2F); + AbyssalCraftAPI.addTransmutation(AbyssalCraft.crystalRedstone, new ItemStack(Items.redstone, 1), 0.2F); + AbyssalCraftAPI.addTransmutation(AbyssalCraft.crystalHydrogen, new ItemStack(AbyssalCraft.crystalHydrogen), 0.2F); + AbyssalCraftAPI.addTransmutation(AbyssalCraft.crystalOxygen, new ItemStack(AbyssalCraft.crystalOxygen), 0.2F); + AbyssalCraftAPI.addTransmutation(AbyssalCraft.crystalNitrogen, new ItemStack(AbyssalCraft.crystalNitrogen), 0.2F); + AbyssalCraftAPI.addTransmutation(AbyssalCraft.crystalMethane, new ItemStack(AbyssalCraft.methane, 1), 0.2F); + AbyssalCraftAPI.addTransmutation(AbyssalCraft.crystalTin, new ItemStack(AbyssalCraft.tinIngot, 1), 0.2F); + AbyssalCraftAPI.addTransmutation(AbyssalCraft.crystalCopper, new ItemStack(AbyssalCraft.copperIngot, 1), 0.2F); + AbyssalCraftAPI.addTransmutation(AbyssalCraft.Darkstone, new ItemStack(Blocks.stone, 1), 0.0F); + AbyssalCraftAPI.addTransmutation(Blocks.stone, new ItemStack(AbyssalCraft.Darkstone, 1), 0.0F); + AbyssalCraftAPI.addTransmutation(Blocks.stonebrick, new ItemStack(AbyssalCraft.Darkstone_brick, 1), 0.0F); + AbyssalCraftAPI.addTransmutation(AbyssalCraft.Darkstone_brick, new ItemStack(Blocks.stonebrick), 0.0F); + AbyssalCraftAPI.addTransmutation(Blocks.cobblestone, new ItemStack(AbyssalCraft.Darkstone_cobble, 1), 0.0F); + AbyssalCraftAPI.addTransmutation(AbyssalCraft.Darkstone_cobble, new ItemStack(Blocks.cobblestone, 1), 0.0F); + AbyssalCraftAPI.addTransmutation(AbyssalCraft.cstonebrick, new ItemStack(AbyssalCraft.cbrick, 4), 0.0F); + AbyssalCraftAPI.addTransmutation(AbyssalCraft.cbrick, new ItemStack(AbyssalCraft.cstone, 1), 0.0F); + AbyssalCraftAPI.addTransmutation(AbyssalCraft.Cbucket, new ItemStack(AbyssalCraft.Cwater, 1), 0.0F); + AbyssalCraftAPI.addTransmutation(AbyssalCraft.Cwater, new ItemStack(AbyssalCraft.cstone, 8), 0.0F); + AbyssalCraftAPI.addTransmutation(AbyssalCraft.antibucket, new ItemStack(AbyssalCraft.anticwater, 1), 0.0F); + AbyssalCraftAPI.addTransmutation(AbyssalCraft.denseCarbonCluster, new ItemStack(Items.diamond), 0.5F); + AbyssalCraftAPI.addTransmutation(AbyssalCraft.dreadKey, new ItemStack(AbyssalCraft.portalPlacerJzh), 1.0F); + AbyssalCraftAPI.addTransmutation("crystalAluminium", "ingotAluminum", 0.2F); + AbyssalCraftAPI.addTransmutation("crystalAluminium", "ingotAluminium", 0.2F); + AbyssalCraftAPI.addTransmutation("crystalZinc", "ingotZinc", 0.2F); + AbyssalCraftAPI.addTransmutation(Blocks.lava, new ItemStack(AbyssalCraft.solidLava), 0.0F); + AbyssalCraftAPI.addTransmutation(Blocks.end_stone, new ItemStack(AbyssalCraft.ethaxium), 0.0F); + AbyssalCraftAPI.addTransmutation(AbyssalCraft.ethaxium, new ItemStack(Blocks.end_stone), 0.0F); + AbyssalCraftAPI.addTransmutation(new ItemStack(AbyssalCraft.ethaxiumbrick, 1, 0), new ItemStack(AbyssalCraft.ethaxium), 0.0F); + } + + private static void addEngraving(){ + + AbyssalCraftAPI.addEngraving(new ItemStack(AbyssalCraft.coin, 1, 0), new ItemStack(AbyssalCraft.cthulhuCoin, 1, 0), AbyssalCraft.engravingCthulhu, 0.5F); + AbyssalCraftAPI.addEngraving(new ItemStack(AbyssalCraft.coin, 1, 1), new ItemStack(AbyssalCraft.cthulhuCoin, 1, 1), AbyssalCraft.engravingCthulhu, 0.5F); + AbyssalCraftAPI.addEngraving(new ItemStack(AbyssalCraft.coin, 1, 2), new ItemStack(AbyssalCraft.cthulhuCoin, 1, 2), AbyssalCraft.engravingCthulhu, 0.5F); + AbyssalCraftAPI.addEngraving(new ItemStack(AbyssalCraft.coin, 1, 3), new ItemStack(AbyssalCraft.cthulhuCoin, 1, 3), AbyssalCraft.engravingCthulhu, 0.5F); + AbyssalCraftAPI.addEngraving(new ItemStack(AbyssalCraft.coin, 1, 4), new ItemStack(AbyssalCraft.cthulhuCoin, 1, 4), AbyssalCraft.engravingCthulhu, 0.5F); + AbyssalCraftAPI.addEngraving(new ItemStack(AbyssalCraft.coin, 1, 5), new ItemStack(AbyssalCraft.cthulhuCoin, 1, 5), AbyssalCraft.engravingCthulhu, 0.5F); + AbyssalCraftAPI.addEngraving(new ItemStack(AbyssalCraft.coin, 1, 6), new ItemStack(AbyssalCraft.cthulhuCoin, 1, 6), AbyssalCraft.engravingCthulhu, 0.5F); + + // AbyssalCraftAPI.addEngraving(new ItemStack(AbyssalCraft.coin, 1, 0), new ItemStack(AbyssalCraft.elderCoin, 1, 0), AbyssalCraft.engravingElder, 0.5F); + // AbyssalCraftAPI.addEngraving(new ItemStack(AbyssalCraft.coin, 1, 1), new ItemStack(AbyssalCraft.elderCoin, 1, 1), AbyssalCraft.engravingElder, 0.5F); + // AbyssalCraftAPI.addEngraving(new ItemStack(AbyssalCraft.coin, 1, 2), new ItemStack(AbyssalCraft.elderCoin, 1, 2), AbyssalCraft.engravingElder, 0.5F); + // AbyssalCraftAPI.addEngraving(new ItemStack(AbyssalCraft.coin, 1, 3), new ItemStack(AbyssalCraft.elderCoin, 1, 3), AbyssalCraft.engravingElder, 0.5F); + // AbyssalCraftAPI.addEngraving(new ItemStack(AbyssalCraft.coin, 1, 4), new ItemStack(AbyssalCraft.elderCoin, 1, 4), AbyssalCraft.engravingElder, 0.5F); + // AbyssalCraftAPI.addEngraving(new ItemStack(AbyssalCraft.coin, 1, 5), new ItemStack(AbyssalCraft.elderCoin, 1, 5), AbyssalCraft.engravingElder, 0.5F); + // AbyssalCraftAPI.addEngraving(new ItemStack(AbyssalCraft.coin, 1, 6), new ItemStack(AbyssalCraft.elderCoin, 1, 6), AbyssalCraft.engravingElder, 0.5F); + // + // AbyssalCraftAPI.addEngraving(new ItemStack(AbyssalCraft.coin, 1, 0), new ItemStack(AbyssalCraft.jzaharCoin, 1, 0), AbyssalCraft.engravingJzahar, 0.5F); + // AbyssalCraftAPI.addEngraving(new ItemStack(AbyssalCraft.coin, 1, 1), new ItemStack(AbyssalCraft.jzaharCoin, 1, 1), AbyssalCraft.engravingJzahar, 0.5F); + // AbyssalCraftAPI.addEngraving(new ItemStack(AbyssalCraft.coin, 1, 2), new ItemStack(AbyssalCraft.jzaharCoin, 1, 2), AbyssalCraft.engravingJzahar, 0.5F); + // AbyssalCraftAPI.addEngraving(new ItemStack(AbyssalCraft.coin, 1, 3), new ItemStack(AbyssalCraft.jzaharCoin, 1, 3), AbyssalCraft.engravingJzahar, 0.5F); + // AbyssalCraftAPI.addEngraving(new ItemStack(AbyssalCraft.coin, 1, 4), new ItemStack(AbyssalCraft.jzaharCoin, 1, 4), AbyssalCraft.engravingJzahar, 0.5F); + // AbyssalCraftAPI.addEngraving(new ItemStack(AbyssalCraft.coin, 1, 5), new ItemStack(AbyssalCraft.jzaharCoin, 1, 5), AbyssalCraft.engravingJzahar, 0.5F); + // AbyssalCraftAPI.addEngraving(new ItemStack(AbyssalCraft.coin, 1, 6), new ItemStack(AbyssalCraft.jzaharCoin, 1, 6), AbyssalCraft.engravingJzahar, 0.5F); + + AbyssalCraftAPI.addEngraving(new ItemStack(AbyssalCraft.cthulhuCoin, 1, 0), new ItemStack(AbyssalCraft.coin, 1, 0), AbyssalCraft.engravingBlank, 0.0F); + AbyssalCraftAPI.addEngraving(new ItemStack(AbyssalCraft.cthulhuCoin, 1, 1), new ItemStack(AbyssalCraft.coin, 1, 1), AbyssalCraft.engravingBlank, 0.0F); + AbyssalCraftAPI.addEngraving(new ItemStack(AbyssalCraft.cthulhuCoin, 1, 2), new ItemStack(AbyssalCraft.coin, 1, 2), AbyssalCraft.engravingBlank, 0.0F); + AbyssalCraftAPI.addEngraving(new ItemStack(AbyssalCraft.cthulhuCoin, 1, 3), new ItemStack(AbyssalCraft.coin, 1, 3), AbyssalCraft.engravingBlank, 0.0F); + AbyssalCraftAPI.addEngraving(new ItemStack(AbyssalCraft.cthulhuCoin, 1, 4), new ItemStack(AbyssalCraft.coin, 1, 4), AbyssalCraft.engravingBlank, 0.0F); + AbyssalCraftAPI.addEngraving(new ItemStack(AbyssalCraft.cthulhuCoin, 1, 5), new ItemStack(AbyssalCraft.coin, 1, 5), AbyssalCraft.engravingBlank, 0.0F); + AbyssalCraftAPI.addEngraving(new ItemStack(AbyssalCraft.cthulhuCoin, 1, 6), new ItemStack(AbyssalCraft.coin, 1, 6), AbyssalCraft.engravingBlank, 0.0F); + // AbyssalCraftAPI.addEngraving(new ItemStack(AbyssalCraft.elderCoin, 1, 0), new ItemStack(AbyssalCraft.coin, 1, 0), AbyssalCraft.engravingBlank, 0.0F); + // AbyssalCraftAPI.addEngraving(new ItemStack(AbyssalCraft.elderCoin, 1, 1), new ItemStack(AbyssalCraft.coin, 1, 1), AbyssalCraft.engravingBlank, 0.0F); + // AbyssalCraftAPI.addEngraving(new ItemStack(AbyssalCraft.elderCoin, 1, 2), new ItemStack(AbyssalCraft.coin, 1, 2), AbyssalCraft.engravingBlank, 0.0F); + // AbyssalCraftAPI.addEngraving(new ItemStack(AbyssalCraft.elderCoin, 1, 3), new ItemStack(AbyssalCraft.coin, 1, 3), AbyssalCraft.engravingBlank, 0.0F); + // AbyssalCraftAPI.addEngraving(new ItemStack(AbyssalCraft.elderCoin, 1, 4), new ItemStack(AbyssalCraft.coin, 1, 4), AbyssalCraft.engravingBlank, 0.0F); + // AbyssalCraftAPI.addEngraving(new ItemStack(AbyssalCraft.elderCoin, 1, 5), new ItemStack(AbyssalCraft.coin, 1, 5), AbyssalCraft.engravingBlank, 0.0F); + // AbyssalCraftAPI.addEngraving(new ItemStack(AbyssalCraft.elderCoin, 1, 6), new ItemStack(AbyssalCraft.coin, 1, 6), AbyssalCraft.engravingBlank, 0.0F); + // AbyssalCraftAPI.addEngraving(new ItemStack(AbyssalCraft.jzaharCoin, 1, 0), new ItemStack(AbyssalCraft.coin, 1, 0), AbyssalCraft.engravingBlank, 0.0F); + // AbyssalCraftAPI.addEngraving(new ItemStack(AbyssalCraft.jzaharCoin, 1, 1), new ItemStack(AbyssalCraft.coin, 1, 1), AbyssalCraft.engravingBlank, 0.0F); + // AbyssalCraftAPI.addEngraving(new ItemStack(AbyssalCraft.jzaharCoin, 1, 2), new ItemStack(AbyssalCraft.coin, 1, 2), AbyssalCraft.engravingBlank, 0.0F); + // AbyssalCraftAPI.addEngraving(new ItemStack(AbyssalCraft.jzaharCoin, 1, 3), new ItemStack(AbyssalCraft.coin, 1, 3), AbyssalCraft.engravingBlank, 0.0F); + // AbyssalCraftAPI.addEngraving(new ItemStack(AbyssalCraft.jzaharCoin, 1, 4), new ItemStack(AbyssalCraft.coin, 1, 4), AbyssalCraft.engravingBlank, 0.0F); + // AbyssalCraftAPI.addEngraving(new ItemStack(AbyssalCraft.jzaharCoin, 1, 5), new ItemStack(AbyssalCraft.coin, 1, 5), AbyssalCraft.engravingBlank, 0.0F); + // AbyssalCraftAPI.addEngraving(new ItemStack(AbyssalCraft.jzaharCoin, 1, 6), new ItemStack(AbyssalCraft.coin, 1, 6), AbyssalCraft.engravingBlank, 0.0F); } } \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/common/CommonProxy.java b/src/main/java/com/shinoow/abyssalcraft/common/CommonProxy.java index 0c8bf952c..29eb6f923 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/CommonProxy.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/CommonProxy.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common; @@ -21,12 +22,9 @@ import net.minecraft.world.World; import com.shinoow.abyssalcraft.AbyssalCraft; -import com.shinoow.abyssalcraft.client.gui.GuiCrystallizer; -import com.shinoow.abyssalcraft.client.gui.GuiTransmutator; -import com.shinoow.abyssalcraft.common.blocks.tile.TileEntityCrystallizer; -import com.shinoow.abyssalcraft.common.blocks.tile.TileEntityTransmutator; -import com.shinoow.abyssalcraft.common.inventory.ContainerCrystallizer; -import com.shinoow.abyssalcraft.common.inventory.ContainerTransmutator; +import com.shinoow.abyssalcraft.client.gui.*; +import com.shinoow.abyssalcraft.common.blocks.tile.*; +import com.shinoow.abyssalcraft.common.inventory.*; import cpw.mods.fml.common.network.IGuiHandler; @@ -46,6 +44,10 @@ public Object getServerGuiElement(int ID, EntityPlayer player, World world, int if (entity instanceof TileEntityTransmutator) return new ContainerTransmutator(player.inventory, (TileEntityTransmutator) entity); break; + case AbyssalCraft.engraverGuiID: + if (entity instanceof TileEntityEngraver) + return new ContainerEngraver(player.inventory, (TileEntityEngraver) entity); + break; } return null; } @@ -64,6 +66,10 @@ public Object getClientGuiElement(int ID, EntityPlayer player, World world, int if (entity instanceof TileEntityTransmutator) return new GuiTransmutator(player.inventory, (TileEntityTransmutator) entity); break; + case AbyssalCraft.engraverGuiID: + if (entity instanceof TileEntityEngraver) + return new GuiEngraver(player.inventory, (TileEntityEngraver) entity); + break; } return null; } diff --git a/src/main/java/com/shinoow/abyssalcraft/common/CreativeTabs/TabACBlocks.java b/src/main/java/com/shinoow/abyssalcraft/common/CreativeTabs/TabACBlocks.java index 0de6e8c2a..7a5ade7e8 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/CreativeTabs/TabACBlocks.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/CreativeTabs/TabACBlocks.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.creativetabs; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/CreativeTabs/TabACCombat.java b/src/main/java/com/shinoow/abyssalcraft/common/CreativeTabs/TabACCombat.java index ce4bc5ac3..c13e8de6b 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/CreativeTabs/TabACCombat.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/CreativeTabs/TabACCombat.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.creativetabs; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/CreativeTabs/TabACDecoration.java b/src/main/java/com/shinoow/abyssalcraft/common/CreativeTabs/TabACDecoration.java index d50af19c0..c234ecab0 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/CreativeTabs/TabACDecoration.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/CreativeTabs/TabACDecoration.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.creativetabs; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/CreativeTabs/TabACFood.java b/src/main/java/com/shinoow/abyssalcraft/common/CreativeTabs/TabACFood.java index 7a8613381..ed600e6e8 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/CreativeTabs/TabACFood.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/CreativeTabs/TabACFood.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.creativetabs; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/CreativeTabs/TabACItems.java b/src/main/java/com/shinoow/abyssalcraft/common/CreativeTabs/TabACItems.java index b84facdbf..fe6fa6d60 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/CreativeTabs/TabACItems.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/CreativeTabs/TabACItems.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.creativetabs; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/CreativeTabs/TabACTools.java b/src/main/java/com/shinoow/abyssalcraft/common/CreativeTabs/TabACTools.java index eeec7fc27..c93fc124f 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/CreativeTabs/TabACTools.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/CreativeTabs/TabACTools.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.creativetabs; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockACBasic.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockACBasic.java index b4bff3384..dbaba009c 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockACBasic.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockACBasic.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockACButton.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockACButton.java index f7e117c00..96e751e0c 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockACButton.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockACButton.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockACDoubleSlab.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockACDoubleSlab.java index e89408988..516263197 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockACDoubleSlab.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockACDoubleSlab.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockACFence.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockACFence.java index 43f92bb8b..b326b63db 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockACFence.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockACFence.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockACOre.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockACOre.java index 13c976029..851f5ef5e 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockACOre.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockACOre.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockACPressureplate.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockACPressureplate.java index 7a928df83..c98cd052d 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockACPressureplate.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockACPressureplate.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockACSingleSlab.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockACSingleSlab.java index d526ba419..1813cd8cd 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockACSingleSlab.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockACSingleSlab.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockACStairs.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockACStairs.java index d5c603e74..6d36419bf 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockACStairs.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockACStairs.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockAbyssPortal.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockAbyssPortal.java index f75371931..5304e234a 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockAbyssPortal.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockAbyssPortal.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockAltar.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockAltar.java index c906b261e..022ae6ee3 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockAltar.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockAltar.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockAntiliquid.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockAntiliquid.java index 87bc5c830..313823e21 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockAntiliquid.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockAntiliquid.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks; @@ -26,7 +27,7 @@ import net.minecraftforge.fluids.BlockFluidClassic; import com.shinoow.abyssalcraft.AbyssalCraft; -import com.shinoow.abyssalcraft.core.api.entity.IAntiEntity; +import com.shinoow.abyssalcraft.api.entity.IAntiEntity; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockCLiquid.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockCLiquid.java index a7e62f4ff..5e7323cdd 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockCLiquid.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockCLiquid.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks; @@ -31,7 +32,7 @@ import net.minecraftforge.fluids.BlockFluidClassic; import com.shinoow.abyssalcraft.AbyssalCraft; -import com.shinoow.abyssalcraft.core.api.entity.ICoraliumEntity; +import com.shinoow.abyssalcraft.api.entity.ICoraliumEntity; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockChagarothFistSpawner.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockChagarothFistSpawner.java index b1d27db02..981765cd3 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockChagarothFistSpawner.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockChagarothFistSpawner.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockChagarothSpawner.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockChagarothSpawner.java index 9a84b3db2..33b04c66d 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockChagarothSpawner.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockChagarothSpawner.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockCoraliumfire.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockCoraliumfire.java index e34ac659e..444aad1eb 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockCoraliumfire.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockCoraliumfire.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockCoraliumstone.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockCoraliumstone.java index 6e96aa270..9765248a0 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockCoraliumstone.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockCoraliumstone.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockCrate.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockCrate.java index fb5fd9f22..b599d585c 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockCrate.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockCrate.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockCrystallizer.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockCrystallizer.java index 9af693393..d6b0f2efb 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockCrystallizer.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockCrystallizer.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDGhead.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDGhead.java index dc84a0f75..12f4a25c3 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDGhead.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDGhead.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDLTLeaves.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDLTLeaves.java index 60d4bec43..645c29706 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDLTLeaves.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDLTLeaves.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDLTLog.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDLTLog.java index 4a0832b2c..5ff865aa7 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDLTLog.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDLTLog.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDLTSapling.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDLTSapling.java index ebcf70b01..680aa3b8a 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDLTSapling.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDLTSapling.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks; import java.util.Random; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDSGlow.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDSGlow.java index 370989dd1..d71fd75be 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDSGlow.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDSGlow.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDarklandsgrass.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDarklandsgrass.java index 3955f3fe8..3435b3ec5 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDarklandsgrass.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDarklandsgrass.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDarkstone.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDarkstone.java index 57afaaf8c..5edc1eef8 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDarkstone.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDarkstone.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDarkstonecobblewall.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDarkstonecobblewall.java index 0c1dad889..ba7bf74df 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDarkstonecobblewall.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDarkstonecobblewall.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDarkstoneslab.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDarkstoneslab.java index 3402c822e..569034cba 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDarkstoneslab.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDarkstoneslab.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDarkstoneslabdouble.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDarkstoneslabdouble.java index a368074f1..9409fa919 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDarkstoneslabdouble.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDarkstoneslabdouble.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDreadAltarBottom.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDreadAltarBottom.java index a824a4987..d71aef2e3 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDreadAltarBottom.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDreadAltarBottom.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks; @@ -25,8 +26,8 @@ import net.minecraft.world.World; import com.shinoow.abyssalcraft.AbyssalCraft; +import com.shinoow.abyssalcraft.api.entity.IDreadEntity; import com.shinoow.abyssalcraft.common.blocks.tile.TileEntityDreadAltarBottom; -import com.shinoow.abyssalcraft.core.api.entity.IDreadEntity; import cpw.mods.fml.client.FMLClientHandler; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDreadAltarTop.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDreadAltarTop.java index 9f07f9f7a..a59124f78 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDreadAltarTop.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDreadAltarTop.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks; @@ -28,10 +29,10 @@ import net.minecraft.world.World; import com.shinoow.abyssalcraft.AbyssalCraft; +import com.shinoow.abyssalcraft.api.entity.IDreadEntity; import com.shinoow.abyssalcraft.common.blocks.tile.TileEntityDreadAltarTop; import com.shinoow.abyssalcraft.common.structures.dreadlands.chagarothlair; import com.shinoow.abyssalcraft.common.util.SpecialTextUtil; -import com.shinoow.abyssalcraft.core.api.entity.IDreadEntity; import cpw.mods.fml.client.FMLClientHandler; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDreadFire.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDreadFire.java index 772e66086..56becef0a 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDreadFire.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDreadFire.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDreadgrass.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDreadgrass.java index c58f82064..fe29c7602 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDreadgrass.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDreadgrass.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDreadguardSpawner.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDreadguardSpawner.java index 3a915d058..a6dbb0f71 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDreadguardSpawner.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDreadguardSpawner.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDreadlandsPortal.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDreadlandsPortal.java index d0bc6a0ad..44f43bbdd 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDreadlandsPortal.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDreadlandsPortal.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDreadleaves.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDreadleaves.java index fb605c32f..b2decf247 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDreadleaves.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDreadleaves.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDreadlog.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDreadlog.java index 33aa2c585..646ee74b5 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDreadlog.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDreadlog.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDreadore.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDreadore.java index 58e2c1e9f..eddf30fad 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDreadore.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDreadore.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDreadsapling.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDreadsapling.java index fefe4ac81..066f3a438 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDreadsapling.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockDreadsapling.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockEngraver.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockEngraver.java new file mode 100644 index 000000000..e89a30cc5 --- /dev/null +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockEngraver.java @@ -0,0 +1,216 @@ +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.shinoow.abyssalcraft.common.blocks; + +import java.util.Random; + +import net.minecraft.block.*; +import net.minecraft.block.material.Material; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.*; +import net.minecraft.item.*; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.*; +import net.minecraft.world.World; + +import com.shinoow.abyssalcraft.AbyssalCraft; +import com.shinoow.abyssalcraft.common.blocks.tile.TileEntityEngraver; + +import cpw.mods.fml.common.network.internal.FMLNetworkHandler; +import cpw.mods.fml.relauncher.*; + +public class BlockEngraver extends BlockContainer { + + private final Random rand = new Random(); + private final boolean isActive; + private static boolean keepInventory; + + public BlockEngraver(boolean par1) { + super(Material.rock); + isActive = par1; + setBlockTextureName("anvil_top_damaged_0"); + if(!isActive) + setCreativeTab(AbyssalCraft.tabDecoration); + } + + @Override + public boolean renderAsNormalBlock() { + return false; + } + + @Override + public int getRenderType() { + return -6; + } + + @Override + public boolean isOpaqueCube() { + return false; + } + + @Override + public Item getItemDropped(int par1, Random par1Random, int par3) + { + return Item.getItemFromBlock(AbyssalCraft.engraver); + } + + @Override + public void onBlockAdded(World par1World, int par2, int par3, int par4) + { + super.onBlockAdded(par1World, par2, par3, par4); + getDirection(par1World, par2, par3, par4); + } + + private void getDirection(World par1World, int par2, int par3, int par4) { + if (!par1World.isRemote){ + Block block = par1World.getBlock(par2, par3, par4 - 1); + Block block1 = par1World.getBlock(par2, par3, par4 + 1); + Block block2 = par1World.getBlock(par2 - 1, par3, par4); + Block block3 = par1World.getBlock(par2 + 1, par3, par4); + byte b0 = 3; + + if (block.func_149730_j() && !block1.func_149730_j()) + b0 = 3; + + if (block1.func_149730_j() && !block.func_149730_j()) + b0 = 2; + + if (block2.func_149730_j() && !block3.func_149730_j()) + b0 = 5; + + if (block3.func_149730_j() && !block2.func_149730_j()) + b0 = 4; + + par1World.setBlockMetadataWithNotify(par2, par3, par4, b0, 2); + } + } + + @Override + public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9) { + if(!par1World.isRemote) + FMLNetworkHandler.openGui(par5EntityPlayer, AbyssalCraft.instance, AbyssalCraft.engraverGuiID, par1World, par2, par3, par4); + return true; + } + + public static void updateEngraverBlockState(boolean par0, World par1World, int par2, int par3, int par4) { + int l = par1World.getBlockMetadata(par2, par3, par4); + TileEntity tileentity = par1World.getTileEntity(par2, par3, par4); + keepInventory = true; + + if (par0) + par1World.setBlock(par2, par3, par4, AbyssalCraft.engraver_on); + else + par1World.setBlock(par2, par3, par4, AbyssalCraft.engraver); + + keepInventory = false; + par1World.setBlockMetadataWithNotify(par2, par3, par4, l, 2); + + if (tileentity != null){ + tileentity.validate(); + par1World.setTileEntity(par2, par3, par4, tileentity); + } + } + + @Override + public TileEntity createNewTileEntity(World var1, int var2) { + return new TileEntityEngraver(); + } + + @Override + public void onBlockPlacedBy(World par1World, int par2, int par3, int par4, EntityLivingBase par5EntityLivingBase, ItemStack par6ItemStack) { + int l = MathHelper.floor_double(par5EntityLivingBase.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; + + if (l == 0) + par1World.setBlockMetadataWithNotify(par2, par3, par4, 2, 2); + + if (l == 1) + par1World.setBlockMetadataWithNotify(par2, par3, par4, 5, 2); + + if (l == 2) + par1World.setBlockMetadataWithNotify(par2, par3, par4, 3, 2); + + if (l == 3) + par1World.setBlockMetadataWithNotify(par2, par3, par4, 4, 2); + + if (par6ItemStack.hasDisplayName()) + ((TileEntityEngraver)par1World.getTileEntity(par2, par3, par4)).func_145951_a(par6ItemStack.getDisplayName()); + } + + @Override + public void breakBlock(World par1World, int par2, int par3, int par4, Block par5Block, int par6) { + if (!keepInventory){ + TileEntityEngraver tileentityengraver = (TileEntityEngraver)par1World.getTileEntity(par2, par3, par4); + + if (tileentityengraver != null){ + for (int i1 = 0; i1 < tileentityengraver.getSizeInventory(); ++i1){ + ItemStack itemstack = tileentityengraver.getStackInSlot(i1); + + if (itemstack != null){ + float f = rand.nextFloat() * 0.8F + 0.1F; + float f1 = rand.nextFloat() * 0.8F + 0.1F; + float f2 = rand.nextFloat() * 0.8F + 0.1F; + + while (itemstack.stackSize > 0){ + int j1 = rand.nextInt(21) + 10; + + if (j1 > itemstack.stackSize) + j1 = itemstack.stackSize; + + itemstack.stackSize -= j1; + EntityItem entityitem = new EntityItem(par1World, par2 + f, par3 + f1, par4 + f2, new ItemStack(itemstack.getItem(), j1, itemstack.getItemDamage())); + + if (itemstack.hasTagCompound()) + entityitem.getEntityItem().setTagCompound((NBTTagCompound)itemstack.getTagCompound().copy()); + + float f3 = 0.05F; + entityitem.motionX = (float)rand.nextGaussian() * f3; + entityitem.motionY = (float)rand.nextGaussian() * f3 + 0.2F; + entityitem.motionZ = (float)rand.nextGaussian() * f3; + par1World.spawnEntityInWorld(entityitem); + } + } + } + + par1World.func_147453_f(par2, par3, par4, par5Block); + } + } + + super.breakBlock(par1World, par2, par3, par4, par5Block, par6); + } + + @Override + public boolean hasComparatorInputOverride() + { + return true; + } + + @Override + public int getComparatorInputOverride(World par1World, int par2, int par3, int par4, int par5) + { + return Container.calcRedstoneFromInventory((IInventory)par1World.getTileEntity(par2, par3, par4)); + } + + @Override + @SideOnly(Side.CLIENT) + public Item getItem(World par1World, int par2, int par3, int par4) + { + return Item.getItemFromBlock(AbyssalCraft.engraver); + } +} diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockEthaxiumBrick.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockEthaxiumBrick.java index 0bf8b0f6e..da682e5cb 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockEthaxiumBrick.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockEthaxiumBrick.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockEthaxiumPillar.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockEthaxiumPillar.java index 2d5017d1e..3c8cb6201 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockEthaxiumPillar.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockEthaxiumPillar.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockODB.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockODB.java index fd6c85c3d..cb8881631 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockODB.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockODB.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockODBcore.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockODBcore.java index 5b220145f..0f62c05fe 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockODBcore.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockODBcore.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockOhead.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockOhead.java index ae4c50d1c..4c06e998c 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockOhead.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockOhead.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockOmotholFire.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockOmotholFire.java index 861d1ef52..ccabd5e31 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockOmotholFire.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockOmotholFire.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockOmotholPortal.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockOmotholPortal.java index 370d23cbe..373b9f015 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockOmotholPortal.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockOmotholPortal.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockPSDL.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockPSDL.java index 0da001d77..9b12f14fd 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockPSDL.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockPSDL.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks; @@ -28,8 +29,8 @@ import net.minecraft.world.World; import com.shinoow.abyssalcraft.AbyssalCraft; +import com.shinoow.abyssalcraft.api.entity.IDreadEntity; import com.shinoow.abyssalcraft.common.blocks.tile.TileEntityPSDL; -import com.shinoow.abyssalcraft.core.api.entity.IDreadEntity; public class BlockPSDL extends BlockContainer { diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockPhead.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockPhead.java index e2918a6d3..b5d44164d 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockPhead.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockPhead.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockSolidLava.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockSolidLava.java index 24c3d8859..4defcd5f8 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockSolidLava.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockSolidLava.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockTransmutator.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockTransmutator.java index 81b90f868..43d8f8c03 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockTransmutator.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockTransmutator.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockWhead.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockWhead.java index a100aa315..e4bfbd829 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockWhead.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/BlockWhead.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/IngotBlock.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/IngotBlock.java index f35b2eab1..da0e2e562 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/IngotBlock.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/IngotBlock.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/itemblock/ItemAbyDreadbrickSlab.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/itemblock/ItemAbyDreadbrickSlab.java index d30952b87..68cebc1ab 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/itemblock/ItemAbyDreadbrickSlab.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/itemblock/ItemAbyDreadbrickSlab.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks.itemblock; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/itemblock/ItemAbySlab.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/itemblock/ItemAbySlab.java index 1d2c6e1fa..63f719431 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/itemblock/ItemAbySlab.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/itemblock/ItemAbySlab.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks.itemblock; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/itemblock/ItemAltar.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/itemblock/ItemAltar.java index 731c88b18..55654f884 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/itemblock/ItemAltar.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/itemblock/ItemAltar.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks.itemblock; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/itemblock/ItemBlockColorName.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/itemblock/ItemBlockColorName.java index bbb2dd5e8..ac0907978 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/itemblock/ItemBlockColorName.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/itemblock/ItemBlockColorName.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks.itemblock; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/itemblock/ItemCstonebrickSlab.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/itemblock/ItemCstonebrickSlab.java index 781d1d3fa..ad96bf857 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/itemblock/ItemCstonebrickSlab.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/itemblock/ItemCstonebrickSlab.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks.itemblock; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/itemblock/ItemDLTSlab.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/itemblock/ItemDLTSlab.java index f88fe2eb7..4a17e633d 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/itemblock/ItemDLTSlab.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/itemblock/ItemDLTSlab.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks.itemblock; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/itemblock/ItemDarkbrickSlab.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/itemblock/ItemDarkbrickSlab.java index 206d0be9f..9cbdd7fb0 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/itemblock/ItemDarkbrickSlab.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/itemblock/ItemDarkbrickSlab.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks.itemblock; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/itemblock/ItemDarkcobbleSlab.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/itemblock/ItemDarkcobbleSlab.java index 4b8d58c0d..f4314c410 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/itemblock/ItemDarkcobbleSlab.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/itemblock/ItemDarkcobbleSlab.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks.itemblock; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/itemblock/ItemDarkstoneSlab.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/itemblock/ItemDarkstoneSlab.java index a7ed4e2fb..e1b7cc817 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/itemblock/ItemDarkstoneSlab.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/itemblock/ItemDarkstoneSlab.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks.itemblock; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/itemblock/ItemDreadbrickSlab.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/itemblock/ItemDreadbrickSlab.java index cb9ff7ace..e19f839cd 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/itemblock/ItemDreadbrickSlab.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/itemblock/ItemDreadbrickSlab.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks.itemblock; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/itemblock/ItemMetadataBlock.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/itemblock/ItemMetadataBlock.java index e6fd2fbb9..f2a102cc7 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/itemblock/ItemMetadataBlock.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/itemblock/ItemMetadataBlock.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks.itemblock; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/itemblock/ItemODB.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/itemblock/ItemODB.java index edcf28c1b..b5a853cf4 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/itemblock/ItemODB.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/itemblock/ItemODB.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks.itemblock; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityAltar.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityAltar.java index df2b82ee8..04ce54430 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityAltar.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityAltar.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks.tile; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityChagarothFistSpawner.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityChagarothFistSpawner.java index 0ea14f52a..465a840b2 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityChagarothFistSpawner.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityChagarothFistSpawner.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks.tile; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityChagarothSpawner.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityChagarothSpawner.java index e3aae69ba..7b10210fa 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityChagarothSpawner.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityChagarothSpawner.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks.tile; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityCrate.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityCrate.java index 0059735c1..2e875b077 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityCrate.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityCrate.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks.tile; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityCrystallizer.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityCrystallizer.java index 7dac949cb..9e4b2333f 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityCrystallizer.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityCrystallizer.java @@ -1,3 +1,19 @@ +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.shinoow.abyssalcraft.common.blocks.tile; import java.util.HashMap; @@ -14,11 +30,11 @@ import net.minecraft.tileentity.TileEntity; import com.shinoow.abyssalcraft.AbyssalCraft; +import com.shinoow.abyssalcraft.api.AbyssalCraftAPI; +import com.shinoow.abyssalcraft.api.AbyssalCraftAPI.FuelType; +import com.shinoow.abyssalcraft.api.recipe.CrystallizerRecipes; import com.shinoow.abyssalcraft.common.blocks.BlockCrystallizer; import com.shinoow.abyssalcraft.common.items.ItemCrystal; -import com.shinoow.abyssalcraft.core.util.CoreRegistry; -import com.shinoow.abyssalcraft.core.util.CoreRegistry.FuelType; -import com.shinoow.abyssalcraft.core.util.recipes.CrystallizerRecipes; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -286,22 +302,21 @@ public void updateEntity() */ private boolean canCrystallize() { - if (crystallizerItemStacks[0] == null) + if (crystallizerItemStacks[0] == null || CrystallizerRecipes.crystallization().getCrystallizationResult(crystallizerItemStacks[0]) == null) return false; else { - if(CrystallizerRecipes.crystallization().getCrystallizationResult(crystallizerItemStacks[0]) == null) return false; ItemStack[] itemstack = CrystallizerRecipes.crystallization().getCrystallizationResult(crystallizerItemStacks[0]); if(itemstack[0] == null && itemstack[1] == null) return false; if(crystallizerItemStacks[2] == null && crystallizerItemStacks[3] == null) return true; - if(!crystallizerItemStacks[2].isItemEqual(itemstack[0]) && crystallizerItemStacks[3] != null && itemstack[1] == null) return false; - if(!crystallizerItemStacks[2].isItemEqual(itemstack[0]) && crystallizerItemStacks[3] == null && itemstack[1] != null) return false; if(crystallizerItemStacks[2] == null && crystallizerItemStacks[3] != null && itemstack[1] == null || - crystallizerItemStacks[2].isItemEqual(itemstack[0]) && crystallizerItemStacks[3] != null && itemstack[1] == null) return true; - if(crystallizerItemStacks[2].isItemEqual(itemstack[0]) && crystallizerItemStacks[3] == null || - crystallizerItemStacks[2] == null && crystallizerItemStacks[3].isItemEqual(itemstack[1]) && itemstack[1] != null) return true; - if(!crystallizerItemStacks[2].isItemEqual(itemstack[0]) && !crystallizerItemStacks[3].isItemEqual(itemstack[1])) return false; + crystallizerItemStacks[2] == null && crystallizerItemStacks[3].isItemEqual(itemstack[1]) && itemstack[1] != null || + crystallizerItemStacks[2].isItemEqual(itemstack[0]) && crystallizerItemStacks[3] != null && itemstack[1] == null || + crystallizerItemStacks[2].isItemEqual(itemstack[0]) && crystallizerItemStacks[3] == null) return true; + if(!crystallizerItemStacks[2].isItemEqual(itemstack[0]) && crystallizerItemStacks[3] != null && itemstack[1] == null || + !crystallizerItemStacks[2].isItemEqual(itemstack[0]) && crystallizerItemStacks[3] == null && itemstack[1] != null || + !crystallizerItemStacks[2].isItemEqual(itemstack[0]) && !crystallizerItemStacks[3].isItemEqual(itemstack[1])) return false; int result = crystallizerItemStacks[2].stackSize + itemstack[0].stackSize; int result2 = crystallizerItemStacks[3].stackSize + itemstack[1].stackSize; return result <= getInventoryStackLimit() && result2 <= getInventoryStackLimit() && result <= crystallizerItemStacks[2].getMaxStackSize() && result2 <= crystallizerItemStacks[3].getMaxStackSize(); @@ -358,7 +373,7 @@ public static int getCrystallizationTime(ItemStack par1ItemStack) if (item == Items.blaze_powder) return 1200; if (item == Items.blaze_rod) return 2400; if (item == AbyssalCraft.methane) return 10000; - return CoreRegistry.getFuelValue(par1ItemStack, FuelType.CRYSTALLIZER); + return AbyssalCraftAPI.getFuelValue(par1ItemStack, FuelType.CRYSTALLIZER); } } diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityDGhead.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityDGhead.java index 95f4d0b3a..2fc18f228 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityDGhead.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityDGhead.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks.tile; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityDreadAltarBottom.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityDreadAltarBottom.java index f982152de..4613708b2 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityDreadAltarBottom.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityDreadAltarBottom.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks.tile; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityDreadAltarTop.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityDreadAltarTop.java index a773d6cb6..242c3b309 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityDreadAltarTop.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityDreadAltarTop.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks.tile; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityDreadguardSpawner.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityDreadguardSpawner.java index d2e8f9635..183a1f0b3 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityDreadguardSpawner.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityDreadguardSpawner.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks.tile; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityEngraver.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityEngraver.java new file mode 100644 index 000000000..627decc57 --- /dev/null +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityEngraver.java @@ -0,0 +1,283 @@ +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.shinoow.abyssalcraft.common.blocks.tile; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.*; +import net.minecraft.tileentity.TileEntity; + +import com.shinoow.abyssalcraft.AbyssalCraft; +import com.shinoow.abyssalcraft.api.item.ItemEngraving; +import com.shinoow.abyssalcraft.api.recipe.EngraverRecipes; +import com.shinoow.abyssalcraft.common.blocks.BlockEngraver; + +import cpw.mods.fml.relauncher.*; + +public class TileEntityEngraver extends TileEntity implements ISidedInventory { + + private static final int[] slotsTop = new int[] {0}; + private static final int[] slotsBottom = new int[] {2, 1}; + private static final int[] slotsSides = new int[] {1}; + + private ItemStack[] engraverItemStacks = new ItemStack[3]; + + public int engraverProcessTime; + private String containerName; + + @Override + public int getSizeInventory() { + return engraverItemStacks.length; + } + + @Override + public ItemStack getStackInSlot(int var1) { + return engraverItemStacks[var1]; + } + + @Override + public ItemStack decrStackSize(int var1, int var2) { + + if(engraverItemStacks[var1] != null){ + ItemStack itemstack; + if(engraverItemStacks[var1].stackSize <= var2){ + itemstack = engraverItemStacks[var1]; + engraverItemStacks[var1] = null; + return itemstack; + } else { + itemstack = engraverItemStacks[var1].splitStack(var2); + if(engraverItemStacks[var1].stackSize == 0) + engraverItemStacks[var1] = null; + + return itemstack; + } + } + return null; + } + + @Override + public ItemStack getStackInSlotOnClosing(int var1) { + + if(engraverItemStacks[var1] != null){ + ItemStack itemstack = engraverItemStacks[var1]; + engraverItemStacks[var1] = null; + return itemstack; + } else + return null; + } + + @Override + public void setInventorySlotContents(int var1, ItemStack var2) { + + engraverItemStacks[var1] = var2; + + if(var2 != null && var2.stackSize > getInventoryStackLimit()) + var2.stackSize = getInventoryStackLimit(); + + } + + @Override + public String getInventoryName() + { + return hasCustomInventoryName() ? containerName : "container.abyssalcraft.engraver"; + } + + @Override + public boolean hasCustomInventoryName() + { + return containerName != null && containerName.length() > 0; + } + + public void func_145951_a(String par1) + { + containerName = par1; + } + + @Override + public void readFromNBT(NBTTagCompound par1) + { + super.readFromNBT(par1); + NBTTagList nbttaglist = par1.getTagList("Items", 10); + engraverItemStacks = new ItemStack[getSizeInventory()]; + + for (int i = 0; i < nbttaglist.tagCount(); ++i) + { + NBTTagCompound nbttagcompound1 = nbttaglist.getCompoundTagAt(i); + byte b0 = nbttagcompound1.getByte("Slot"); + + if (b0 >= 0 && b0 < engraverItemStacks.length) + engraverItemStacks[b0] = ItemStack.loadItemStackFromNBT(nbttagcompound1); + } + + engraverProcessTime = par1.getShort("ProcessTime"); + + if (par1.hasKey("CustomName", 8)) + containerName = par1.getString("CustomName"); + } + + @Override + public void writeToNBT(NBTTagCompound par1) + { + super.writeToNBT(par1); + par1.setShort("ProcessTime", (short)engraverProcessTime); + NBTTagList nbttaglist = new NBTTagList(); + + for (int i = 0; i < engraverItemStacks.length; ++i) + if (engraverItemStacks[i] != null) + { + NBTTagCompound nbttagcompound1 = new NBTTagCompound(); + nbttagcompound1.setByte("Slot", (byte)i); + engraverItemStacks[i].writeToNBT(nbttagcompound1); + nbttaglist.appendTag(nbttagcompound1); + } + + par1.setTag("Items", nbttaglist); + + if (hasCustomInventoryName()) + par1.setString("CustomName", containerName); + } + + @Override + public int getInventoryStackLimit() { + + return 64; + } + + @SideOnly(Side.CLIENT) + public int getProcessProgressScaled(int par1) + { + return engraverProcessTime * par1 / 200; + } + + public boolean isEngraving(){ + return engraverItemStacks[1] != null; + } + + @Override + public void updateEntity() + { + + boolean flag1 = false; + + if (!worldObj.isRemote) + { + if (isEngraving() && canEngrave()) + { + ++engraverProcessTime; + + if (engraverProcessTime == 200) + { + engraverProcessTime = 0; + engraveItem(); + flag1 = true; + engraverItemStacks[1].setItemDamage(engraverItemStacks[1].getItemDamage() + 1); + if (engraverItemStacks[1].getItemDamage() == engraverItemStacks[1].getMaxDamage()) + engraverItemStacks[1] = engraverItemStacks[1].getItem().getContainerItem(engraverItemStacks[1]); + } + } else + engraverProcessTime = 0; + + if (engraverProcessTime > 0) + { + flag1 = true; + BlockEngraver.updateEngraverBlockState(engraverProcessTime > 0, worldObj, xCoord, yCoord, zCoord); + } + } + + if (flag1) + markDirty(); + } + + /** + * Returns true if the engraver can engrave an item, i.e. has a source item, destination stack isn't full, etc. + */ + private boolean canEngrave() + { + if (engraverItemStacks[0] == null || EngraverRecipes.engraving().getEngravingResult(engraverItemStacks[0]) == null) + return false; + else + { + ItemStack itemstack = EngraverRecipes.engraving().getEngravingResult(engraverItemStacks[0]); + boolean blank = engraverItemStacks[1].getItem() == AbyssalCraft.engravingBlank && itemstack.getItem() == AbyssalCraft.coin; + boolean cthulhu = engraverItemStacks[1].getItem() == AbyssalCraft.engravingCthulhu && itemstack.getItem() == AbyssalCraft.cthulhuCoin; + if (itemstack == null) return false; + if(blank == false && cthulhu == false) return false; + if (engraverItemStacks[2] == null && blank == true && cthulhu == false) return true; + if (engraverItemStacks[2] == null && cthulhu == true && blank == false) return true; + if (!engraverItemStacks[2].isItemEqual(itemstack)) return false; + int result = engraverItemStacks[2].stackSize + itemstack.stackSize; + return result <= getInventoryStackLimit() && result <= engraverItemStacks[2].getMaxStackSize(); + } + } + + /** + * Turn one item from the engraver source stack into the appropriate processed item in the engraver result stack + */ + public void engraveItem() + { + if (canEngrave()) + { + ItemStack itemstack = EngraverRecipes.engraving().getEngravingResult(engraverItemStacks[0]); + + if (engraverItemStacks[2] == null) + engraverItemStacks[2] = itemstack.copy(); + else if (engraverItemStacks[2].getItem() == itemstack.getItem()) + engraverItemStacks[2].stackSize += itemstack.stackSize; + + --engraverItemStacks[0].stackSize; + + if (engraverItemStacks[0].stackSize <= 0) + engraverItemStacks[0] = null; + } + } + + @Override + public boolean isUseableByPlayer(EntityPlayer par1EntityPlayer) + { + return worldObj.getTileEntity(xCoord, yCoord, zCoord) != this ? false : par1EntityPlayer.getDistanceSq(xCoord + 0.5D, yCoord + 0.5D, zCoord + 0.5D) <= 64.0D; + } + + @Override + public void openInventory() {} + + @Override + public void closeInventory() {} + + @Override + public boolean isItemValidForSlot(int par1, ItemStack par2ItemStack) + { + return par1 == 2 ? false : par1 == 1 ? par2ItemStack.getItem() instanceof ItemEngraving : true; + } + + @Override + public int[] getAccessibleSlotsFromSide(int var1) { + + return var1 == 0 ? slotsBottom : var1 == 1 ? slotsTop : slotsSides; + } + + @Override + public boolean canInsertItem(int var1, ItemStack var2, int var3) { + + return isItemValidForSlot(var1, var2); + } + + @Override + public boolean canExtractItem(int var1, ItemStack var2, int var3) { + return false; + } +} \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityODB.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityODB.java index b4d8bb729..f5255b03b 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityODB.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityODB.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks.tile; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityOhead.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityOhead.java index 9698e32b5..4c964d8c2 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityOhead.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityOhead.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks.tile; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityPSDL.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityPSDL.java index d1f334139..2a65fd749 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityPSDL.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityPSDL.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks.tile; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityPhead.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityPhead.java index 4341e7214..0eb08e72b 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityPhead.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityPhead.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks.tile; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityTransmutator.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityTransmutator.java index d181c93ca..b743bf8b8 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityTransmutator.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityTransmutator.java @@ -1,3 +1,19 @@ +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.shinoow.abyssalcraft.common.blocks.tile; import net.minecraft.entity.player.EntityPlayer; @@ -10,11 +26,11 @@ import net.minecraft.tileentity.TileEntity; import com.shinoow.abyssalcraft.AbyssalCraft; +import com.shinoow.abyssalcraft.api.AbyssalCraftAPI; +import com.shinoow.abyssalcraft.api.AbyssalCraftAPI.FuelType; +import com.shinoow.abyssalcraft.api.recipe.TransmutatorRecipes; import com.shinoow.abyssalcraft.common.blocks.BlockTransmutator; import com.shinoow.abyssalcraft.common.items.ItemCrystal; -import com.shinoow.abyssalcraft.core.util.CoreRegistry; -import com.shinoow.abyssalcraft.core.util.CoreRegistry.FuelType; -import com.shinoow.abyssalcraft.core.util.recipes.TransmutatorRecipes; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -28,7 +44,7 @@ public class TileEntityTransmutator extends TileEntity implements ISidedInventor * The ItemStacks that hold the items currently being used in the transmutator */ private ItemStack[] transmutatorItemStacks = new ItemStack[3]; - /** The number of ticks that the furnace will keep burning */ + /** The number of ticks that the transmutator will keep burning */ public int transmutatorBurnTime; /** * The number of ticks that a fresh copy of the currently-burning item would keep the transmutator burning for @@ -217,7 +233,7 @@ public int getBurnTimeRemainingScaled(int par1) } /** - * Furnace isTransmutating + * Transmuator is transmutating */ public boolean isTransmutating() { @@ -278,7 +294,7 @@ public void updateEntity() } /** - * Returns true if the furnace can smelt an item, i.e. has a source item, destination stack isn't full, etc. + * Returns true if the transmutator can process an item, i.e. has a source item, destination stack isn't full, etc. */ private boolean canProcess() { @@ -296,7 +312,7 @@ private boolean canProcess() } /** - * Turn one item from the furnace source stack into the appropriate smelted item in the furnace result stack + * Turn one item from the transmutator source stack into the appropriate processed item in the transmutator result stack */ public void processItem() { @@ -349,14 +365,14 @@ public static int getItemBurnTime(ItemStack par1ItemStack) if (item == Items.blaze_powder) return 1200; if (item == Items.blaze_rod) return 2400; if (item == AbyssalCraft.methane) return 10000; - return CoreRegistry.getFuelValue(par1ItemStack, FuelType.TRANSMUTATOR); + return AbyssalCraftAPI.getFuelValue(par1ItemStack, FuelType.TRANSMUTATOR); } } public static boolean isItemFuel(ItemStack par1ItemStack) { /** - * Returns the number of ticks that the supplied fuel item will keep the furnace burning, or 0 if the item isn't + * Returns the number of ticks that the supplied fuel item will keep the transmutator burning, or 0 if the item isn't * fuel */ return getItemBurnTime(par1ItemStack) > 0; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityWhead.java b/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityWhead.java index 530c67cd9..c317a5673 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityWhead.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/blocks/tile/TileEntityWhead.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.blocks.tile; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/creativetabs/TabACCoins.java b/src/main/java/com/shinoow/abyssalcraft/common/creativetabs/TabACCoins.java new file mode 100644 index 000000000..9e3b5047a --- /dev/null +++ b/src/main/java/com/shinoow/abyssalcraft/common/creativetabs/TabACCoins.java @@ -0,0 +1,46 @@ +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.shinoow.abyssalcraft.common.creativetabs; + +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; + +import com.shinoow.abyssalcraft.AbyssalCraft; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class TabACCoins extends CreativeTabs { + + public TabACCoins(int id, String name){ + super(id, name); + } + + @Override + @SideOnly(Side.CLIENT) + public String getTranslatedTabLabel() + { + return "itemgroup." + getTabLabel(); + } + + @Override + @SideOnly(Side.CLIENT) + public Item getTabIconItem() + { + return AbyssalCraft.coin; + } +} \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/common/creativetabs/TabACCrystals.java b/src/main/java/com/shinoow/abyssalcraft/common/creativetabs/TabACCrystals.java index b08b88507..b3bb03766 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/creativetabs/TabACCrystals.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/creativetabs/TabACCrystals.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.creativetabs; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/enchantments/EnchantmentIronWall.java b/src/main/java/com/shinoow/abyssalcraft/common/enchantments/EnchantmentIronWall.java index b0d73c5c3..a67b0576f 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/enchantments/EnchantmentIronWall.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/enchantments/EnchantmentIronWall.java @@ -1,22 +1,22 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.enchantments; -import net.minecraft.enchantment.Enchantment; -import net.minecraft.enchantment.EnumEnchantmentType; +import net.minecraft.enchantment.*; public class EnchantmentIronWall extends Enchantment { diff --git a/src/main/java/com/shinoow/abyssalcraft/common/enchantments/EnchantmentLightPierce.java b/src/main/java/com/shinoow/abyssalcraft/common/enchantments/EnchantmentLightPierce.java index eb17affff..124faa982 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/enchantments/EnchantmentLightPierce.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/enchantments/EnchantmentLightPierce.java @@ -1,26 +1,26 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.enchantments; -import net.minecraft.enchantment.Enchantment; -import net.minecraft.enchantment.EnchantmentDamage; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.EnumCreatureAttribute; -import net.minecraft.item.ItemAxe; -import net.minecraft.item.ItemStack; +import com.shinoow.abyssalcraft.api.AbyssalCraftAPI; + +import net.minecraft.enchantment.*; +import net.minecraft.entity.*; +import net.minecraft.item.*; public class EnchantmentLightPierce extends EnchantmentDamage { @@ -50,7 +50,7 @@ public int getMaxLevel() @Override public float calcModifierLiving(int par1, EntityLivingBase par2EntityLivingBase) { - return par2EntityLivingBase.getCreatureAttribute() == Enum.valueOf(EnumCreatureAttribute.class, "SHADOW") ? par1 * 2.5F : 0.0F; + return par2EntityLivingBase.getCreatureAttribute() == AbyssalCraftAPI.SHADOW ? par1 * 2.5F : 0.0F; } @Override diff --git a/src/main/java/com/shinoow/abyssalcraft/common/enchantments/EnchantmentWeaponInfusion.java b/src/main/java/com/shinoow/abyssalcraft/common/enchantments/EnchantmentWeaponInfusion.java index cd3c461f7..83981ab0c 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/enchantments/EnchantmentWeaponInfusion.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/enchantments/EnchantmentWeaponInfusion.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.enchantments; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityAbyssalZombie.java b/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityAbyssalZombie.java index 3b1faaec8..3aeb4511d 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityAbyssalZombie.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityAbyssalZombie.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.entity; @@ -33,7 +34,7 @@ import net.minecraftforge.common.ForgeModContainer; import com.shinoow.abyssalcraft.AbyssalCraft; -import com.shinoow.abyssalcraft.core.api.entity.ICoraliumEntity; +import com.shinoow.abyssalcraft.api.entity.ICoraliumEntity; public class EntityAbyssalZombie extends EntityMob implements ICoraliumEntity { @@ -240,7 +241,7 @@ public EnumCreatureAttribute getCreatureAttribute() } @Override - protected void dropFewItems(boolean par1, int par2) + protected void dropRareDrop(int par1) { switch (rand.nextInt(3)) { diff --git a/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityChagaroth.java b/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityChagaroth.java index 40cdf40a1..6c55204f3 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityChagaroth.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityChagaroth.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.entity; @@ -35,8 +36,8 @@ import net.minecraft.world.World; import com.shinoow.abyssalcraft.AbyssalCraft; +import com.shinoow.abyssalcraft.api.entity.IDreadEntity; import com.shinoow.abyssalcraft.common.util.SpecialTextUtil; -import com.shinoow.abyssalcraft.core.api.entity.IDreadEntity; public class EntityChagaroth extends EntityMob implements IBossDisplayData, IDreadEntity { diff --git a/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityChagarothFist.java b/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityChagarothFist.java index 2df51c7b1..05b7aa4a7 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityChagarothFist.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityChagarothFist.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.entity; @@ -22,7 +23,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; -import com.shinoow.abyssalcraft.core.api.entity.IDreadEntity; +import com.shinoow.abyssalcraft.api.entity.IDreadEntity; public class EntityChagarothFist extends EntityMob implements IDreadEntity { diff --git a/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityChagarothSpawn.java b/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityChagarothSpawn.java index 293b7a9a6..312a50fd0 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityChagarothSpawn.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityChagarothSpawn.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.entity; @@ -25,7 +26,7 @@ import net.minecraft.world.World; import com.shinoow.abyssalcraft.AbyssalCraft; -import com.shinoow.abyssalcraft.core.api.entity.IDreadEntity; +import com.shinoow.abyssalcraft.api.entity.IDreadEntity; public class EntityChagarothSpawn extends EntityMob implements IDreadEntity { diff --git a/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityDemonPig.java b/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityDemonPig.java index 3b7e9ef81..12d13bb24 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityDemonPig.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityDemonPig.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.entity; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityDepthsghoul.java b/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityDepthsghoul.java index a136665dc..cdcf37cce 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityDepthsghoul.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityDepthsghoul.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.entity; @@ -34,7 +35,7 @@ import net.minecraftforge.common.ForgeModContainer; import com.shinoow.abyssalcraft.AbyssalCraft; -import com.shinoow.abyssalcraft.core.api.entity.ICoraliumEntity; +import com.shinoow.abyssalcraft.api.entity.ICoraliumEntity; public class EntityDepthsGhoul extends EntityMob implements ICoraliumEntity { @@ -239,20 +240,20 @@ public boolean attackEntityAsMob(Entity par1Entity) @Override protected String getLivingSound() { - String entitysound = "mob.zombie.say"; + String entitysound = "abyssalcraft:ghoul.normal.idle"; switch (getGhoulType()) { case 0: - entitysound = "mob.zombie.say"; //abyssalcraft:ghoul.normal.idle + entitysound = "abyssalcraft:ghoul.normal.idle"; break; case 1: entitysound = "abyssalcraft:ghoul.pete.idle"; break; case 2: - entitysound = "mob.zombie.say"; //abyssalcraft:ghoul.wilson.idle + entitysound = "abyssalcraft:ghoul.normal.idle"; //abyssalcraft:ghoul.wilson.idle break; case 3: - entitysound = "mob.zombie.say"; //abyssalcraft:ghoul.orange.idle + entitysound = "abyssalcraft:ghoul.normal.idle"; //abyssalcraft:ghoul.orange.idle } return entitysound; } @@ -281,22 +282,7 @@ protected String getHurtSound() @Override protected String getDeathSound() { - String entitysound = "mob.zombie.death"; - switch (getGhoulType()) - { - case 0: - entitysound = "mob.zombie.death"; //abyssalcraft:ghoul.normal.death - break; - case 1: - entitysound = "abyssalcraft:ghoul.pete.death"; - break; - case 2: - entitysound = "mob.zombie.death"; //abyssalcraft:ghoul.wilson.death - break; - case 3: - entitysound = "mob.zombie.death"; //abyssalcraft:ghoul.orange.death - } - return entitysound; + return "abyssalcraft:ghoul.death"; } @Override @@ -318,32 +304,22 @@ public EnumCreatureAttribute getCreatureAttribute() } @Override - protected void dropFewItems(boolean par1, int par2) + protected void dropRareDrop(int par1) { - switch (rand.nextInt(3)) - { + switch(getGhoulType()){ case 0: - dropItem(Items.bone, 1); + dropItem(Item.getItemFromBlock(AbyssalCraft.DGhead),1); break; case 1: - dropItem(AbyssalCraft.sword, 1); + dropItem(Item.getItemFromBlock(AbyssalCraft.Phead),1); break; case 2: - dropItem(AbyssalCraft.Coralium, rand.nextInt(3)); - } - } - - @Override - protected void dropRareDrop(int par1) - { - if(getGhoulType() == 0) - dropItem(Item.getItemFromBlock(AbyssalCraft.DGhead),1); - else if(getGhoulType() == 1) - dropItem(Item.getItemFromBlock(AbyssalCraft.Phead),1); - else if(getGhoulType() == 2) dropItem(Item.getItemFromBlock(AbyssalCraft.Whead),1); - else if(getGhoulType() == 3) + break; + case 3: dropItem(Item.getItemFromBlock(AbyssalCraft.Ohead),1); + break; + } } @Override diff --git a/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityDragonBoss.java b/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityDragonBoss.java index 6ce8406e1..083065327 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityDragonBoss.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityDragonBoss.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.entity; @@ -27,9 +28,9 @@ import net.minecraft.world.*; import com.shinoow.abyssalcraft.AbyssalCraft; +import com.shinoow.abyssalcraft.api.entity.ICoraliumEntity; import com.shinoow.abyssalcraft.client.lib.ParticleEffects; import com.shinoow.abyssalcraft.common.util.SpecialTextUtil; -import com.shinoow.abyssalcraft.core.api.entity.ICoraliumEntity; public class EntityDragonBoss extends EntityMob implements IBossDisplayData, IEntityMultiPart, ICoraliumEntity { diff --git a/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityDragonMinion.java b/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityDragonMinion.java index 30e85189e..66d5ce1ba 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityDragonMinion.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityDragonMinion.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.entity; @@ -26,7 +27,7 @@ import net.minecraft.world.*; import com.shinoow.abyssalcraft.AbyssalCraft; -import com.shinoow.abyssalcraft.core.api.entity.ICoraliumEntity; +import com.shinoow.abyssalcraft.api.entity.ICoraliumEntity; public class EntityDragonMinion extends EntityMob implements IEntityMultiPart, ICoraliumEntity { diff --git a/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityDreadSpawn.java b/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityDreadSpawn.java index 008dfa957..7c0cc9d5d 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityDreadSpawn.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityDreadSpawn.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.entity; @@ -25,7 +26,7 @@ import net.minecraft.world.World; import com.shinoow.abyssalcraft.AbyssalCraft; -import com.shinoow.abyssalcraft.core.api.entity.IDreadEntity; +import com.shinoow.abyssalcraft.api.entity.IDreadEntity; public class EntityDreadSpawn extends EntityMob implements IDreadEntity { diff --git a/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityDreadling.java b/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityDreadling.java index da02e04d4..167b12c64 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityDreadling.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityDreadling.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.entity; @@ -25,7 +26,7 @@ import net.minecraft.world.World; import com.shinoow.abyssalcraft.AbyssalCraft; -import com.shinoow.abyssalcraft.core.api.entity.IDreadEntity; +import com.shinoow.abyssalcraft.api.entity.IDreadEntity; public class EntityDreadling extends EntityMob implements IDreadEntity { diff --git a/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityGatekeeperMinion.java b/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityGatekeeperMinion.java index 2829d78a0..f70e49690 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityGatekeeperMinion.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityGatekeeperMinion.java @@ -1,7 +1,23 @@ +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.shinoow.abyssalcraft.common.entity; import com.shinoow.abyssalcraft.AbyssalCraft; -import com.shinoow.abyssalcraft.core.api.entity.*; +import com.shinoow.abyssalcraft.api.entity.*; import net.minecraft.block.Block; import net.minecraft.entity.EnumCreatureAttribute; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityJzahar.java b/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityJzahar.java index 4403f5d65..76dde2215 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityJzahar.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityJzahar.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.entity; @@ -32,8 +33,8 @@ import net.minecraft.world.World; import com.shinoow.abyssalcraft.AbyssalCraft; +import com.shinoow.abyssalcraft.api.entity.*; import com.shinoow.abyssalcraft.common.util.SpecialTextUtil; -import com.shinoow.abyssalcraft.core.api.entity.*; public class EntityJzahar extends EntityMob implements IBossDisplayData, IRangedAttackMob, IAntiEntity, ICoraliumEntity, IDreadEntity { diff --git a/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityLesserShoggoth.java b/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityLesserShoggoth.java index 34244791e..f9a7a0de2 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityLesserShoggoth.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityLesserShoggoth.java @@ -1,9 +1,26 @@ +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.shinoow.abyssalcraft.common.entity; import java.util.UUID; import com.shinoow.abyssalcraft.AbyssalCraft; -import com.shinoow.abyssalcraft.core.api.entity.*; +import com.shinoow.abyssalcraft.api.AbyssalCraftAPI; +import com.shinoow.abyssalcraft.api.entity.*; import net.minecraft.block.Block; import net.minecraft.entity.Entity; @@ -26,9 +43,11 @@ import net.minecraft.entity.monster.EntityZombie; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; +import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.ForgeModContainer; @@ -85,6 +104,30 @@ public boolean canBreatheUnderwater() { return true; } + @Override + public String getCommandSenderName() + { + String entityname = StatCollector.translateToLocal("entity.abyssalcraft.lessershoggoth.name"); + switch (getShoggothType()) + { + case 0: + entityname = StatCollector.translateToLocal("entity.abyssalcraft.lessershoggoth.name"); + break; + case 1: + entityname = StatCollector.translateToLocal("entity.abyssalcraft.lessershoggoth.abyssal.name"); + break; + case 2: + entityname = StatCollector.translateToLocal("entity.abyssalcraft.lessershoggoth.dreaded.name"); + break; + case 3: + entityname = StatCollector.translateToLocal("entity.abyssalcraft.lessershoggoth.omothol.name"); + break; + case 4: + entityname = StatCollector.translateToLocal("entity.abyssalcraft.lessershoggoth.dark.name"); + } + return entityname; + } + @Override public boolean isChild() { @@ -166,13 +209,13 @@ protected void func_145780_a(int par1, int par2, int par3, Block par4) @Override protected Item getDropItem() { - return AbyssalCraft.Corflesh; + return new ItemStack(AbyssalCraft.shoggothFlesh, 1, getShoggothType()).getItem(); } @Override public EnumCreatureAttribute getCreatureAttribute() { - return EnumCreatureAttribute.UNDEAD; + return getShoggothType() == 4 ? AbyssalCraftAPI.SHADOW : EnumCreatureAttribute.UNDEAD; } @Override diff --git a/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityODBPrimed.java b/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityODBPrimed.java index 4c2f70df6..e1a23ac33 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityODBPrimed.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityODBPrimed.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.entity; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityODBcPrimed.java b/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityODBcPrimed.java index ccb2c1d36..1b2b648a6 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityODBcPrimed.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityODBcPrimed.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.entity; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityOmotholGhoul.java b/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityOmotholGhoul.java index 88c3f2a9d..2f31c935a 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityOmotholGhoul.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityOmotholGhoul.java @@ -1,3 +1,19 @@ +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.shinoow.abyssalcraft.common.entity; import com.shinoow.abyssalcraft.AbyssalCraft; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityOmotholWarden.java b/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityOmotholWarden.java index f43c688e5..be5b0827e 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityOmotholWarden.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityOmotholWarden.java @@ -1,3 +1,19 @@ +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.shinoow.abyssalcraft.common.entity; import com.shinoow.abyssalcraft.AbyssalCraft; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityPSDLTracker.java b/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityPSDLTracker.java index a4ebd0318..60aeff54c 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityPSDLTracker.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityPSDLTracker.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.entity; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityRemnant.java b/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityRemnant.java index b970371e5..9b2113049 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityRemnant.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityRemnant.java @@ -1,3 +1,19 @@ +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.shinoow.abyssalcraft.common.entity; import net.minecraft.entity.SharedMonsterAttributes; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/entity/EntitySacthoth.java b/src/main/java/com/shinoow/abyssalcraft/common/entity/EntitySacthoth.java index 8acba21ad..577e38b22 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/entity/EntitySacthoth.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/entity/EntitySacthoth.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.entity; @@ -32,8 +33,9 @@ import net.minecraftforge.event.entity.living.EnderTeleportEvent; import com.shinoow.abyssalcraft.AbyssalCraft; +import com.shinoow.abyssalcraft.api.AbyssalCraftAPI; +import com.shinoow.abyssalcraft.api.entity.*; import com.shinoow.abyssalcraft.common.util.SpecialTextUtil; -import com.shinoow.abyssalcraft.core.api.entity.*; public class EntitySacthoth extends EntityMob implements IBossDisplayData, IAntiEntity, ICoraliumEntity, IDreadEntity { @@ -148,7 +150,7 @@ protected String getHurtSound() @Override protected String getDeathSound() { - return "mob.blaze.death"; + return "abyssalcraft:sacthoth.death"; } @Override @@ -171,7 +173,7 @@ protected void dropFewItems(boolean par1, int par2) { @Override public EnumCreatureAttribute getCreatureAttribute() { - return Enum.valueOf(EnumCreatureAttribute.class, "SHADOW"); + return AbyssalCraftAPI.SHADOW; } /** diff --git a/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityShadowBeast.java b/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityShadowBeast.java index 4e7244c3b..bc0066026 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityShadowBeast.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityShadowBeast.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.entity; @@ -24,7 +25,8 @@ import net.minecraft.world.World; import com.shinoow.abyssalcraft.AbyssalCraft; -import com.shinoow.abyssalcraft.core.api.entity.*; +import com.shinoow.abyssalcraft.api.AbyssalCraftAPI; +import com.shinoow.abyssalcraft.api.entity.*; public class EntityShadowBeast extends EntityMob implements IAntiEntity, ICoraliumEntity, IDreadEntity { @@ -90,7 +92,7 @@ protected Item getDropItem() @Override public EnumCreatureAttribute getCreatureAttribute() { - return Enum.valueOf(EnumCreatureAttribute.class, "SHADOW"); + return AbyssalCraftAPI.SHADOW; } @Override diff --git a/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityShadowCreature.java b/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityShadowCreature.java index f45cd3cdb..7d7679546 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityShadowCreature.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityShadowCreature.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.entity; @@ -24,7 +25,7 @@ import net.minecraft.world.World; import com.shinoow.abyssalcraft.AbyssalCraft; -import com.shinoow.abyssalcraft.core.api.entity.*; +import com.shinoow.abyssalcraft.api.entity.*; public class EntityShadowCreature extends EntityMob implements IAntiEntity, ICoraliumEntity, IDreadEntity { diff --git a/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityShadowMonster.java b/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityShadowMonster.java index e258ab825..f4a9a7124 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityShadowMonster.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityShadowMonster.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.entity; @@ -24,7 +25,8 @@ import net.minecraft.world.World; import com.shinoow.abyssalcraft.AbyssalCraft; -import com.shinoow.abyssalcraft.core.api.entity.*; +import com.shinoow.abyssalcraft.api.AbyssalCraftAPI; +import com.shinoow.abyssalcraft.api.entity.*; public class EntityShadowMonster extends EntityMob implements IAntiEntity, ICoraliumEntity, IDreadEntity { @@ -83,7 +85,7 @@ protected Item getDropItem() @Override public EnumCreatureAttribute getCreatureAttribute() { - return Enum.valueOf(EnumCreatureAttribute.class, "SHADOW"); + return AbyssalCraftAPI.SHADOW; } @Override diff --git a/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityShadowTitan.java b/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityShadowTitan.java index 77038af10..033255d4c 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityShadowTitan.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/entity/EntityShadowTitan.java @@ -1,21 +1,23 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.entity; import com.shinoow.abyssalcraft.AbyssalCraft; +import com.shinoow.abyssalcraft.api.AbyssalCraftAPI; import net.minecraft.entity.EnumCreatureAttribute; import net.minecraft.entity.SharedMonsterAttributes; @@ -90,7 +92,7 @@ protected Item getDropItem() @Override public EnumCreatureAttribute getCreatureAttribute() { - return Enum.valueOf(EnumCreatureAttribute.class, "SHADOW"); + return AbyssalCraftAPI.SHADOW; } @Override diff --git a/src/main/java/com/shinoow/abyssalcraft/common/entity/EntitySkeletonGoliath.java b/src/main/java/com/shinoow/abyssalcraft/common/entity/EntitySkeletonGoliath.java index 3a5eb4ba6..9e23d1ff2 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/entity/EntitySkeletonGoliath.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/entity/EntitySkeletonGoliath.java @@ -1,3 +1,19 @@ +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.shinoow.abyssalcraft.common.entity; import net.minecraft.block.Block; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/entity/Entityabygolem.java b/src/main/java/com/shinoow/abyssalcraft/common/entity/Entityabygolem.java index 6b8a4eed4..e47599416 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/entity/Entityabygolem.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/entity/Entityabygolem.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.entity; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/entity/Entitydreadgolem.java b/src/main/java/com/shinoow/abyssalcraft/common/entity/Entitydreadgolem.java index a8b84fbbd..d824ec6b4 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/entity/Entitydreadgolem.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/entity/Entitydreadgolem.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.entity; @@ -24,7 +25,7 @@ import net.minecraft.world.World; import com.shinoow.abyssalcraft.AbyssalCraft; -import com.shinoow.abyssalcraft.core.api.entity.IDreadEntity; +import com.shinoow.abyssalcraft.api.entity.IDreadEntity; public class EntityDreadgolem extends EntityMob implements IDreadEntity { diff --git a/src/main/java/com/shinoow/abyssalcraft/common/entity/Entitydreadguard.java b/src/main/java/com/shinoow/abyssalcraft/common/entity/Entitydreadguard.java index e52cae94c..73cb41196 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/entity/Entitydreadguard.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/entity/Entitydreadguard.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.entity; @@ -29,7 +30,7 @@ import net.minecraft.world.World; import com.shinoow.abyssalcraft.AbyssalCraft; -import com.shinoow.abyssalcraft.core.api.entity.IDreadEntity; +import com.shinoow.abyssalcraft.api.entity.IDreadEntity; public class EntityDreadguard extends EntityMob implements IDreadEntity { diff --git a/src/main/java/com/shinoow/abyssalcraft/common/entity/Entityevilpig.java b/src/main/java/com/shinoow/abyssalcraft/common/entity/Entityevilpig.java index 83075747d..a0417f2cc 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/entity/Entityevilpig.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/entity/Entityevilpig.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.entity; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/entity/ai/EntityAIAntiCreeperSwell.java b/src/main/java/com/shinoow/abyssalcraft/common/entity/ai/EntityAIAntiCreeperSwell.java index 364ffc2e9..5b64bea2d 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/entity/ai/EntityAIAntiCreeperSwell.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/entity/ai/EntityAIAntiCreeperSwell.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.entity.ai; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/entity/anti/EntityAntiAbyssalZombie.java b/src/main/java/com/shinoow/abyssalcraft/common/entity/anti/EntityAntiAbyssalZombie.java index 451729cb4..4a31ac104 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/entity/anti/EntityAntiAbyssalZombie.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/entity/anti/EntityAntiAbyssalZombie.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.entity.anti; @@ -30,8 +31,8 @@ import net.minecraftforge.common.ForgeModContainer; import com.shinoow.abyssalcraft.AbyssalCraft; +import com.shinoow.abyssalcraft.api.entity.IAntiEntity; import com.shinoow.abyssalcraft.common.entity.EntityAbyssalZombie; -import com.shinoow.abyssalcraft.core.api.entity.IAntiEntity; public class EntityAntiAbyssalZombie extends EntityMob implements IAntiEntity { diff --git a/src/main/java/com/shinoow/abyssalcraft/common/entity/anti/EntityAntiBat.java b/src/main/java/com/shinoow/abyssalcraft/common/entity/anti/EntityAntiBat.java index 2fb1d7eb2..c84150d2f 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/entity/anti/EntityAntiBat.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/entity/anti/EntityAntiBat.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.entity.anti; @@ -24,7 +25,7 @@ import net.minecraft.util.*; import net.minecraft.world.World; -import com.shinoow.abyssalcraft.core.api.entity.IAntiEntity; +import com.shinoow.abyssalcraft.api.entity.IAntiEntity; public class EntityAntiBat extends EntityAmbientCreature implements IAntiEntity { diff --git a/src/main/java/com/shinoow/abyssalcraft/common/entity/anti/EntityAntiChicken.java b/src/main/java/com/shinoow/abyssalcraft/common/entity/anti/EntityAntiChicken.java index eeb4f59ba..06155b239 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/entity/anti/EntityAntiChicken.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/entity/anti/EntityAntiChicken.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.entity.anti; @@ -25,7 +26,7 @@ import net.minecraft.world.World; import com.shinoow.abyssalcraft.AbyssalCraft; -import com.shinoow.abyssalcraft.core.api.entity.IAntiEntity; +import com.shinoow.abyssalcraft.api.entity.IAntiEntity; public class EntityAntiChicken extends EntityAnimal implements IAntiEntity { diff --git a/src/main/java/com/shinoow/abyssalcraft/common/entity/anti/EntityAntiCow.java b/src/main/java/com/shinoow/abyssalcraft/common/entity/anti/EntityAntiCow.java index 43a0d708b..c06622db5 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/entity/anti/EntityAntiCow.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/entity/anti/EntityAntiCow.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.entity.anti; @@ -27,7 +28,7 @@ import net.minecraft.world.World; import com.shinoow.abyssalcraft.AbyssalCraft; -import com.shinoow.abyssalcraft.core.api.entity.IAntiEntity; +import com.shinoow.abyssalcraft.api.entity.IAntiEntity; public class EntityAntiCow extends EntityAnimal implements IAntiEntity { diff --git a/src/main/java/com/shinoow/abyssalcraft/common/entity/anti/EntityAntiCreeper.java b/src/main/java/com/shinoow/abyssalcraft/common/entity/anti/EntityAntiCreeper.java index 4e51f0d59..041e11d75 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/entity/anti/EntityAntiCreeper.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/entity/anti/EntityAntiCreeper.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.entity.anti; @@ -27,8 +28,8 @@ import net.minecraft.util.DamageSource; import net.minecraft.world.World; +import com.shinoow.abyssalcraft.api.entity.IAntiEntity; import com.shinoow.abyssalcraft.common.entity.ai.EntityAIAntiCreeperSwell; -import com.shinoow.abyssalcraft.core.api.entity.IAntiEntity; import cpw.mods.fml.relauncher.*; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/entity/anti/EntityAntiGhoul.java b/src/main/java/com/shinoow/abyssalcraft/common/entity/anti/EntityAntiGhoul.java index f29f494a6..fc53e3047 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/entity/anti/EntityAntiGhoul.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/entity/anti/EntityAntiGhoul.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.entity.anti; @@ -25,8 +26,8 @@ import net.minecraft.world.World; import com.shinoow.abyssalcraft.AbyssalCraft; +import com.shinoow.abyssalcraft.api.entity.IAntiEntity; import com.shinoow.abyssalcraft.common.entity.EntityDepthsGhoul; -import com.shinoow.abyssalcraft.core.api.entity.IAntiEntity; public class EntityAntiGhoul extends EntityMob implements IAntiEntity { diff --git a/src/main/java/com/shinoow/abyssalcraft/common/entity/anti/EntityAntiPig.java b/src/main/java/com/shinoow/abyssalcraft/common/entity/anti/EntityAntiPig.java index 9339437f5..1ab656ba9 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/entity/anti/EntityAntiPig.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/entity/anti/EntityAntiPig.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.entity.anti; @@ -25,7 +26,7 @@ import net.minecraft.world.World; import com.shinoow.abyssalcraft.AbyssalCraft; -import com.shinoow.abyssalcraft.core.api.entity.IAntiEntity; +import com.shinoow.abyssalcraft.api.entity.IAntiEntity; public class EntityAntiPig extends EntityAnimal implements IAntiEntity { diff --git a/src/main/java/com/shinoow/abyssalcraft/common/entity/anti/EntityAntiPlayer.java b/src/main/java/com/shinoow/abyssalcraft/common/entity/anti/EntityAntiPlayer.java index 766a38353..ee12bf744 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/entity/anti/EntityAntiPlayer.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/entity/anti/EntityAntiPlayer.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.entity.anti; @@ -22,7 +23,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; -import com.shinoow.abyssalcraft.core.api.entity.IAntiEntity; +import com.shinoow.abyssalcraft.api.entity.IAntiEntity; public class EntityAntiPlayer extends EntityMob implements IAntiEntity { diff --git a/src/main/java/com/shinoow/abyssalcraft/common/entity/anti/EntityAntiSkeleton.java b/src/main/java/com/shinoow/abyssalcraft/common/entity/anti/EntityAntiSkeleton.java index 6dd5e81fd..703054ef9 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/entity/anti/EntityAntiSkeleton.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/entity/anti/EntityAntiSkeleton.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.entity.anti; @@ -27,7 +28,7 @@ import net.minecraft.world.*; import com.shinoow.abyssalcraft.AbyssalCraft; -import com.shinoow.abyssalcraft.core.api.entity.IAntiEntity; +import com.shinoow.abyssalcraft.api.entity.IAntiEntity; public class EntityAntiSkeleton extends EntityMob implements IRangedAttackMob, IAntiEntity { diff --git a/src/main/java/com/shinoow/abyssalcraft/common/entity/anti/EntityAntiSpider.java b/src/main/java/com/shinoow/abyssalcraft/common/entity/anti/EntityAntiSpider.java index d000950e2..9e99473d0 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/entity/anti/EntityAntiSpider.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/entity/anti/EntityAntiSpider.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.entity.anti; @@ -27,7 +28,7 @@ import net.minecraft.world.*; import com.shinoow.abyssalcraft.AbyssalCraft; -import com.shinoow.abyssalcraft.core.api.entity.IAntiEntity; +import com.shinoow.abyssalcraft.api.entity.IAntiEntity; public class EntityAntiSpider extends EntityMob implements IAntiEntity { diff --git a/src/main/java/com/shinoow/abyssalcraft/common/entity/anti/EntityAntiZombie.java b/src/main/java/com/shinoow/abyssalcraft/common/entity/anti/EntityAntiZombie.java index 83c537869..01503fb23 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/entity/anti/EntityAntiZombie.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/entity/anti/EntityAntiZombie.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.entity.anti; @@ -31,7 +32,7 @@ import net.minecraftforge.common.ForgeModContainer; import com.shinoow.abyssalcraft.AbyssalCraft; -import com.shinoow.abyssalcraft.core.api.entity.IAntiEntity; +import com.shinoow.abyssalcraft.api.entity.IAntiEntity; import cpw.mods.fml.relauncher.*; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/handlers/AbyssalCraftEventHooks.java b/src/main/java/com/shinoow/abyssalcraft/common/handlers/AbyssalCraftEventHooks.java index 80e9bc7dc..d9cdf4b8e 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/handlers/AbyssalCraftEventHooks.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/handlers/AbyssalCraftEventHooks.java @@ -1,38 +1,47 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.handlers; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; +import java.util.Random; + +import net.minecraft.entity.*; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Blocks; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.potion.PotionEffect; +import net.minecraft.potion.*; import net.minecraft.util.EntityDamageSource; +import net.minecraft.world.WorldServer; import net.minecraft.world.chunk.Chunk; import net.minecraft.world.chunk.storage.ExtendedBlockStorage; -import net.minecraftforge.event.entity.living.LivingAttackEvent; +import net.minecraftforge.event.entity.living.*; +import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; import net.minecraftforge.event.entity.player.*; import net.minecraftforge.event.terraingen.PopulateChunkEvent; import com.shinoow.abyssalcraft.AbyssalCraft; +import com.shinoow.abyssalcraft.api.item.ItemUpgradeKit; import com.shinoow.abyssalcraft.common.blocks.*; +import com.shinoow.abyssalcraft.common.world.TeleporterOmothol; + import cpw.mods.fml.common.eventhandler.Event.Result; import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.PlayerEvent; public class AbyssalCraftEventHooks { @@ -93,25 +102,6 @@ public void onItemPickup(EntityItemPickupEvent event) { event.entityPlayer.addStat(AbyssalCraft.findPSDL, 1); } - /**@SubscribeEvent - public void darkRealm(LivingUpdateEvent event){ - if(event.entityLiving instanceof EntityPlayerMP){ - WorldServer worldServer = (WorldServer)event.entityLiving.worldObj; - EntityPlayerMP player = (EntityPlayerMP)event.entityLiving; - if(player.dimension == AbyssalCraft.configDimId3 && player.posY <= 0){ - player.addPotionEffect(new PotionEffect(Potion.resistance.getId(), 60, 255)); - player.addPotionEffect(new PotionEffect(Potion.blindness.getId(), 20)); - player.mcServer.getConfigurationManager().transferPlayerToDimension(player, AbyssalCraft.configDimId4, new TeleporterOmothol(worldServer)); - } - } - if(event.entityLiving.worldObj.isRemote && event.entityLiving.dimension == AbyssalCraft.configDimId4){ - Random rand = new Random(); - event.entityLiving.worldObj.spawnParticle("largesmoke", event.entityLiving.posX + (rand.nextDouble() - 0.5D) * event.entityLiving.width, - event.entityLiving.posY + rand.nextDouble() * event.entityLiving.height, - event.entityLiving.posZ + (rand.nextDouble() - 0.5D) * event.entityLiving.width, 0,0,0); - } - }*/ - @SubscribeEvent public void enchantmentEffects(LivingAttackEvent event){ if(event.source instanceof EntityDamageSource){ @@ -130,47 +120,66 @@ else if(enchTag.getCompoundTagAt(i).getInteger("id") == AbyssalCraft.dreadE.effe } } - /**@SubscribeEvent + @SubscribeEvent public void ironWall(LivingHurtEvent event){ ItemStack item = event.entityLiving.getEquipmentInSlot(3); if(item != null && item.hasTagCompound()){ NBTTagList enchTag = item.getEnchantmentTagList(); - for(int i = 0; i < enchTag.tagCount(); i++){ + for(int i = 0; i < enchTag.tagCount(); i++) if(enchTag.getCompoundTagAt(i).getInteger("id") == AbyssalCraft.ironWall.effectId) - event.entityLiving.setVelocity(0, 0, 0); - } + event.entityLiving.setInWeb(); } } - /**@SubscribeEvent - public void renderDepthsHelmetOverlay(RenderGameOverlayEvent event) { - final ResourceLocation coraliumBlur = new ResourceLocation("abyssalcraft:textures/misc/coraliumblur.png"); - - ItemStack helmet = Minecraft.getMinecraft().thePlayer.inventory.armorItemInSlot(3); - if(Minecraft.getMinecraft().gameSettings.thirdPersonView == 0 && helmet != null && helmet.getItem() == AbyssalCraft.Depthshelmet) { - GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS); - - Tessellator t = Tessellator.instance; - - ScaledResolution scale = new ScaledResolution(Minecraft.getMinecraft().gameSettings, Minecraft.getMinecraft().displayWidth, Minecraft.getMinecraft().displayHeight); - int width = scale.getScaledWidth(); - int height = scale.getScaledHeight(); - - GL11.glDisable(GL11.GL_DEPTH_TEST); - GL11.glDepthMask(false); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glDisable(GL11.GL_ALPHA_TEST); - Minecraft.getMinecraft().renderEngine.bindTexture(coraliumBlur); - - t.startDrawingQuads(); - t.addVertexWithUV(0.0D, (double)height, 90.0D, 0.0D, 1.0D); - t.addVertexWithUV((double)width, (double)height, 90.0D, 1.0D, 1.0D); - t.addVertexWithUV((double)width, 0.0D, 90.0D, 1.0D, 0.0D); - t.addVertexWithUV(0.0D, 0.0D, 90.0D, 0.0D, 0.0D); - t.draw(); - - GL11.glPopAttrib(); + @SubscribeEvent + public void darkRealm(LivingUpdateEvent event){ + if(event.entityLiving instanceof EntityPlayerMP){ + WorldServer worldServer = (WorldServer)event.entityLiving.worldObj; + EntityPlayerMP player = (EntityPlayerMP)event.entityLiving; + if(player.dimension == AbyssalCraft.configDimId3 && player.posY <= 0){ + player.addPotionEffect(new PotionEffect(Potion.resistance.getId(), 60, 255)); + player.addPotionEffect(new PotionEffect(Potion.blindness.getId(), 20)); + player.mcServer.getConfigurationManager().transferPlayerToDimension(player, AbyssalCraft.configDimId4, new TeleporterOmothol(worldServer)); + player.addStat(AbyssalCraft.enterDarkRealm, 1); + } } - }*/ + if(event.entityLiving.worldObj.isRemote && event.entityLiving.dimension == AbyssalCraft.configDimId4){ + Random rand = new Random(); + event.entityLiving.worldObj.spawnParticle("largesmoke", event.entityLiving.posX + (rand.nextDouble() - 0.5D) * event.entityLiving.width, + event.entityLiving.posY + rand.nextDouble() * event.entityLiving.height, + event.entityLiving.posZ + (rand.nextDouble() - 0.5D) * event.entityLiving.width, 0,0,0); + } + } + + @SubscribeEvent + public void onCraftingEvent(PlayerEvent.ItemCraftedEvent event) + { + for(int h=0; h < event.craftMatrix.getSizeInventory(); h++) + if(event.craftMatrix.getStackInSlot(h) != null) + for(int i=0; i < event.craftMatrix.getSizeInventory(); i++) + if(event.craftMatrix.getStackInSlot(i) != null) + { + ItemStack k = event.craftMatrix.getStackInSlot(h); + ItemStack j = event.craftMatrix.getStackInSlot(i); + + if(k.getItem() != null && j.getItem() != null && k.getItem() instanceof ItemUpgradeKit) + { + NBTTagCompound nbttest = new NBTTagCompound(); + NBTTagList tag = new NBTTagList(); + + if(j.isItemEnchanted()) + { + NBTTagList test = j.stackTagCompound.getTagList("ench", 10); + tag = test; + } + ItemStack l = event.crafting; + if(j.isItemEnchanted()) + { + l.stackTagCompound = nbttest; + l.stackTagCompound.setTag("ench", tag); + } + event.craftMatrix.setInventorySlotContents(i, l); + } + } + } } \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/common/handlers/BucketHandler.java b/src/main/java/com/shinoow/abyssalcraft/common/handlers/BucketHandler.java index 9f9ab666a..d4f88148d 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/handlers/BucketHandler.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/handlers/BucketHandler.java @@ -1,3 +1,19 @@ +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.shinoow.abyssalcraft.common.handlers; import java.util.HashMap; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/handlers/FurnaceFuelHandler.java b/src/main/java/com/shinoow/abyssalcraft/common/handlers/FurnaceFuelHandler.java index f142d384a..8ddffdd14 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/handlers/FurnaceFuelHandler.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/handlers/FurnaceFuelHandler.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.handlers; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/inventory/ContainerCrystallizer.java b/src/main/java/com/shinoow/abyssalcraft/common/inventory/ContainerCrystallizer.java index e5f5ee365..9253db3c1 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/inventory/ContainerCrystallizer.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/inventory/ContainerCrystallizer.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.inventory; @@ -22,8 +23,8 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import com.shinoow.abyssalcraft.api.recipe.CrystallizerRecipes; import com.shinoow.abyssalcraft.common.blocks.tile.TileEntityCrystallizer; -import com.shinoow.abyssalcraft.core.util.recipes.CrystallizerRecipes; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/inventory/ContainerEngraver.java b/src/main/java/com/shinoow/abyssalcraft/common/inventory/ContainerEngraver.java new file mode 100644 index 000000000..26377ee60 --- /dev/null +++ b/src/main/java/com/shinoow/abyssalcraft/common/inventory/ContainerEngraver.java @@ -0,0 +1,141 @@ +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.shinoow.abyssalcraft.common.inventory; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; + +import com.shinoow.abyssalcraft.api.recipe.EngraverRecipes; +import com.shinoow.abyssalcraft.common.blocks.tile.TileEntityEngraver; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class ContainerEngraver extends Container { + + private TileEntityEngraver tileEngraver; + private int lastProcessTime; + + public ContainerEngraver(InventoryPlayer par1InventoryPlayer, TileEntityEngraver par2TileEntityEngraver){ + tileEngraver = par2TileEntityEngraver; + addSlotToContainer(new Slot(par2TileEntityEngraver, 0, 56, 17)); + addSlotToContainer(new SlotEngraving(par2TileEntityEngraver, 1, 56, 53)); + addSlotToContainer(new SlotEngraverOutput(par1InventoryPlayer.player, par2TileEntityEngraver, 2, 116, 35)); + int i; + + for(i = 0; i < 3; i++) + for (int j = 0; j < 9; ++j) + addSlotToContainer(new Slot(par1InventoryPlayer, j + i * 9 + 9, 8 + j * 18, 84 + i * 18)); + + for (i = 0; i < 9; ++i) + addSlotToContainer(new Slot(par1InventoryPlayer, i, 8 + i * 18, 142)); + } + + @Override + public void addCraftingToCrafters(ICrafting par1ICrafting) + { + super.addCraftingToCrafters(par1ICrafting); + par1ICrafting.sendProgressBarUpdate(this, 0, tileEngraver.engraverProcessTime); + } + + @Override + public void detectAndSendChanges() + { + super.detectAndSendChanges(); + + for (int i = 0; i < crafters.size(); ++i) + { + ICrafting icrafting = (ICrafting)crafters.get(i); + + if (lastProcessTime != tileEngraver.engraverProcessTime) + icrafting.sendProgressBarUpdate(this, 0, tileEngraver.engraverProcessTime); + } + + lastProcessTime = tileEngraver.engraverProcessTime; + } + + @Override + @SideOnly(Side.CLIENT) + public void updateProgressBar(int par1, int par2) + { + if (par1 == 0) + tileEngraver.engraverProcessTime = par2; + + if (par1 == 3) + tileEngraver.engraverProcessTime = par2; + } + + @Override + public boolean canInteractWith(EntityPlayer var1) { + + return tileEngraver.isUseableByPlayer(var1); + } + + @Override + public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer, int par2) + { + ItemStack itemstack = null; + Slot slot = (Slot)inventorySlots.get(par2); + + if (slot != null && slot.getHasStack()) + { + ItemStack itemstack1 = slot.getStack(); + itemstack = itemstack1.copy(); + + if (par2 == 2) + { + if (!mergeItemStack(itemstack1, 3, 39, true)) + return null; + + slot.onSlotChange(itemstack1, itemstack); + } + else if (par2 != 1 && par2 != 0) + { + if (EngraverRecipes.engraving().getEngravingResult(itemstack1) != null) + { + if (!mergeItemStack(itemstack1, 0, 1, false)) + return null; + } + else if (par2 >= 3 && par2 < 30) + { + if (!mergeItemStack(itemstack1, 30, 39, false)) + return null; + } + else if (par2 >= 30 && par2 < 39 && !mergeItemStack(itemstack1, 3, 30, false)) + return null; + } + else if (!mergeItemStack(itemstack1, 3, 39, false)) + return null; + + if (itemstack1.stackSize == 0) + slot.putStack((ItemStack)null); + else + slot.onSlotChanged(); + + if (itemstack1.stackSize == itemstack.stackSize) + return null; + + slot.onPickupFromSlot(par1EntityPlayer, itemstack1); + } + + return itemstack; + } +} \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/common/inventory/ContainerTransmutator.java b/src/main/java/com/shinoow/abyssalcraft/common/inventory/ContainerTransmutator.java index 0e5d26c4b..25dc5aa1b 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/inventory/ContainerTransmutator.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/inventory/ContainerTransmutator.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.inventory; @@ -22,8 +23,8 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import com.shinoow.abyssalcraft.api.recipe.TransmutatorRecipes; import com.shinoow.abyssalcraft.common.blocks.tile.TileEntityTransmutator; -import com.shinoow.abyssalcraft.core.util.recipes.TransmutatorRecipes; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -31,7 +32,7 @@ public class ContainerTransmutator extends Container { private TileEntityTransmutator tileTransmutator; - private int lastCookTime; + private int lastProcessTime; private int lastBurnTime; private int lastItemBurnTime; @@ -69,7 +70,7 @@ public void detectAndSendChanges() { ICrafting icrafting = (ICrafting)crafters.get(i); - if (lastCookTime != tileTransmutator.transmutatorProcessTime) + if (lastProcessTime != tileTransmutator.transmutatorProcessTime) icrafting.sendProgressBarUpdate(this, 0, tileTransmutator.transmutatorProcessTime); if (lastBurnTime != tileTransmutator.transmutatorBurnTime) @@ -79,7 +80,7 @@ public void detectAndSendChanges() icrafting.sendProgressBarUpdate(this, 2, tileTransmutator.currentItemBurnTime); } - lastCookTime = tileTransmutator.transmutatorProcessTime; + lastProcessTime = tileTransmutator.transmutatorProcessTime; lastBurnTime = tileTransmutator.transmutatorBurnTime; lastItemBurnTime = tileTransmutator.currentItemBurnTime; } diff --git a/src/main/java/com/shinoow/abyssalcraft/common/inventory/SlotCrystallizer.java b/src/main/java/com/shinoow/abyssalcraft/common/inventory/SlotCrystallizer.java index 5c2ff3eef..1840dc92f 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/inventory/SlotCrystallizer.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/inventory/SlotCrystallizer.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.inventory; @@ -22,7 +23,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; -import com.shinoow.abyssalcraft.core.util.recipes.CrystallizerRecipes; +import com.shinoow.abyssalcraft.api.recipe.CrystallizerRecipes; public class SlotCrystallizer extends Slot { diff --git a/src/main/java/com/shinoow/abyssalcraft/common/inventory/SlotEngraverOutput.java b/src/main/java/com/shinoow/abyssalcraft/common/inventory/SlotEngraverOutput.java new file mode 100644 index 000000000..147388cc2 --- /dev/null +++ b/src/main/java/com/shinoow/abyssalcraft/common/inventory/SlotEngraverOutput.java @@ -0,0 +1,106 @@ +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.shinoow.abyssalcraft.common.inventory; + +import net.minecraft.entity.item.EntityXPOrb; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; +import net.minecraft.util.MathHelper; + +import com.shinoow.abyssalcraft.AbyssalCraft; +import com.shinoow.abyssalcraft.api.recipe.EngraverRecipes; + +public class SlotEngraverOutput extends Slot +{ + /** The player that is using the GUI where this slot resides. */ + private EntityPlayer thePlayer; + private int stackSize; + + public SlotEngraverOutput(EntityPlayer par1EntityPlayer, IInventory par2IInventory, int par3, int par4, int par5) + { + super(par2IInventory, par3, par4, par5); + thePlayer = par1EntityPlayer; + } + + @Override + public boolean isItemValid(ItemStack par1ItemStack) + { + return false; + } + + @Override + public ItemStack decrStackSize(int par1) + { + if (getHasStack()) + stackSize += Math.min(par1, getStack().stackSize); + + return super.decrStackSize(par1); + } + + @Override + public void onPickupFromSlot(EntityPlayer par1EntityPlayer, ItemStack par2ItemStack) + { + this.onCrafting(par2ItemStack); + super.onPickupFromSlot(par1EntityPlayer, par2ItemStack); + } + + @Override + protected void onCrafting(ItemStack par1ItemStack, int par2) + { + stackSize += par2; + this.onCrafting(par1ItemStack); + } + + @Override + protected void onCrafting(ItemStack par1ItemStack) + { + par1ItemStack.onCrafting(thePlayer.worldObj, thePlayer, stackSize); + + if (!thePlayer.worldObj.isRemote) + { + int i = stackSize; + float f = EngraverRecipes.engraving().getExperience(par1ItemStack); + int j; + + if (f == 0.0F) + i = 0; + else if (f < 1.0F) + { + j = MathHelper.floor_float(i * f); + + if (j < MathHelper.ceiling_float_int(i * f) && (float)Math.random() < i * f - j) + ++j; + + i = j; + } + + while (i > 0) + { + j = EntityXPOrb.getXPSplit(i); + i -= j; + thePlayer.worldObj.spawnEntityInWorld(new EntityXPOrb(thePlayer.worldObj, thePlayer.posX, thePlayer.posY + 0.5D, thePlayer.posZ + 0.5D, j)); + } + } + + stackSize = 0; + + if (par1ItemStack.getItem() == AbyssalCraft.portalPlacerJzh) + thePlayer.addStat(AbyssalCraft.GK3, 1); + } +} \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/common/inventory/SlotEngraving.java b/src/main/java/com/shinoow/abyssalcraft/common/inventory/SlotEngraving.java new file mode 100644 index 000000000..2342163b9 --- /dev/null +++ b/src/main/java/com/shinoow/abyssalcraft/common/inventory/SlotEngraving.java @@ -0,0 +1,36 @@ +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.shinoow.abyssalcraft.common.inventory; + +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; + +import com.shinoow.abyssalcraft.api.item.ItemEngraving; + +public class SlotEngraving extends Slot { + + public SlotEngraving(IInventory par1iInventory, int par2, int par3, int par4) { + super(par1iInventory, par2, par3, par4); + } + + @Override + public boolean isItemValid(ItemStack par1ItemStack) + { + return par1ItemStack.getItem() instanceof ItemEngraving; + } +} \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/common/inventory/SlotTransmutator.java b/src/main/java/com/shinoow/abyssalcraft/common/inventory/SlotTransmutator.java index 4b2524f5e..a03ac2738 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/inventory/SlotTransmutator.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/inventory/SlotTransmutator.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.inventory; @@ -23,7 +24,7 @@ import net.minecraft.util.MathHelper; import com.shinoow.abyssalcraft.AbyssalCraft; -import com.shinoow.abyssalcraft.core.util.recipes.TransmutatorRecipes; +import com.shinoow.abyssalcraft.api.recipe.TransmutatorRecipes; public class SlotTransmutator extends Slot { diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/AbyssalCraftTool.java b/src/main/java/com/shinoow/abyssalcraft/common/items/AbyssalCraftTool.java index 97c8dfa6b..c218491c2 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/AbyssalCraftTool.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/AbyssalCraftTool.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemACBasic.java b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemACBasic.java index 50c1697a0..6cb17c634 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemACBasic.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemACBasic.java @@ -1,24 +1,25 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.StatCollector; +import com.shinoow.abyssalcraft.AbyssalCraft; + +import net.minecraft.item.*; +import net.minecraft.util.*; public class ItemACBasic extends Item { @@ -26,6 +27,7 @@ public ItemACBasic(String par1) { super(); setUnlocalizedName(par1); setTextureName("abyssalcraft:" + par1); + setCreativeTab(AbyssalCraft.tabItems); } @Override diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemAbyssalniteAxe.java b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemAbyssalniteAxe.java index 56b5f23ad..200661f33 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemAbyssalniteAxe.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemAbyssalniteAxe.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemAbyssalniteCAxe.java b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemAbyssalniteCAxe.java index af0c9b40e..b8d7b8cc6 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemAbyssalniteCAxe.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemAbyssalniteCAxe.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemAbyssalniteCHoe.java b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemAbyssalniteCHoe.java index 68d4148c9..ba76f0767 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemAbyssalniteCHoe.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemAbyssalniteCHoe.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemAbyssalniteCPickaxe.java b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemAbyssalniteCPickaxe.java index c1c03f523..a11f59ab1 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemAbyssalniteCPickaxe.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemAbyssalniteCPickaxe.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemAbyssalniteCShovel.java b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemAbyssalniteCShovel.java index 7758460a6..d16025051 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemAbyssalniteCShovel.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemAbyssalniteCShovel.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemAbyssalniteCSword.java b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemAbyssalniteCSword.java index 71cd71b2e..581b9a88c 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemAbyssalniteCSword.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemAbyssalniteCSword.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemAbyssalniteHoe.java b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemAbyssalniteHoe.java index 0d45282b4..99db5572b 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemAbyssalniteHoe.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemAbyssalniteHoe.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemAbyssalnitePickaxe.java b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemAbyssalnitePickaxe.java index c869de3a5..eae1ecad9 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemAbyssalnitePickaxe.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemAbyssalnitePickaxe.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemAbyssalniteShovel.java b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemAbyssalniteShovel.java index 7ff7c0cea..5afb422b8 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemAbyssalniteShovel.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemAbyssalniteShovel.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemAbyssalniteSword.java b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemAbyssalniteSword.java index 02503511f..12c23819f 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemAbyssalniteSword.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemAbyssalniteSword.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemAntiBucket.java b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemAntiBucket.java index f56577bba..3eb85b6e4 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemAntiBucket.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemAntiBucket.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemAntiFood.java b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemAntiFood.java index 55a99f221..3ea2b29fb 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemAntiFood.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemAntiFood.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCBucket.java b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCBucket.java index 01f855292..29c5978d2 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCBucket.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCBucket.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCoin.java b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCoin.java index e379fc9e5..29dd37024 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCoin.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCoin.java @@ -1,3 +1,19 @@ +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.shinoow.abyssalcraft.common.items; import java.util.List; @@ -19,11 +35,11 @@ public class ItemCoin extends ItemACBasic { private static final int[] colors = {0xE89207, 0xD9D9D9, 0xF3CC3E, 0xE8E8E8, 0x8002BF, 0x00FF8C, 0xBD0000}; - public ItemCoin() { - super("coin"); + public ItemCoin(String par1) { + super(par1); setMaxDamage(0); setHasSubtypes(true); - setCreativeTab(AbyssalCraft.tabItems); + setCreativeTab(AbyssalCraft.tabCoins); } @Override diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCoraliumAxe.java b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCoraliumAxe.java index cb3e6d932..129828096 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCoraliumAxe.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCoraliumAxe.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCoraliumBow.java b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCoraliumBow.java index a0b2cd6a5..63ac91641 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCoraliumBow.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCoraliumBow.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCoraliumHoe.java b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCoraliumHoe.java index dfe690a75..62ebd4f72 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCoraliumHoe.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCoraliumHoe.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCoraliumPickaxe.java b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCoraliumPickaxe.java index 3113ac291..be7752f98 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCoraliumPickaxe.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCoraliumPickaxe.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCoraliumShovel.java b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCoraliumShovel.java index 478cf8f45..733a4d9be 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCoraliumShovel.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCoraliumShovel.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCoraliumSword.java b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCoraliumSword.java index d5d9ee3b4..4c8d9ffe8 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCoraliumSword.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCoraliumSword.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCoraliumcluster.java b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCoraliumcluster.java index 474ef45de..ab41ae19b 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCoraliumcluster.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCoraliumcluster.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCorb.java b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCorb.java index 9738d0e3f..ed38047de 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCorb.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCorb.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCorbone.java b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCorbone.java index 1144e4584..c9d6e9ad2 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCorbone.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCorbone.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCorflesh.java b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCorflesh.java index 6cf3a773e..66b6f8769 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCorflesh.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCorflesh.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCrystal.java b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCrystal.java index 1f0d41541..0c5fcfb9d 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCrystal.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCrystal.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCudgel.java b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCudgel.java index 9f1d1b26b..9e01e9715 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCudgel.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemCudgel.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemDarkstoneAxe.java b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemDarkstoneAxe.java index 805829dd9..3d16abbba 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemDarkstoneAxe.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemDarkstoneAxe.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemDarkstoneHoe.java b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemDarkstoneHoe.java index 4002b871b..7ad2032f0 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemDarkstoneHoe.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemDarkstoneHoe.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemDarkstonePickaxe.java b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemDarkstonePickaxe.java index b93f0091c..ea0f8e30f 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemDarkstonePickaxe.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemDarkstonePickaxe.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemDarkstoneShovel.java b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemDarkstoneShovel.java index a2f1ceb61..c809ccd50 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemDarkstoneShovel.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemDarkstoneShovel.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemDarkstoneSword.java b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemDarkstoneSword.java index 947e12f3c..296b937da 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemDarkstoneSword.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemDarkstoneSword.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemDreadiumAxe.java b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemDreadiumAxe.java index 9102a27de..9a2856003 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemDreadiumAxe.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemDreadiumAxe.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemDreadiumHoe.java b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemDreadiumHoe.java index c81aa6977..19e0f1906 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemDreadiumHoe.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemDreadiumHoe.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemDreadiumKatana.java b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemDreadiumKatana.java index e78067546..816feb74c 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemDreadiumKatana.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemDreadiumKatana.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemDreadiumPickaxe.java b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemDreadiumPickaxe.java index 4676c253a..5bba9df85 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemDreadiumPickaxe.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemDreadiumPickaxe.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemDreadiumShovel.java b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemDreadiumShovel.java index 3a333b58a..f211b0b49 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemDreadiumShovel.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemDreadiumShovel.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemDreadiumSword.java b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemDreadiumSword.java index 254fde7f0..07f37de45 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemDreadiumSword.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemDreadiumSword.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemEoA.java b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemEoA.java index 6fc139924..82e44877d 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemEoA.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemEoA.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemEthaxiumAxe.java b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemEthaxiumAxe.java index 7762723ed..e86a83d45 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemEthaxiumAxe.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemEthaxiumAxe.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemEthaxiumHoe.java b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemEthaxiumHoe.java index 196fd0f8b..3d4d3eba1 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemEthaxiumHoe.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemEthaxiumHoe.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemEthaxiumPickaxe.java b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemEthaxiumPickaxe.java index 08f3e2028..348420334 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemEthaxiumPickaxe.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemEthaxiumPickaxe.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemEthaxiumShovel.java b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemEthaxiumShovel.java index ce4801d81..f966e82bd 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemEthaxiumShovel.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemEthaxiumShovel.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemEthaxiumSword.java b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemEthaxiumSword.java index 807011a5f..21877fc90 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemEthaxiumSword.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemEthaxiumSword.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemFriedegg.java b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemFriedegg.java index bdc9526da..7b1713076 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemFriedegg.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemFriedegg.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemOC.java b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemOC.java index 0f2ef2046..c8e271541 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemOC.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemOC.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemPlatefood.java b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemPlatefood.java index 93a03bb64..f092b385a 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemPlatefood.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemPlatefood.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemPortalPlacer.java b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemPortalPlacer.java index dfa5fd78d..973bd5672 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemPortalPlacer.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemPortalPlacer.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemPortalPlacerDL.java b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemPortalPlacerDL.java index f56f7b216..412f7292e 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemPortalPlacerDL.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemPortalPlacerDL.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemPortalPlacerJzh.java b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemPortalPlacerJzh.java index 7afd57fa4..0a4ae05bd 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemPortalPlacerJzh.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemPortalPlacerJzh.java @@ -1,27 +1,33 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items; import java.util.List; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; import net.minecraft.item.*; import net.minecraft.util.*; +import net.minecraft.world.World; + import com.shinoow.abyssalcraft.AbyssalCraft; +import cpw.mods.fml.client.FMLClientHandler; + public class ItemPortalPlacerJzh extends Item { public ItemPortalPlacerJzh(){ @@ -49,7 +55,7 @@ public void addInformation(ItemStack par1ItemStack, EntityPlayer entityplayer, L list.add(StatCollector.translateToLocal("tooltip.portalplacerjzh.2")); } - /**@Override + @Override public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { if(par3World.isRemote && par3World.provider.isSurfaceWorld() || par3World.isRemote && par2EntityPlayer.dimension == AbyssalCraft.configDimId1) @@ -66,15 +72,9 @@ else if(!par3World.isRemote && par2EntityPlayer.dimension == AbyssalCraft.config if(direction == 1 || direction == 3) { for(int y = 1; y < 5; y++) - { for (int z = -1; z < 2; z++) - { if(par3World.getBlock(par4, par5 + y, par6 + z) != Blocks.air) - { return false; - } - } - } par3World.setBlock(par4, par5 + 1, par6, AbyssalCraft.omotholstone); par3World.setBlock(par4, par5 + 1, par6 + 1, AbyssalCraft.omotholstone); @@ -99,15 +99,9 @@ else if(!par3World.isRemote && par2EntityPlayer.dimension == AbyssalCraft.config else { for(int y = 1; y < 5; y++) - { for (int x = -1; x < 2; x++) - { if(par3World.getBlock(par4 + x, par5 + y, par6) != Blocks.air) - { return false; - } - } - } par3World.setBlock(par4, par5 + 1, par6, AbyssalCraft.omotholstone); par3World.setBlock(par4 + 1, par5 + 1, par6, AbyssalCraft.omotholstone); @@ -133,5 +127,5 @@ else if(!par3World.isRemote && par2EntityPlayer.dimension == AbyssalCraft.config } else return false; - }*/ + } } \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemShoggothFlesh.java b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemShoggothFlesh.java new file mode 100644 index 000000000..545ac793d --- /dev/null +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemShoggothFlesh.java @@ -0,0 +1,64 @@ +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.shinoow.abyssalcraft.common.items; + +import java.util.List; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; + +public class ItemShoggothFlesh extends ItemACBasic { + + private static final String[] names = { + "overworld", "abyssalwasteland", "dreadlands", "omothol", "darkrealm"}; + private static final int[] colors = {16777215, 0x00FF8C, 0xEB2D2D, 0x57545C, + 0x1D1D1F}; + + public ItemShoggothFlesh() { + super("shoggothFlesh"); + setMaxDamage(0); + setHasSubtypes(true); + } + + @Override + public int getMetadata(int meta) { + return meta; + } + + @Override + @SideOnly(Side.CLIENT) + public int getColorFromItemStack(ItemStack par1ItemStack, int par2) { + return colors[par1ItemStack.getItemDamage()]; + } + + @SuppressWarnings({ "unchecked", "rawtypes" }) + @Override + @SideOnly(Side.CLIENT) + public void getSubItems(Item par1Item, CreativeTabs par2CreativeTab, List par3List){ + for(int i = 0; i < names.length; ++i) + par3List.add(new ItemStack(par1Item, 1, i)); + } + + @Override + public String getItemStackDisplayName(ItemStack par1ItemStack) { + return StatCollector.translateToLocal(getUnlocalizedName() + "." + names[par1ItemStack.getItemDamage()] + ".name"); + } +} \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemSoulReaper.java b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemSoulReaper.java index 76737f5b9..1d6afaaf6 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemSoulReaper.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemSoulReaper.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemStaff.java b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemStaff.java index 6d33c1ca6..ac0c270b6 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemStaff.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemStaff.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items; import java.util.List; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemTrackerPSDL.java b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemTrackerPSDL.java index 946a77b17..077864698 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemTrackerPSDL.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemTrackerPSDL.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemWashCloth.java b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemWashCloth.java index 42da58bd3..e0db95800 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/ItemWashCloth.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/ItemWashCloth.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/armor/ItemAbyssalniteArmor.java b/src/main/java/com/shinoow/abyssalcraft/common/items/armor/ItemAbyssalniteArmor.java index 1a1d9e3c0..7fc7848e0 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/armor/ItemAbyssalniteArmor.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/armor/ItemAbyssalniteArmor.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items.armor; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/armor/ItemAbyssalniteCArmor.java b/src/main/java/com/shinoow/abyssalcraft/common/items/armor/ItemAbyssalniteCArmor.java index fff68abdb..067847a9b 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/armor/ItemAbyssalniteCArmor.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/armor/ItemAbyssalniteCArmor.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items.armor; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/armor/ItemCoraliumArmor.java b/src/main/java/com/shinoow/abyssalcraft/common/items/armor/ItemCoraliumArmor.java index 0eca8e176..e318692ce 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/armor/ItemCoraliumArmor.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/armor/ItemCoraliumArmor.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items.armor; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/armor/ItemCoraliumPArmor.java b/src/main/java/com/shinoow/abyssalcraft/common/items/armor/ItemCoraliumPArmor.java index 0a193333d..5fce41bbc 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/armor/ItemCoraliumPArmor.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/armor/ItemCoraliumPArmor.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items.armor; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/armor/ItemDepthsArmor.java b/src/main/java/com/shinoow/abyssalcraft/common/items/armor/ItemDepthsArmor.java index 1b6e3e11d..779918b63 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/armor/ItemDepthsArmor.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/armor/ItemDepthsArmor.java @@ -1,37 +1,48 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items.armor; +import java.util.List; + +import org.lwjgl.opengl.GL11; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.Entity; +import net.minecraft.entity.*; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemArmor; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.StatCollector; +import net.minecraft.item.*; +import net.minecraft.potion.*; +import net.minecraft.util.*; import net.minecraft.world.World; +import thaumcraft.api.IVisDiscountGear; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.nodes.IRevealer; import com.shinoow.abyssalcraft.AbyssalCraft; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.Optional.*; +import cpw.mods.fml.relauncher.*; -public class ItemDepthsArmor extends ItemArmor { +@InterfaceList(value = { @Interface(iface = "thaumcraft.api.IVisDiscountGear", modid = "Thaumcraft"), + @Interface(iface = "thaumcraft.api.nodes.IRevealer", modid = "Thaumcraft")}) +public class ItemDepthsArmor extends ItemArmor implements IVisDiscountGear, IRevealer { public ItemDepthsArmor(ArmorMaterial par2EnumArmorMaterial, int par3, int par4){ super(par2EnumArmorMaterial, par3, par4); setCreativeTab(AbyssalCraft.tabCombat); @@ -68,6 +79,8 @@ public void onArmorTick(World world, EntityPlayer player, ItemStack itemstack) { player.addPotionEffect(new PotionEffect(Potion.waterBreathing.getId(), 20, 0)); player.addPotionEffect(new PotionEffect(Potion.nightVision.getId(), 260, 0)); player.addPotionEffect(new PotionEffect(Potion.field_76443_y.getId(), 20, 0)); + if(player.getActivePotionEffect(AbyssalCraft.Cplague) !=null) + player.removePotionEffect(AbyssalCraft.Cplague.getId()); } if (itemstack.getItem() == AbyssalCraft.Depthsplate) player.addPotionEffect(new PotionEffect(Potion.resistance.getId(), 20, 0)); @@ -76,4 +89,67 @@ public void onArmorTick(World world, EntityPlayer player, ItemStack itemstack) { if (itemstack.getItem() == AbyssalCraft.Depthsboots) player.addPotionEffect(new PotionEffect(Potion.moveSpeed.getId(), 20, 0)); } + + @Override + @SideOnly(Side.CLIENT) + public void renderHelmetOverlay(ItemStack stack, EntityPlayer player, ScaledResolution resolution, float partialTicks, boolean hasScreen, int mouseX, int mouseY){ + final ResourceLocation coraliumBlur = new ResourceLocation("abyssalcraft:textures/misc/coraliumblur.png"); + + + if(Minecraft.getMinecraft().gameSettings.thirdPersonView == 0 && stack != null && stack.getItem() == AbyssalCraft.Depthshelmet) { + GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS); + + Tessellator t = Tessellator.instance; + + ScaledResolution scale = new ScaledResolution(Minecraft.getMinecraft().gameSettings, Minecraft.getMinecraft().displayWidth, Minecraft.getMinecraft().displayHeight); + int width = scale.getScaledWidth(); + int height = scale.getScaledHeight(); + + GL11.glDisable(GL11.GL_DEPTH_TEST); + GL11.glDepthMask(false); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GL11.glDisable(GL11.GL_ALPHA_TEST); + Minecraft.getMinecraft().renderEngine.bindTexture(coraliumBlur); + + t.startDrawingQuads(); + t.addVertexWithUV(0.0D, height, 90.0D, 0.0D, 1.0D); + t.addVertexWithUV(width, height, 90.0D, 1.0D, 1.0D); + t.addVertexWithUV(width, 0.0D, 90.0D, 1.0D, 0.0D); + t.addVertexWithUV(0.0D, 0.0D, 90.0D, 0.0D, 0.0D); + t.draw(); + + GL11.glPopAttrib(); + } + } + + @Override + @Method(modid = "Thaumcraft") + public int getVisDiscount(ItemStack stack, EntityPlayer player, + Aspect aspect) { + return stack.getItem() == AbyssalCraft.Depthshelmet ? 5 : stack.getItem() == AbyssalCraft.Depthsplate ? 2 : + stack.getItem() == AbyssalCraft.Depthslegs ? 2 : stack.getItem() == AbyssalCraft.Depthsboots ? 1 : 0; + } + + @SuppressWarnings({ "unchecked", "rawtypes" }) + @Override + public void addInformation(ItemStack is, EntityPlayer player, List l, boolean B){ + if(Loader.isModLoaded("Thaumcraft")){ + if(is.getItem() == AbyssalCraft.Depthshelmet) + l.add("\u00A75Vis discount : 5%"); + if(is.getItem() == AbyssalCraft.Depthsplate) + l.add("\u00A75Vis discount : 2%"); + if(is.getItem() == AbyssalCraft.Depthslegs) + l.add("\u00A75Vis discount : 2%"); + if(is.getItem() == AbyssalCraft.Depthsboots) + l.add("\u00A75Vis discount : 1%"); + } + } + + @Override + @Method(modid = "Thaumcraft") + public boolean showNodes(ItemStack itemstack, EntityLivingBase player) { + + return itemstack.getItem() == AbyssalCraft.Depthshelmet; + } } \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/armor/ItemDreadArmor.java b/src/main/java/com/shinoow/abyssalcraft/common/items/armor/ItemDreadArmor.java index 055e6be3c..00d01c488 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/armor/ItemDreadArmor.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/armor/ItemDreadArmor.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items.armor; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/armor/ItemDreadiumArmor.java b/src/main/java/com/shinoow/abyssalcraft/common/items/armor/ItemDreadiumArmor.java index 7ab5c452b..9ad2a2d40 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/armor/ItemDreadiumArmor.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/armor/ItemDreadiumArmor.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items.armor; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/armor/ItemDreadiumSamuraiArmor.java b/src/main/java/com/shinoow/abyssalcraft/common/items/armor/ItemDreadiumSamuraiArmor.java index 2217e9efa..3ffd31650 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/armor/ItemDreadiumSamuraiArmor.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/armor/ItemDreadiumSamuraiArmor.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items.armor; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/items/armor/ItemEthaxiumArmor.java b/src/main/java/com/shinoow/abyssalcraft/common/items/armor/ItemEthaxiumArmor.java index 483fd0508..b616b601a 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/items/armor/ItemEthaxiumArmor.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/items/armor/ItemEthaxiumArmor.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.items.armor; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/potion/PotionAntimatter.java b/src/main/java/com/shinoow/abyssalcraft/common/potion/PotionAntimatter.java index b070de2d8..e8f21ece6 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/potion/PotionAntimatter.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/potion/PotionAntimatter.java @@ -1,25 +1,26 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.potion; import com.shinoow.abyssalcraft.AbyssalCraft; +import com.shinoow.abyssalcraft.api.AbyssalCraftAPI; +import com.shinoow.abyssalcraft.api.entity.IAntiEntity; import com.shinoow.abyssalcraft.common.entity.*; import com.shinoow.abyssalcraft.common.entity.anti.*; -import com.shinoow.abyssalcraft.core.api.damagesource.ACDamageSource; -import com.shinoow.abyssalcraft.core.api.entity.IAntiEntity; import net.minecraft.client.Minecraft; import net.minecraft.entity.*; @@ -44,7 +45,7 @@ public Potion setIconIndex(int par1, int par2) { @Override public void performEffect(EntityLivingBase par1EntityLivingBase, int par2){ - par1EntityLivingBase.attackEntityFrom(ACDamageSource.antimatter, 5); + par1EntityLivingBase.attackEntityFrom(AbyssalCraftAPI.antimatter, 5); if(par1EntityLivingBase instanceof IAntiEntity){ par1EntityLivingBase.removePotionEffect(AbyssalCraft.antiMatter.id); par1EntityLivingBase.heal(5); diff --git a/src/main/java/com/shinoow/abyssalcraft/common/potion/PotionCplague.java b/src/main/java/com/shinoow/abyssalcraft/common/potion/PotionCplague.java index 903b8b0be..21cb6fe86 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/potion/PotionCplague.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/potion/PotionCplague.java @@ -1,24 +1,25 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.potion; import com.shinoow.abyssalcraft.AbyssalCraft; +import com.shinoow.abyssalcraft.api.AbyssalCraftAPI; +import com.shinoow.abyssalcraft.api.entity.ICoraliumEntity; import com.shinoow.abyssalcraft.common.entity.*; -import com.shinoow.abyssalcraft.core.api.damagesource.ACDamageSource; -import com.shinoow.abyssalcraft.core.api.entity.ICoraliumEntity; import net.minecraft.client.Minecraft; import net.minecraft.entity.*; @@ -43,7 +44,7 @@ public Potion setIconIndex(int par1, int par2) { @Override public void performEffect(EntityLivingBase par1EntityLivingBase, int par2){ - par1EntityLivingBase.attackEntityFrom(ACDamageSource.coralium, 2); + par1EntityLivingBase.attackEntityFrom(AbyssalCraftAPI.coralium, 2); if(par1EntityLivingBase instanceof ICoraliumEntity){ par1EntityLivingBase.removePotionEffect(AbyssalCraft.Cplague.id); par1EntityLivingBase.heal(2); diff --git a/src/main/java/com/shinoow/abyssalcraft/common/potion/PotionDplague.java b/src/main/java/com/shinoow/abyssalcraft/common/potion/PotionDplague.java index 9059a5338..cc7bfb46c 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/potion/PotionDplague.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/potion/PotionDplague.java @@ -1,23 +1,24 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.potion; import com.shinoow.abyssalcraft.AbyssalCraft; -import com.shinoow.abyssalcraft.core.api.damagesource.ACDamageSource; -import com.shinoow.abyssalcraft.core.api.entity.IDreadEntity; +import com.shinoow.abyssalcraft.api.AbyssalCraftAPI; +import com.shinoow.abyssalcraft.api.entity.IDreadEntity; import net.minecraft.client.Minecraft; import net.minecraft.entity.EntityLivingBase; @@ -41,7 +42,7 @@ public Potion setIconIndex(int par1, int par2) { @Override public void performEffect(EntityLivingBase par1EntityLivingBase, int par2){ - par1EntityLivingBase.attackEntityFrom(ACDamageSource.dread, 1); + par1EntityLivingBase.attackEntityFrom(AbyssalCraftAPI.dread, 1); if(par1EntityLivingBase instanceof IDreadEntity){ par1EntityLivingBase.removePotionEffect(AbyssalCraft.Dplague.id); par1EntityLivingBase.heal(1); diff --git a/src/main/java/com/shinoow/abyssalcraft/common/structures/abyss/Abypillar.java b/src/main/java/com/shinoow/abyssalcraft/common/structures/abyss/Abypillar.java index e1caed591..3cc3bd70a 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/structures/abyss/Abypillar.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/structures/abyss/Abypillar.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.structures.abyss; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/structures/abyss/stronghold/MapGenAbyStronghold.java b/src/main/java/com/shinoow/abyssalcraft/common/structures/abyss/stronghold/MapGenAbyStronghold.java index 6b9d2116d..12c651d22 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/structures/abyss/stronghold/MapGenAbyStronghold.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/structures/abyss/stronghold/MapGenAbyStronghold.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.structures.abyss.stronghold; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/structures/abyss/stronghold/StructureAbyStrongholdPieces.java b/src/main/java/com/shinoow/abyssalcraft/common/structures/abyss/stronghold/StructureAbyStrongholdPieces.java index aefeeaef0..5e2ec3a93 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/structures/abyss/stronghold/StructureAbyStrongholdPieces.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/structures/abyss/stronghold/StructureAbyStrongholdPieces.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.structures.abyss.stronghold; @@ -596,7 +597,7 @@ public static class ChestCorridor extends StructureAbyStrongholdPieces.Stronghol /** * List of items that Stronghold chests can contain. */ - public static final WeightedRandomChestContent[] strongholdChestContents = new WeightedRandomChestContent[] {new WeightedRandomChestContent(Items.ender_pearl, 0, 1, 4, 10), new WeightedRandomChestContent(AbyssalCraft.Corb, 0, 1, 3, 3), new WeightedRandomChestContent(AbyssalCraft.abyingot, 0, 1, 5, 10), new WeightedRandomChestContent(AbyssalCraft.Cingot, 0, 1, 3, 5), new WeightedRandomChestContent(AbyssalCraft.Cpearl, 0, 1, 3, 5), new WeightedRandomChestContent(Items.bread, 0, 1, 3, 15), new WeightedRandomChestContent(Items.golden_apple, 0, 1, 3, 15), new WeightedRandomChestContent(AbyssalCraft.pickaxeA, 0, 1, 1, 5), new WeightedRandomChestContent(AbyssalCraft.pickaxeA, 0, 1, 1, 5), new WeightedRandomChestContent(AbyssalCraft.plate, 0, 1, 1, 5), new WeightedRandomChestContent(AbyssalCraft.helmet, 0, 1, 1, 5), new WeightedRandomChestContent(AbyssalCraft.legs, 0, 1, 1, 5), new WeightedRandomChestContent(AbyssalCraft.boots, 0, 1, 1, 5), new WeightedRandomChestContent(AbyssalCraft.OC, 0, 1, 1, 1), new WeightedRandomChestContent(new ItemStack(AbyssalCraft.crystalZinc), 1, 5, 8)}; + public static final WeightedRandomChestContent[] strongholdChestContents = new WeightedRandomChestContent[] {new WeightedRandomChestContent(Items.ender_pearl, 0, 1, 4, 10), new WeightedRandomChestContent(AbyssalCraft.Corb, 0, 1, 1, 3), new WeightedRandomChestContent(AbyssalCraft.abyingot, 0, 1, 5, 10), new WeightedRandomChestContent(AbyssalCraft.Cingot, 0, 1, 3, 5), new WeightedRandomChestContent(AbyssalCraft.Cpearl, 0, 1, 3, 5), new WeightedRandomChestContent(Items.bread, 0, 1, 3, 15), new WeightedRandomChestContent(Items.golden_apple, 0, 1, 3, 15), new WeightedRandomChestContent(AbyssalCraft.pickaxeA, 0, 1, 1, 5), new WeightedRandomChestContent(AbyssalCraft.pickaxeA, 0, 1, 1, 5), new WeightedRandomChestContent(AbyssalCraft.plate, 0, 1, 1, 5), new WeightedRandomChestContent(AbyssalCraft.helmet, 0, 1, 1, 5), new WeightedRandomChestContent(AbyssalCraft.legs, 0, 1, 1, 5), new WeightedRandomChestContent(AbyssalCraft.boots, 0, 1, 1, 5), new WeightedRandomChestContent(AbyssalCraft.OC, 0, 1, 1, 1), new WeightedRandomChestContent(new ItemStack(AbyssalCraft.crystalZinc), 1, 5, 8)}; private boolean hasMadeChest; public ChestCorridor() {} diff --git a/src/main/java/com/shinoow/abyssalcraft/common/structures/dreadlands/chagarothlair.java b/src/main/java/com/shinoow/abyssalcraft/common/structures/dreadlands/chagarothlair.java index 92f628fd5..0922b2741 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/structures/dreadlands/chagarothlair.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/structures/dreadlands/chagarothlair.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.structures.dreadlands; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/structures/dreadlands/mineshaft/MapGenDreadlandsMine.java b/src/main/java/com/shinoow/abyssalcraft/common/structures/dreadlands/mineshaft/MapGenDreadlandsMine.java index 312834444..937a3def6 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/structures/dreadlands/mineshaft/MapGenDreadlandsMine.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/structures/dreadlands/mineshaft/MapGenDreadlandsMine.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.structures.dreadlands.mineshaft; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/structures/dreadlands/mineshaft/StructureDreadlandsMinePieces.java b/src/main/java/com/shinoow/abyssalcraft/common/structures/dreadlands/mineshaft/StructureDreadlandsMinePieces.java index b663ef688..cc2cf897e 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/structures/dreadlands/mineshaft/StructureDreadlandsMinePieces.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/structures/dreadlands/mineshaft/StructureDreadlandsMinePieces.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.structures.dreadlands.mineshaft; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/structures/dreadlands/mineshaft/StructureDreadlandsMineStart.java b/src/main/java/com/shinoow/abyssalcraft/common/structures/dreadlands/mineshaft/StructureDreadlandsMineStart.java index f0c4348c0..a379cd0a8 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/structures/dreadlands/mineshaft/StructureDreadlandsMineStart.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/structures/dreadlands/mineshaft/StructureDreadlandsMineStart.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.structures.dreadlands.mineshaft; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/structures/overworld/AChouse1.java b/src/main/java/com/shinoow/abyssalcraft/common/structures/overworld/AChouse1.java index 88b80e58e..7cc4f6441 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/structures/overworld/AChouse1.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/structures/overworld/AChouse1.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.structures.overworld; import java.util.Random; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/structures/overworld/AChouse2.java b/src/main/java/com/shinoow/abyssalcraft/common/structures/overworld/AChouse2.java index ef662befb..160bf6b38 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/structures/overworld/AChouse2.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/structures/overworld/AChouse2.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.structures.overworld; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/structures/overworld/ACplatform1.java b/src/main/java/com/shinoow/abyssalcraft/common/structures/overworld/ACplatform1.java index 8e2b93be5..2590eb6eb 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/structures/overworld/ACplatform1.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/structures/overworld/ACplatform1.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.structures.overworld; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/structures/overworld/ACplatform2.java b/src/main/java/com/shinoow/abyssalcraft/common/structures/overworld/ACplatform2.java index 7576280b2..67b47bab3 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/structures/overworld/ACplatform2.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/structures/overworld/ACplatform2.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.structures.overworld; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/structures/overworld/ACscion1.java b/src/main/java/com/shinoow/abyssalcraft/common/structures/overworld/ACscion1.java index 8073428d9..ead801985 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/structures/overworld/ACscion1.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/structures/overworld/ACscion1.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.structures.overworld; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/structures/overworld/ACscion2.java b/src/main/java/com/shinoow/abyssalcraft/common/structures/overworld/ACscion2.java index 56dcbc9be..20c9c7d0b 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/structures/overworld/ACscion2.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/structures/overworld/ACscion2.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.structures.overworld; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/util/ACLogger.java b/src/main/java/com/shinoow/abyssalcraft/common/util/ACLogger.java index 470e8b0fe..fe87b57c7 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/util/ACLogger.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/util/ACLogger.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.util; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/util/EnumToolMaterialAC.java b/src/main/java/com/shinoow/abyssalcraft/common/util/EnumToolMaterialAC.java index 00fc213f7..4ad75c76d 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/util/EnumToolMaterialAC.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/util/EnumToolMaterialAC.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.util; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/util/ExplosionUtil.java b/src/main/java/com/shinoow/abyssalcraft/common/util/ExplosionUtil.java index 32b81c469..d96541bfa 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/util/ExplosionUtil.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/util/ExplosionUtil.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.util; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/util/RandomFiltered.java b/src/main/java/com/shinoow/abyssalcraft/common/util/RandomFiltered.java new file mode 100644 index 000000000..bee9abee9 --- /dev/null +++ b/src/main/java/com/shinoow/abyssalcraft/common/util/RandomFiltered.java @@ -0,0 +1,40 @@ +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.shinoow.abyssalcraft.common.util; + +import java.util.Random; + +public class RandomFiltered extends Random { + + private static final long serialVersionUID = 1L; + + public RandomFiltered(long par2) { + super(par2); + } + + @Override + public int nextInt() { + return this.nextInt(1); + } + + @Override + public int nextInt(int n) { + if (n > 0) + return super.nextInt(n); + return 0; + } +} \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/core/util/SalvageHandler.java b/src/main/java/com/shinoow/abyssalcraft/common/util/SalvageHandler.java similarity index 82% rename from src/main/java/com/shinoow/abyssalcraft/core/util/SalvageHandler.java rename to src/main/java/com/shinoow/abyssalcraft/common/util/SalvageHandler.java index 732c28876..eec03360b 100644 --- a/src/main/java/com/shinoow/abyssalcraft/core/util/SalvageHandler.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/util/SalvageHandler.java @@ -1,19 +1,20 @@ -/**AbyssalCraft Core - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ -package com.shinoow.abyssalcraft.core.util; +package com.shinoow.abyssalcraft.common.util; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/util/SpecialTextUtil.java b/src/main/java/com/shinoow/abyssalcraft/common/util/SpecialTextUtil.java index 5d23f23c5..5bb8401eb 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/util/SpecialTextUtil.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/util/SpecialTextUtil.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.util; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/world/ACExplosion.java b/src/main/java/com/shinoow/abyssalcraft/common/world/ACExplosion.java index 8db748821..4a4430bee 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/world/ACExplosion.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/world/ACExplosion.java @@ -1,3 +1,19 @@ +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.shinoow.abyssalcraft.common.world; import java.util.ArrayList; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/world/AbyssalCraftWorldGenerator.java b/src/main/java/com/shinoow/abyssalcraft/common/world/AbyssalCraftWorldGenerator.java index 649049603..d237ff0db 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/world/AbyssalCraftWorldGenerator.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/world/AbyssalCraftWorldGenerator.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.world; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/world/ChunkProviderAbyss.java b/src/main/java/com/shinoow/abyssalcraft/common/world/ChunkProviderAbyss.java index 1b1f9c9bf..dcb0c064c 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/world/ChunkProviderAbyss.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/world/ChunkProviderAbyss.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.world; @@ -111,11 +112,11 @@ public ChunkProviderAbyss(World par1World, long par2, boolean par4) mobSpawnerNoise = (NoiseGeneratorOctaves)noiseGens[6]; } - public void generateTerrain(int par1, int par2, Block[] par3BlockArray) + public void generateTerrain(int x, int z, Block[] par3BlockArray) { byte b0 = 63; - biomesForGeneration = worldObj.getWorldChunkManager().getBiomesForGeneration(biomesForGeneration, par1 * 4 - 2, par2 * 4 - 2, 10, 10); - generateNoise(par1 * 4, 0, par2 * 4); + biomesForGeneration = worldObj.getWorldChunkManager().getBiomesForGeneration(biomesForGeneration, x * 4 - 2, z * 4 - 2, 10, 10); + generateNoise(x * 4, 0, z * 4); for (int k = 0; k < 4; ++k) { @@ -180,20 +181,20 @@ else if (k2 * 8 + l2 < b0) } } - public void replaceBlocksForBiome(int par1, int par2, Block[] par3BlockArray, byte[] par4ByteArray, BiomeGenBase[] par5BiomeArray) + public void replaceBlocksForBiome(int x, int z, Block[] par3BlockArray, byte[] par4ByteArray, BiomeGenBase[] par5BiomeArray) { - ChunkProviderEvent.ReplaceBiomeBlocks event = new ChunkProviderEvent.ReplaceBiomeBlocks(this, par1, par2, par3BlockArray, par5BiomeArray); + ChunkProviderEvent.ReplaceBiomeBlocks event = new ChunkProviderEvent.ReplaceBiomeBlocks(this, x, z, par3BlockArray, par5BiomeArray); MinecraftForge.EVENT_BUS.post(event); if (event.getResult() == Result.DENY) return; double d0 = 0.03125D; - stoneNoise = noiseGen4.func_151599_a(stoneNoise, par1 * 16, par2 * 16, 16, 16, d0 * 2.0D, d0 * 2.0D, 1.0D); + stoneNoise = noiseGen4.func_151599_a(stoneNoise, x * 16, z * 16, 16, 16, d0 * 2.0D, d0 * 2.0D, 1.0D); for (int k = 0; k < 16; ++k) for (int l = 0; l < 16; ++l) { BiomeGenBase biomegenbase = par5BiomeArray[l + k * 16]; - biomegenbase.genTerrainBlocks(worldObj, rand, par3BlockArray, par4ByteArray, par1 * 16 + k, par2 * 16 + l, stoneNoise[l + k * 16]); + biomegenbase.genTerrainBlocks(worldObj, rand, par3BlockArray, par4ByteArray, x * 16 + k, z * 16 + l, stoneNoise[l + k * 16]); } } @@ -201,9 +202,9 @@ public void replaceBlocksForBiome(int par1, int par2, Block[] par3BlockArray, by * loads or generates the chunk at the chunk location specified */ @Override - public Chunk loadChunk(int par1, int par2) + public Chunk loadChunk(int x, int z) { - return provideChunk(par1, par2); + return provideChunk(x, z); } /** @@ -211,24 +212,24 @@ public Chunk loadChunk(int par1, int par2) * specified chunk from the map seed and chunk seed */ @Override - public Chunk provideChunk(int par1, int par2) + public Chunk provideChunk(int x, int z) { - rand.setSeed(par1 * 341873128712L + par2 * 132897987541L); + rand.setSeed(x * 341873128712L + z * 132897987541L); Block[] ablock = new Block[65536]; byte[] abyte = new byte[65536]; - generateTerrain(par1, par2, ablock); - biomesForGeneration = worldObj.getWorldChunkManager().loadBlockGeneratorData(biomesForGeneration, par1 * 16, par2 * 16, 16, 16); - replaceBlocksForBiome(par1, par2, ablock, abyte, biomesForGeneration); - caveGenerator.func_151539_a(this, worldObj, par1, par2, ablock); - ravineGenerator.func_151539_a(this, worldObj, par1, par2, ablock); + generateTerrain(x, z, ablock); + biomesForGeneration = worldObj.getWorldChunkManager().loadBlockGeneratorData(biomesForGeneration, x * 16, z * 16, 16, 16); + replaceBlocksForBiome(x, z, ablock, abyte, biomesForGeneration); + caveGenerator.func_151539_a(this, worldObj, x, z, ablock); + ravineGenerator.func_151539_a(this, worldObj, x, z, ablock); if (mapFeaturesEnabled) { - strongholdGenerator.func_151539_a(this, worldObj, par1, par2, ablock); - scatteredFeatureGenerator.func_151539_a(this, worldObj, par1, par2, ablock); + strongholdGenerator.func_151539_a(this, worldObj, x, z, ablock); + scatteredFeatureGenerator.func_151539_a(this, worldObj, x, z, ablock); } - Chunk chunk = new Chunk(worldObj, ablock, abyte, par1, par2); + Chunk chunk = new Chunk(worldObj, ablock, abyte, x, z); byte[] abyte1 = chunk.getBiomeArray(); for (int k = 0; k < abyte1.length; ++k) @@ -238,12 +239,12 @@ public Chunk provideChunk(int par1, int par2) return chunk; } - private void generateNoise(int par1, int par2, int par3) + private void generateNoise(int x, int y, int z) { - doubleArray4 = noiseGen6.generateNoiseOctaves(doubleArray4, par1, par3, 5, 5, 200.0D, 200.0D, 0.5D); - doubleArray1 = noiseGen3.generateNoiseOctaves(doubleArray1, par1, par2, par3, 5, 33, 5, 8.555150000000001D, 4.277575000000001D, 8.555150000000001D); - doubleArray2 = noiseGen1.generateNoiseOctaves(doubleArray2, par1, par2, par3, 5, 33, 5, 684.412D, 684.412D, 684.412D); - doubleArray3 = noiseGen2.generateNoiseOctaves(doubleArray3, par1, par2, par3, 5, 33, 5, 684.412D, 684.412D, 684.412D); + doubleArray4 = noiseGen6.generateNoiseOctaves(doubleArray4, x, z, 5, 5, 200.0D, 200.0D, 0.5D); + doubleArray1 = noiseGen3.generateNoiseOctaves(doubleArray1, x, y, z, 5, 33, 5, 8.555150000000001D, 4.277575000000001D, 8.555150000000001D); + doubleArray2 = noiseGen1.generateNoiseOctaves(doubleArray2, x, y, z, 5, 33, 5, 684.412D, 684.412D, 684.412D); + doubleArray3 = noiseGen2.generateNoiseOctaves(doubleArray3, x, y, z, 5, 33, 5, 684.412D, 684.412D, 684.412D); int l = 0; int i1 = 0; for (int j1 = 0; j1 < 5; ++j1) @@ -342,7 +343,7 @@ private void generateNoise(int par1, int par2, int par3) * Checks to see if a chunk exists at x, y */ @Override - public boolean chunkExists(int par1, int par2) + public boolean chunkExists(int x, int z) { return true; } @@ -351,31 +352,31 @@ public boolean chunkExists(int par1, int par2) * Populates chunk with ores etc etc */ @Override - public void populate(IChunkProvider par1IChunkProvider, int par2, int par3) + public void populate(IChunkProvider par1IChunkProvider, int x, int z) { BlockFalling.fallInstantly = true; - int k = par2 * 16; - int l = par3 * 16; + int k = x * 16; + int l = z * 16; BiomeGenBase biomegenbase = worldObj.getBiomeGenForCoords(k + 16, l + 16); rand.setSeed(worldObj.getSeed()); long i1 = rand.nextLong() / 2L * 2L + 1L; long j1 = rand.nextLong() / 2L * 2L + 1L; - rand.setSeed(par2 * i1 + par3 * j1 ^ worldObj.getSeed()); + rand.setSeed(x * i1 + z * j1 ^ worldObj.getSeed()); boolean flag = false; - MinecraftForge.EVENT_BUS.post(new PopulateChunkEvent.Pre(par1IChunkProvider, worldObj, rand, par2, par3, flag)); + MinecraftForge.EVENT_BUS.post(new PopulateChunkEvent.Pre(par1IChunkProvider, worldObj, rand, x, z, flag)); if (mapFeaturesEnabled) { - strongholdGenerator.generateStructuresInChunk(worldObj, rand, par2, par3); - scatteredFeatureGenerator.generateStructuresInChunk(worldObj, rand, par2, par3); + strongholdGenerator.generateStructuresInChunk(worldObj, rand, x, z); + scatteredFeatureGenerator.generateStructuresInChunk(worldObj, rand, x, z); } int k1; int l1; int i2; - if (TerrainGen.populate(par1IChunkProvider, worldObj, rand, par2, par3, flag, LAKE) && + if (TerrainGen.populate(par1IChunkProvider, worldObj, rand, x, z, flag, LAKE) && !flag && rand.nextInt(4) == 0) { k1 = k + rand.nextInt(16) + 8; @@ -384,17 +385,17 @@ public void populate(IChunkProvider par1IChunkProvider, int par2, int par3) new WorldGenAbyLake(AbyssalCraft.Cwater).generate(worldObj, rand, k1, l1, i2); } + for(int i = 0; i < 5; i++) { + int Xcoord1 = k + rand.nextInt(16); + int Ycoord1 = rand.nextInt(80); + int Zcoord1 = l + rand.nextInt(16); - int Xcoord1 = k + rand.nextInt(16); - int Ycoord1 = rand.nextInt(66); - int Zcoord1 = l + rand.nextInt(16); - - new Abypillar().generate(worldObj, rand, Xcoord1, Ycoord1, Zcoord1); + new Abypillar().generate(worldObj, rand, Xcoord1, Ycoord1, Zcoord1); + } biomegenbase.decorate(worldObj, rand, k, l); - - MinecraftForge.EVENT_BUS.post(new PopulateChunkEvent.Post(par1IChunkProvider, worldObj, rand, par2, par3, flag)); + MinecraftForge.EVENT_BUS.post(new PopulateChunkEvent.Post(par1IChunkProvider, worldObj, rand, x, z, flag)); BlockFalling.fallInstantly = false; } @@ -448,16 +449,16 @@ public String makeString() */ @Override @SuppressWarnings("rawtypes") - public List getPossibleCreatures(EnumCreatureType par1EnumCreatureType, int par2, int par3, int par4) + public List getPossibleCreatures(EnumCreatureType par1EnumCreatureType, int x, int y, int z) { - BiomeGenBase var5 = worldObj.getBiomeGenForCoords(par2, par4); - return var5 == null ? null : var5 == AbyssalCraft.Wastelands && par1EnumCreatureType == EnumCreatureType.monster && scatteredFeatureGenerator.hasStructureAt(par2, par3, par4) ? scatteredFeatureGenerator.getScatteredFeatureSpawnList() : var5.getSpawnableList(par1EnumCreatureType); + BiomeGenBase biome = worldObj.getBiomeGenForCoords(x, z); + return biome == null ? null : biome == AbyssalCraft.Wastelands && par1EnumCreatureType == EnumCreatureType.monster && scatteredFeatureGenerator.hasStructureAt(x, y, z) ? scatteredFeatureGenerator.getScatteredFeatureSpawnList() : biome.getSpawnableList(par1EnumCreatureType); } @Override - public ChunkPosition func_147416_a(World par1World, String par2String, int par3, int par4, int par5) + public ChunkPosition func_147416_a(World par1World, String par2String, int x, int y, int z) { - return "AbyStronghold".equals(par2String) && strongholdGenerator != null ? strongholdGenerator.func_151545_a(par1World, par3, par4, par5) : null; + return "AbyStronghold".equals(par2String) && strongholdGenerator != null ? strongholdGenerator.func_151545_a(par1World, x, y, z) : null; } @Override @@ -467,13 +468,13 @@ public int getLoadedChunkCount() } @Override - public void recreateStructures(int par1, int par2) + public void recreateStructures(int x, int z) { if (mapFeaturesEnabled) { - strongholdGenerator.func_151539_a(this, worldObj, par1, par2, (Block[])null); - scatteredFeatureGenerator.func_151539_a(this, worldObj, par1, par2, (Block[])null); + strongholdGenerator.func_151539_a(this, worldObj, x, z, (Block[])null); + scatteredFeatureGenerator.func_151539_a(this, worldObj, x, z, (Block[])null); } } } \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/common/world/ChunkProviderDarkRealm.java b/src/main/java/com/shinoow/abyssalcraft/common/world/ChunkProviderDarkRealm.java index fbbd7ed05..5518ffe78 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/world/ChunkProviderDarkRealm.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/world/ChunkProviderDarkRealm.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.world; @@ -46,14 +47,10 @@ public class ChunkProviderDarkRealm implements IChunkProvider /** Reference to the World object. */ private World worldObj; - private final boolean mapFeaturesEnabled; private WorldType worldType; private final double[] field_147434_q; private final float[] parabolicField; private double[] stoneNoise = new double[256]; - // private MapGenBase caveGenerator = new MapGenCaves(); - // private MapGenScatteredFeature scatteredFeatureGenerator = new MapGenScatteredFeature(); - // private MapGenBase ravineGenerator = new MapGenRavine(); private BiomeGenBase[] biomesForGeneration; double[] doubleArray1; @@ -61,16 +58,10 @@ public class ChunkProviderDarkRealm implements IChunkProvider double[] doubleArray3; double[] doubleArray4; int[][] field_73219_j = new int[32][32]; - { - // caveGenerator = TerrainGen.getModdedMapGen(caveGenerator, CAVE); - // scatteredFeatureGenerator = (MapGenScatteredFeature) TerrainGen.getModdedMapGen(scatteredFeatureGenerator, SCATTERED_FEATURE); - // ravineGenerator = TerrainGen.getModdedMapGen(ravineGenerator, RAVINE); - } public ChunkProviderDarkRealm(World par1World, long par2, boolean par4) { worldObj = par1World; - mapFeaturesEnabled = par4; worldType = par1World.getWorldInfo().getTerrainType(); rand = new Random(par2); noiseGen1 = new NoiseGeneratorOctaves(rand, 16); @@ -101,11 +92,11 @@ public ChunkProviderDarkRealm(World par1World, long par2, boolean par4) mobSpawnerNoise = (NoiseGeneratorOctaves)noiseGens[6]; } - public void generateTerrain(int par1, int par2, Block[] par3BlockArray) + public void generateTerrain(int x, int z, Block[] par3BlockArray) { byte b0 = 63; - biomesForGeneration = worldObj.getWorldChunkManager().getBiomesForGeneration(biomesForGeneration, par1 * 4 - 2, par2 * 4 - 2, 10, 10); - generateNoise(par1 * 4, 0, par2 * 4); + biomesForGeneration = worldObj.getWorldChunkManager().getBiomesForGeneration(biomesForGeneration, x * 4 - 2, z * 4 - 2, 10, 10); + generateNoise(x * 4, 0, z * 4); for (int k = 0; k < 4; ++k) { @@ -170,54 +161,40 @@ else if (k2 * 8 + l2 < b0) } } - public void replaceBlocksForBiome(int par1, int par2, Block[] par3BlockArray, byte[] par4ByteArray, BiomeGenBase[] par5BiomeArray) + public void replaceBlocksForBiome(int x, int z, Block[] par3BlockArray, byte[] par4ByteArray, BiomeGenBase[] par5BiomeArray) { - ChunkProviderEvent.ReplaceBiomeBlocks event = new ChunkProviderEvent.ReplaceBiomeBlocks(this, par1, par2, par3BlockArray, par5BiomeArray); + ChunkProviderEvent.ReplaceBiomeBlocks event = new ChunkProviderEvent.ReplaceBiomeBlocks(this, x, z, par3BlockArray, par5BiomeArray); MinecraftForge.EVENT_BUS.post(event); if (event.getResult() == Result.DENY) return; double d0 = 0.03125D; - stoneNoise = noiseGen4.func_151599_a(stoneNoise, par1 * 16, par2 * 16, 16, 16, d0 * 2.0D, d0 * 2.0D, 1.0D); + stoneNoise = noiseGen4.func_151599_a(stoneNoise, x * 16, z * 16, 16, 16, d0 * 2.0D, d0 * 2.0D, 1.0D); for (int k = 0; k < 16; ++k) for (int l = 0; l < 16; ++l) { BiomeGenBase biomegenbase = par5BiomeArray[l + k * 16]; - biomegenbase.genTerrainBlocks(worldObj, rand, par3BlockArray, par4ByteArray, par1 * 16 + k, par2 * 16 + l, stoneNoise[l + k * 16]); + biomegenbase.genTerrainBlocks(worldObj, rand, par3BlockArray, par4ByteArray, x * 16 + k, z * 16 + l, stoneNoise[l + k * 16]); } } - /** - * loads or generates the chunk at the chunk location specified - */ @Override - public Chunk loadChunk(int par1, int par2) + public Chunk loadChunk(int x, int z) { - return provideChunk(par1, par2); + return provideChunk(x, z); } - /** - * Will return back a chunk, if it doesn't exist and its not a MP client it will generates all the blocks for the - * specified chunk from the map seed and chunk seed - */ @Override - public Chunk provideChunk(int par1, int par2) + public Chunk provideChunk(int x, int z) { - rand.setSeed(par1 * 341873128712L + par2 * 132897987541L); + rand.setSeed(x * 341873128712L + z * 132897987541L); Block[] ablock = new Block[65536]; byte[] abyte = new byte[65536]; - generateTerrain(par1, par2, ablock); - biomesForGeneration = worldObj.getWorldChunkManager().loadBlockGeneratorData(biomesForGeneration, par1 * 16, par2 * 16, 16, 16); - replaceBlocksForBiome(par1, par2, ablock, abyte, biomesForGeneration); - // caveGenerator.func_151539_a(this, worldObj, par1, par2, ablock); - // ravineGenerator.func_151539_a(this, worldObj, par1, par2, ablock); + generateTerrain(x, z, ablock); + biomesForGeneration = worldObj.getWorldChunkManager().loadBlockGeneratorData(biomesForGeneration, x * 16, z * 16, 16, 16); + replaceBlocksForBiome(x, z, ablock, abyte, biomesForGeneration); - if (mapFeaturesEnabled) - { - // scatteredFeatureGenerator.func_151539_a(this, worldObj, par1, par2, ablock); - } - - Chunk chunk = new Chunk(worldObj, ablock, abyte, par1, par2); + Chunk chunk = new Chunk(worldObj, ablock, abyte, x, z); byte[] abyte1 = chunk.getBiomeArray(); for (int k = 0; k < abyte1.length; ++k) @@ -227,12 +204,12 @@ public Chunk provideChunk(int par1, int par2) return chunk; } - private void generateNoise(int par1, int par2, int par3) + private void generateNoise(int x, int y, int z) { - doubleArray4 = noiseGen6.generateNoiseOctaves(doubleArray4, par1, par3, 5, 5, 200.0D, 200.0D, 0.5D); - doubleArray1 = noiseGen3.generateNoiseOctaves(doubleArray1, par1, par2, par3, 5, 33, 5, 8.555150000000001D, 4.277575000000001D, 8.555150000000001D); - doubleArray2 = noiseGen1.generateNoiseOctaves(doubleArray2, par1, par2, par3, 5, 33, 5, 684.412D, 684.412D, 684.412D); - doubleArray3 = noiseGen2.generateNoiseOctaves(doubleArray3, par1, par2, par3, 5, 33, 5, 684.412D, 684.412D, 684.412D); + doubleArray4 = noiseGen6.generateNoiseOctaves(doubleArray4, x, z, 5, 5, 200.0D, 200.0D, 0.5D); + doubleArray1 = noiseGen3.generateNoiseOctaves(doubleArray1, x, y, z, 5, 33, 5, 8.555150000000001D, 4.277575000000001D, 8.555150000000001D); + doubleArray2 = noiseGen1.generateNoiseOctaves(doubleArray2, x, y, z, 5, 33, 5, 684.412D, 684.412D, 684.412D); + doubleArray3 = noiseGen2.generateNoiseOctaves(doubleArray3, x, y, z, 5, 33, 5, 684.412D, 684.412D, 684.412D); int l = 0; int i1 = 0; for (int j1 = 0; j1 < 5; ++j1) @@ -327,104 +304,71 @@ private void generateNoise(int par1, int par2, int par3) } } - /** - * Checks to see if a chunk exists at x, y - */ @Override - public boolean chunkExists(int par1, int par2) + public boolean chunkExists(int x, int z) { return true; } - /** - * Populates chunk with ores etc etc - */ @Override - public void populate(IChunkProvider par1IChunkProvider, int par2, int par3) + public void populate(IChunkProvider par1IChunkProvider, int x, int z) { BlockFalling.fallInstantly = true; - int k = par2 * 16; - int l = par3 * 16; + int k = x * 16; + int l = z * 16; BiomeGenBase biomegenbase = worldObj.getBiomeGenForCoords(k + 16, l + 16); rand.setSeed(worldObj.getSeed()); long i1 = rand.nextLong() / 2L * 2L + 1L; long j1 = rand.nextLong() / 2L * 2L + 1L; - rand.setSeed(par2 * i1 + par3 * j1 ^ worldObj.getSeed()); + rand.setSeed(x * i1 + z * j1 ^ worldObj.getSeed()); boolean flag = false; - MinecraftForge.EVENT_BUS.post(new PopulateChunkEvent.Pre(par1IChunkProvider, worldObj, rand, par2, par3, flag)); - - if (mapFeaturesEnabled) - { - // scatteredFeatureGenerator.generateStructuresInChunk(worldObj, rand, par2, par3); - } + MinecraftForge.EVENT_BUS.post(new PopulateChunkEvent.Pre(par1IChunkProvider, worldObj, rand, x, z, flag)); biomegenbase.decorate(worldObj, rand, k, l); - - MinecraftForge.EVENT_BUS.post(new PopulateChunkEvent.Post(par1IChunkProvider, worldObj, rand, par2, par3, flag)); + MinecraftForge.EVENT_BUS.post(new PopulateChunkEvent.Post(par1IChunkProvider, worldObj, rand, x, z, flag)); BlockFalling.fallInstantly = false; } - /** - * Two modes of operation: if passed true, save all Chunks in one go. If passed false, save up to two chunks. - * Return true if all chunks have been saved. - */ @Override public boolean saveChunks(boolean par1, IProgressUpdate par2IProgressUpdate) { return true; } - /** - * Save extra data not associated with any Chunk. Not saved during autosave, only during world unload. Currently - * unimplemented. - */ @Override public void saveExtraData() {} - /** - * Unloads chunks that are marked to be unloaded. This is not guaranteed to unload every such chunk. - */ @Override public boolean unloadQueuedChunks() { return false; } - /** - * Returns if the IChunkProvider supports saving. - */ @Override public boolean canSave() { return true; } - /** - * Converts the instance data to a readable string. - */ @Override public String makeString() { return "RandomLevelSource"; } - /** - * Returns a list of creatures of the specified type that can spawn at the given location. - */ @Override @SuppressWarnings("rawtypes") - public List getPossibleCreatures(EnumCreatureType par1EnumCreatureType, int par2, int par3, int par4) + public List getPossibleCreatures(EnumCreatureType par1EnumCreatureType, int x, int y, int z) { - BiomeGenBase var5 = worldObj.getBiomeGenForCoords(par2, par4); - return var5 == null ? null : var5.getSpawnableList(par1EnumCreatureType); - // return var5 == null ? null : var5 == AbyssalCraft.darkRealm && par1EnumCreatureType == EnumCreatureType.monster && scatteredFeatureGenerator.hasStructureAt(par2, par3, par4) ? scatteredFeatureGenerator.getScatteredFeatureSpawnList() : var5.getSpawnableList(par1EnumCreatureType); + BiomeGenBase biome = worldObj.getBiomeGenForCoords(x, z); + return biome == null ? null : biome.getSpawnableList(par1EnumCreatureType); } @Override - public ChunkPosition func_147416_a(World par1World, String par2String, int par3, int par4, int par5) + public ChunkPosition func_147416_a(World par1World, String par2String, int x, int y, int z) { return null; } @@ -436,12 +380,5 @@ public int getLoadedChunkCount() } @Override - public void recreateStructures(int par1, int par2) - { - if (mapFeaturesEnabled) - { - - // scatteredFeatureGenerator.func_151539_a(this, worldObj, par1, par2, (Block[])null); - } - } + public void recreateStructures(int x, int z){} } \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/common/world/ChunkProviderDreadlands.java b/src/main/java/com/shinoow/abyssalcraft/common/world/ChunkProviderDreadlands.java index 95ba7e0e3..a19eb7c1d 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/world/ChunkProviderDreadlands.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/world/ChunkProviderDreadlands.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.world; @@ -165,7 +166,7 @@ public void generateTerrain(int par1, int par2, Block[] par3BlockArray) if ((d15 += d16) > 0.0D) par3BlockArray[j3 += short1] = AbyssalCraft.dreadstone; else if (k2 * 8 + l2 < b0) - par3BlockArray[j3 += short1] = AbyssalCraft.dreadgrass; + par3BlockArray[j3 += short1] = AbyssalCraft.abydreadstone; else par3BlockArray[j3 += short1] = null; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/world/ChunkProviderOmothol.java b/src/main/java/com/shinoow/abyssalcraft/common/world/ChunkProviderOmothol.java index c1571cc37..996a84658 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/world/ChunkProviderOmothol.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/world/ChunkProviderOmothol.java @@ -1,24 +1,34 @@ +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.shinoow.abyssalcraft.common.world; -import java.util.List; -import java.util.Random; +import java.util.*; import com.shinoow.abyssalcraft.AbyssalCraft; -import net.minecraft.block.Block; -import net.minecraft.block.BlockFalling; +import net.minecraft.block.*; import net.minecraft.block.material.Material; import net.minecraft.entity.EnumCreatureType; -import net.minecraft.init.Blocks; import net.minecraft.util.IProgressUpdate; -import net.minecraft.util.MathHelper; import net.minecraft.world.ChunkPosition; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; -import net.minecraft.world.chunk.Chunk; -import net.minecraft.world.chunk.IChunkProvider; -import net.minecraft.world.gen.NoiseGenerator; -import net.minecraft.world.gen.NoiseGeneratorOctaves; +import net.minecraft.world.chunk.*; +import net.minecraft.world.gen.*; import net.minecraftforge.common.*; import cpw.mods.fml.common.eventhandler.Event.*; import net.minecraftforge.event.terraingen.*; @@ -26,20 +36,12 @@ public class ChunkProviderOmothol implements IChunkProvider { private Random rand; - private NoiseGeneratorOctaves noiseGen1; - private NoiseGeneratorOctaves noiseGen2; - private NoiseGeneratorOctaves noiseGen3; - public NoiseGeneratorOctaves noiseGen4; - public NoiseGeneratorOctaves noiseGen5; + private NoiseGeneratorOctaves noiseGen1, noiseGen2, noiseGen3, noiseGen4, noiseGen5; private World worldObj; private double[] densities; /** The biomes that are used to generate the chunk */ private BiomeGenBase[] biomesForGeneration; - double[] noiseData1; - double[] noiseData2; - double[] noiseData3; - double[] noiseData4; - double[] noiseData5; + double[] noiseData1, noiseData2, noiseData3, noiseData4, noiseData5; int[][] field_73203_h = new int[32][32]; public ChunkProviderOmothol(World par1World, long par2) @@ -61,13 +63,13 @@ public ChunkProviderOmothol(World par1World, long par2) noiseGen5 = (NoiseGeneratorOctaves)noiseGens[4]; } - public void generateTerrain(int par1, int par2, Block[] par3BlockArray, BiomeGenBase[] par4BiomeArray) + public void generateTerrain(int x, int z, Block[] par3BlockArray, BiomeGenBase[] par4BiomeArray) { byte b0 = 2; int k = b0 + 1; byte b1 = 33; int l = b0 + 1; - densities = initializeNoiseField(densities, par1 * b0, 0, par2 * b0, k, b1, l); + densities = initializeNoiseField(densities, x * b0, 0, z * b0, k, b1, l); for (int i1 = 0; i1 < b0; ++i1) for (int j1 = 0; j1 < b0; ++j1) @@ -123,9 +125,9 @@ public void generateTerrain(int par1, int par2, Block[] par3BlockArray, BiomeGen } } - public void replaceBlocksForBiome(int par1, int par2, Block[] par3BlockArray, BiomeGenBase[] par4BiomeArray) + public void replaceBlocksForBiome(int x, int z, Block[] par3BlockArray, BiomeGenBase[] par4BiomeArray) { - ChunkProviderEvent.ReplaceBiomeBlocks event = new ChunkProviderEvent.ReplaceBiomeBlocks(this, par1, par2, par3BlockArray, par4BiomeArray); + ChunkProviderEvent.ReplaceBiomeBlocks event = new ChunkProviderEvent.ReplaceBiomeBlocks(this, x, z, par3BlockArray, par4BiomeArray); MinecraftForge.EVENT_BUS.post(event); if (event.getResult() == Result.DENY) return; @@ -144,7 +146,7 @@ public void replaceBlocksForBiome(int par1, int par2, Block[] par3BlockArray, Bi if (block2 != null && block2.getMaterial() != Material.air) { - if (block2 == Blocks.stone) + if (block2 == AbyssalCraft.omotholstone) if (i1 == -1) { if (b0 <= 0) @@ -172,20 +174,20 @@ else if (i1 > 0) } @Override - public Chunk loadChunk(int par1, int par2) + public Chunk loadChunk(int x, int z) { - return provideChunk(par1, par2); + return provideChunk(x, z); } @Override - public Chunk provideChunk(int par1, int par2) + public Chunk provideChunk(int x, int z) { - rand.setSeed(par1 * 341873128712L + par2 * 132897987541L); + rand.setSeed(x * 341873128712L + z * 132897987541L); Block[] ablock = new Block[32768]; - biomesForGeneration = worldObj.getWorldChunkManager().loadBlockGeneratorData(biomesForGeneration, par1 * 16, par2 * 16, 16, 16); - generateTerrain(par1, par2, ablock, biomesForGeneration); - replaceBlocksForBiome(par1, par2, ablock, biomesForGeneration); - Chunk chunk = new Chunk(worldObj, ablock, par1, par2); + biomesForGeneration = worldObj.getWorldChunkManager().loadBlockGeneratorData(biomesForGeneration, x * 16, z * 16, 16, 16); + generateTerrain(x, z, ablock, biomesForGeneration); + replaceBlocksForBiome(x, z, ablock, biomesForGeneration); + Chunk chunk = new Chunk(worldObj, ablock, x, z); byte[] abyte = chunk.getBiomeArray(); for (int k = 0; k < abyte.length; ++k) @@ -199,136 +201,104 @@ public Chunk provideChunk(int par1, int par2) * generates a subset of the level's terrain data. Takes 7 arguments: the [empty] noise array, the position, and the * size. */ - private double[] initializeNoiseField(double[] par1ArrayOfDouble, int par2, int par3, int par4, int par5, int par6, int par7) + private double[] initializeNoiseField(double[] par1ArrayOfDouble, int x, int y, int z, int xSize, int ySize, int zSize) { - ChunkProviderEvent.InitNoiseField event = new ChunkProviderEvent.InitNoiseField(this, par1ArrayOfDouble, par2, par3, par4, par5, par6, par7); - MinecraftForge.EVENT_BUS.post(event); - if (event.getResult() == Result.DENY) return event.noisefield; - - if (par1ArrayOfDouble == null) - par1ArrayOfDouble = new double[par5 * par6 * par7]; - - double d0 = 684.412D; - double d1 = 684.412D; - noiseData4 = noiseGen4.generateNoiseOctaves(noiseData4, par2, par4, par5, par7, 1.121D, 1.121D, 0.5D); - noiseData5 = noiseGen5.generateNoiseOctaves(noiseData5, par2, par4, par5, par7, 200.0D, 200.0D, 0.5D); - d0 *= 2.0D; - noiseData1 = noiseGen3.generateNoiseOctaves(noiseData1, par2, par3, par4, par5, par6, par7, d0 / 80.0D, d1 / 160.0D, d0 / 80.0D); - noiseData2 = noiseGen1.generateNoiseOctaves(noiseData2, par2, par3, par4, par5, par6, par7, d0, d1, d0); - noiseData3 = noiseGen2.generateNoiseOctaves(noiseData3, par2, par3, par4, par5, par6, par7, d0, d1, d0); + if(par1ArrayOfDouble == null) + par1ArrayOfDouble = new double[xSize * ySize * zSize]; + double d = 684.41200000000003D; + double d1 = 684.41200000000003D; + noiseData4 = noiseGen4.generateNoiseOctaves(noiseData4, x, z, xSize, zSize, 1.121D, 1.121D, 0.5D); + noiseData5 = noiseGen5.generateNoiseOctaves(noiseData5, x, z, xSize, zSize, 200D, 200D, 0.5D); + d *= 2D; + noiseData1 = noiseGen3.generateNoiseOctaves(noiseData1, x, y, z, xSize, ySize, zSize, d / 80D, d1 / 160D, d / 80D); + noiseData2 = noiseGen1.generateNoiseOctaves(noiseData2, x, y, z, xSize, ySize, zSize, d, d1, d); + noiseData3 = noiseGen2.generateNoiseOctaves(noiseData3, x, y, z, xSize, ySize, zSize, d, d1, d); int k1 = 0; int l1 = 0; - - for (int i2 = 0; i2 < par5; ++i2) - for (int j2 = 0; j2 < par7; ++j2) + for(int j2 = 0; j2 < xSize; j2++) + for(int l2 = 0; l2 < zSize; l2++) { - double d2 = (noiseData4[l1] + 256.0D) / 512.0D; - - if (d2 > 1.0D) - d2 = 1.0D; - - double d3 = noiseData5[l1] / 8000.0D; - - if (d3 < 0.0D) - d3 = -d3 * 0.3D; - - d3 = d3 * 3.0D - 2.0D; - float f = (i2 + par2 - 0) / 1.0F; - float f1 = (j2 + par4 - 0) / 1.0F; - float f2 = 100.0F - MathHelper.sqrt_float(f * f + f1 * f1) * 8.0F; - - if (f2 > 80.0F) - f2 = 80.0F; - - if (f2 < -100.0F) - f2 = -100.0F; - - if (d3 > 1.0D) - d3 = 1.0D; - - d3 /= 8.0D; - d3 = 0.0D; - - if (d2 < 0.0D) - d2 = 0.0D; - - d2 += 0.5D; - d3 = d3 * par6 / 16.0D; - ++l1; - double d4 = par6 / 2.0D; - - for (int k2 = 0; k2 < par6; ++k2) + double d3; + d3 = 0.5D; + double d4 = 1.0D - d3; + d4 *= d4; + d4 *= d4; + d4 = 1.0D - d4; + double d5 = (noiseData4[l1] + 256D) / 512D; + d5 *= d4; + if(d5 > 1.0D) + d5 = 1.0D; + double d6 = noiseData5[l1] / 8000D; + if(d6 < 0.0D) + d6 = -d6 * 0.29999999999999999D; + d6 = d6 * 3D - 2D; + if(d6 > 1.0D) + d6 = 1.0D; + d6 /= 8D; + d6 = 0.0D; + if(d5 < 0.0D) + d5 = 0.0D; + d5 += 0.5D; + d6 = d6 * ySize / 16D; + l1++; + double d7 = ySize / 2D; + for(int j3 = 0; j3 < ySize; j3++) { - double d5 = 0.0D; - double d6 = (k2 - d4) * 8.0D / d2; - - if (d6 < 0.0D) - d6 *= -1.0D; - - double d7 = noiseData2[k1] / 512.0D; - double d8 = noiseData3[k1] / 512.0D; - double d9 = (noiseData1[k1] / 10.0D + 1.0D) / 2.0D; - - if (d9 < 0.0D) - d5 = d7; - else if (d9 > 1.0D) - d5 = d8; + double d8 = 0.0D; + double d9 = (j3 - d7) * 8D / d5; + if(d9 < 0.0D) + d9 *= -1D; + double d10 = noiseData2[k1] / 512D; + double d11 = noiseData3[k1] / 512D; + double d12 = (noiseData1[k1] / 10D + 1.0D) / 2D; + if(d12 < 0.0D) + d8 = d10; else - d5 = d7 + (d8 - d7) * d9; - - d5 -= 8.0D; - d5 += f2; - byte b0 = 2; - double d10; - - if (k2 > par6 / 2 - b0) + if(d12 > 1.0D) + d8 = d11; + else + d8 = d10 + (d11 - d10) * d12; + d8 -= 8D; + int k3 = 32; + if(j3 > ySize - k3) { - d10 = (k2 - (par6 / 2 - b0)) / 64.0F; - - if (d10 < 0.0D) - d10 = 0.0D; - - if (d10 > 1.0D) - d10 = 1.0D; - - d5 = d5 * (1.0D - d10) + -3000.0D * d10; + double d13 = (j3 - (ySize - k3)) / (k3 - 1.0F); + d8 = d8 * (1.0D - d13) + -30D * d13; } - - b0 = 8; - - if (k2 < b0) + k3 = 8; + if(j3 < k3) { - d10 = (b0 - k2) / (b0 - 1.0F); - d5 = d5 * (1.0D - d10) + -30.0D * d10; + double d14 = (k3 - j3) / (k3 - 1.0F); + d8 = d8 * (1.0D - d14) + -30D * d14; } - - par1ArrayOfDouble[k1] = d5; - ++k1; + par1ArrayOfDouble[k1] = d8; + k1++; } + } return par1ArrayOfDouble; } @Override - public boolean chunkExists(int par1, int par2) + public boolean chunkExists(int x, int z) { return true; } @Override - public void populate(IChunkProvider par1IChunkProvider, int par2, int par3) + public void populate(IChunkProvider par1IChunkProvider, int x, int z) { BlockFalling.fallInstantly = true; - MinecraftForge.EVENT_BUS.post(new PopulateChunkEvent.Pre(par1IChunkProvider, worldObj, worldObj.rand, par2, par3, false)); + MinecraftForge.EVENT_BUS.post(new PopulateChunkEvent.Pre(par1IChunkProvider, worldObj, worldObj.rand, x, z, false)); - int k = par2 * 16; - int l = par3 * 16; + int k = x * 16; + int l = z * 16; BiomeGenBase biomegenbase = worldObj.getBiomeGenForCoords(k + 16, l + 16); biomegenbase.decorate(worldObj, worldObj.rand, k, l); - MinecraftForge.EVENT_BUS.post(new PopulateChunkEvent.Post(par1IChunkProvider, worldObj, worldObj.rand, par2, par3, false)); + MinecraftForge.EVENT_BUS.post(new PopulateChunkEvent.Post(par1IChunkProvider, worldObj, worldObj.rand, x, z, false)); BlockFalling.fallInstantly = false; } @@ -362,14 +332,14 @@ public String makeString() @Override @SuppressWarnings("rawtypes") - public List getPossibleCreatures(EnumCreatureType par1EnumCreatureType, int par2, int par3, int par4) + public List getPossibleCreatures(EnumCreatureType par1EnumCreatureType, int x, int y, int z) { - BiomeGenBase biomegenbase = worldObj.getBiomeGenForCoords(par2, par4); + BiomeGenBase biomegenbase = worldObj.getBiomeGenForCoords(x, z); return biomegenbase.getSpawnableList(par1EnumCreatureType); } @Override - public ChunkPosition func_147416_a(World p_147416_1_, String p_147416_2_, int p_147416_3_, int p_147416_4_, int p_147416_5_) + public ChunkPosition func_147416_a(World par1World, String par2String, int x, int y, int z) { return null; } @@ -381,5 +351,5 @@ public int getLoadedChunkCount() } @Override - public void recreateStructures(int par1, int par2) {} + public void recreateStructures(int x, int z) {} } \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/common/world/TeleporterAbyss.java b/src/main/java/com/shinoow/abyssalcraft/common/world/TeleporterAbyss.java index ac94f2fe4..e97a9cc11 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/world/TeleporterAbyss.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/world/TeleporterAbyss.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.world; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/world/TeleporterDreadlands.java b/src/main/java/com/shinoow/abyssalcraft/common/world/TeleporterDreadlands.java index e4dfc5506..c788e0331 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/world/TeleporterDreadlands.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/world/TeleporterDreadlands.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.world; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/world/TeleporterOmothol.java b/src/main/java/com/shinoow/abyssalcraft/common/world/TeleporterOmothol.java index 1cbcac301..b42bd246d 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/world/TeleporterOmothol.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/world/TeleporterOmothol.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.world; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/world/WorldChunkManagerDreadlands.java b/src/main/java/com/shinoow/abyssalcraft/common/world/WorldChunkManagerDreadlands.java index 10bd438e8..3fd876134 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/world/WorldChunkManagerDreadlands.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/world/WorldChunkManagerDreadlands.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.world; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/world/WorldProviderAbyss.java b/src/main/java/com/shinoow/abyssalcraft/common/world/WorldProviderAbyss.java index 1d415001f..4abc5c1b3 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/world/WorldProviderAbyss.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/world/WorldProviderAbyss.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.world; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/world/WorldProviderDarkRealm.java b/src/main/java/com/shinoow/abyssalcraft/common/world/WorldProviderDarkRealm.java index 5189200ab..85f149e7c 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/world/WorldProviderDarkRealm.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/world/WorldProviderDarkRealm.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.world; @@ -36,7 +37,6 @@ public IChunkProvider createChunkGenerator() { @Override public void registerWorldChunkManager() { worldChunkMgr = new WorldChunkManagerHell(AbyssalCraft.darkRealm, 0.0F); - isHellWorld= false; dimensionId = AbyssalCraft.configDimId4; hasNoSky = true; } diff --git a/src/main/java/com/shinoow/abyssalcraft/common/world/WorldProviderDreadlands.java b/src/main/java/com/shinoow/abyssalcraft/common/world/WorldProviderDreadlands.java index 487543d37..0956ce068 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/world/WorldProviderDreadlands.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/world/WorldProviderDreadlands.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.world; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/world/WorldProviderOmothol.java b/src/main/java/com/shinoow/abyssalcraft/common/world/WorldProviderOmothol.java index b4b038cfc..2679a300c 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/world/WorldProviderOmothol.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/world/WorldProviderOmothol.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.world; @@ -23,6 +24,7 @@ import net.minecraft.util.Vec3; import net.minecraft.world.WorldProvider; import net.minecraft.world.biome.WorldChunkManagerHell; +import net.minecraft.world.chunk.Chunk; import net.minecraft.world.chunk.IChunkProvider; public class WorldProviderOmothol extends WorldProvider { @@ -32,7 +34,7 @@ public void registerWorldChunkManager() { worldChunkMgr = new WorldChunkManagerHell(AbyssalCraft.omothol, 0.0F); dimensionId = AbyssalCraft.configDimId3; - hasNoSky = false; + hasNoSky = true; } @Override @@ -47,6 +49,16 @@ public String getDimensionName() return "Omothol"; } + @Override + protected void generateLightBrightnessTable() { + float f = 0.25F; + + for (int i = 0; i <= 15; ++i) { + float f1 = 1.0F - i / 15.0F; + lightBrightnessTable[i] = (1.0F - f1) / (f1 * 3.0F + 1.0F) * (1.0F - f) + f; + } + } + @Override public float calculateCelestialAngle(long par1, float par3) { @@ -82,6 +94,11 @@ public Vec3 getFogColor(float par1, float par2) return Vec3.createVectorHelper(f3, f4, f5); } + @Override + public boolean canDoRainSnowIce(Chunk chunk) { + return false; + } + @Override @SideOnly(Side.CLIENT) public boolean isSkyColored() diff --git a/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenAbyDreadlands.java b/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenAbyDreadlands.java index 392441b71..aa6f82f66 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenAbyDreadlands.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenAbyDreadlands.java @@ -1,25 +1,24 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.world.biome; import java.util.Random; -import net.minecraft.block.Block; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.*; import com.shinoow.abyssalcraft.AbyssalCraft; @@ -28,70 +27,52 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class BiomeGenAbyDreadlands extends BiomeGenBase -{ - - private WorldGenerator theWorldGenerator; - private WorldGenerator theSecondWorldGenerator; - private WorldGenerator theThirdWorldGenerator; +public class BiomeGenAbyDreadlands extends BiomeGenDreadlandsBase { @SuppressWarnings("unchecked") public BiomeGenAbyDreadlands(int par1) { super(par1); topBlock = AbyssalCraft.abydreadstone; fillerBlock = AbyssalCraft.abydreadstone; - spawnableMonsterList.clear(); - spawnableCreatureList.clear(); - spawnableWaterCreatureList.clear(); - spawnableCaveCreatureList.clear(); - theBiomeDecorator.treesPerChunk = -1; - theBiomeDecorator.flowersPerChunk= -1; - theWorldGenerator = new WorldGenMinable(AbyssalCraft.abydreadstone, 96, AbyssalCraft.dreadstone); - theSecondWorldGenerator = new WorldGenMinable(AbyssalCraft.abydreadstone, 64, AbyssalCraft.dreadstone); - theThirdWorldGenerator = new WorldGenMinable(AbyssalCraft.abydreadstone, 32, AbyssalCraft.dreadstone); - spawnableMonsterList.add(new SpawnListEntry(EntityDreadgolem.class, 2, 1, 2)); - spawnableCreatureList.add(new SpawnListEntry(EntityAbygolem.class, 5, 1, 5)); + spawnableCreatureList.add(new SpawnListEntry(EntityAbygolem.class, 100, 3, 8)); } @Override public void decorate(World par1World, Random par2Random, int par3, int par4) { super.decorate(par1World, par2Random, par3, par4); - int var5 = 3 + par2Random.nextInt(6); - int var6; - int var7; - int var8; - for (var6 = 0; var6 < var5; ++var6) - { - var7 = par3 + par2Random.nextInt(16); - var8 = par2Random.nextInt(28) + 4; - int var9 = par4 + par2Random.nextInt(16); - Block var10 = par1World.getBlock(var7, var8, var9); + for(int rarity = 0; rarity < 8; rarity++) { + int veinSize = 2 + par2Random.nextInt(4); + int x = par3 + par2Random.nextInt(16); + int y = par2Random.nextInt(55); + int z = par4 + par2Random.nextInt(16); - if (var10 == AbyssalCraft.dreadstone) - par1World.setBlock(var7, var8, var9, AbyssalCraft.abydreadore); + new WorldGenMinable(AbyssalCraft.abydreadore, veinSize, AbyssalCraft.dreadstone).generate(par1World, par2Random, x, y, z); } - for (var5 = 0; var5 < 7; ++var5) + for (int rarity = 0; rarity < 7; ++rarity) { - var6 = par3 + par2Random.nextInt(16); - var7 = par2Random.nextInt(64); - var8 = par4 + par2Random.nextInt(16); - theWorldGenerator.generate(par1World, par2Random, var6, var7, var8); + int x = par3 + par2Random.nextInt(16); + int y = par2Random.nextInt(64); + int z = par4 + par2Random.nextInt(16); + new WorldGenMinable(AbyssalCraft.abydreadstone, 96, + AbyssalCraft.dreadstone).generate(par1World, par2Random, x, y, z); } - for (var5 = 0; var5 < 7; ++var5) + for (int rarity = 0; rarity < 7; ++rarity) { - var6 = par3 + par2Random.nextInt(16); - var7 = par2Random.nextInt(64); - var8 = par4 + par2Random.nextInt(16); - theSecondWorldGenerator.generate(par1World, par2Random, var6, var7, var8); + int x = par3 + par2Random.nextInt(16); + int y = par2Random.nextInt(64); + int z = par4 + par2Random.nextInt(16); + new WorldGenMinable(AbyssalCraft.abydreadstone, 64, + AbyssalCraft.dreadstone).generate(par1World, par2Random, x, y, z); } - for (var5 = 0; var5 < 7; ++var5) + for (int rarity = 0; rarity < 7; ++rarity) { - var6 = par3 + par2Random.nextInt(16); - var7 = par2Random.nextInt(64); - var8 = par4 + par2Random.nextInt(16); - theThirdWorldGenerator.generate(par1World, par2Random, var6, var7, var8); + int x = par3 + par2Random.nextInt(16); + int y = par2Random.nextInt(64); + int z = par4 + par2Random.nextInt(16); + new WorldGenMinable(AbyssalCraft.abydreadstone, 32, + AbyssalCraft.dreadstone).generate(par1World, par2Random, x, y, z); } } diff --git a/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenAbywasteland.java b/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenAbywasteland.java index e452cb7dd..d5d4d73ad 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenAbywasteland.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenAbywasteland.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.world.biome; @@ -38,10 +39,12 @@ public BiomeGenAbywasteland(int par1){ spawnableCreatureList.clear(); spawnableWaterCreatureList.clear(); spawnableCaveCreatureList.clear(); - spawnableMonsterList.add(new SpawnListEntry(EntityZombie.class, 5, 1, 5)); - spawnableMonsterList.add(new SpawnListEntry(EntitySkeleton.class, 5, 1, 5)); - spawnableMonsterList.add(new SpawnListEntry(EntityDepthsGhoul.class, 5, 1, 5)); - spawnableMonsterList.add(new SpawnListEntry(EntityAbyssalZombie.class, 5, 1, 5)); + spawnableMonsterList.add(new SpawnListEntry(EntityZombie.class, 50, 1, 5)); + spawnableMonsterList.add(new SpawnListEntry(EntitySkeleton.class, 50, 1, 5)); + spawnableMonsterList.add(new SpawnListEntry(EntityDepthsGhoul.class, 60, 1, 5)); + spawnableMonsterList.add(new SpawnListEntry(EntityAbyssalZombie.class, 60, 1, 5)); + spawnableMonsterList.add(new SpawnListEntry(EntitySkeletonGoliath.class, 15, 1, 1)); + spawnableMonsterList.add(new SpawnListEntry(EntityDragonMinion.class, 3, 1, 1)); } @Override diff --git a/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenCorOcean.java b/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenCorOcean.java index 2c4916811..28eecc18a 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenCorOcean.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenCorOcean.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.world.biome; @@ -38,9 +39,8 @@ public BiomeGenCorOcean(int par1) { heightVariation = 0.1F; waterColorMultiplier = 0x24FF83; spawnableCreatureList.clear(); - spawnableMonsterList.clear(); - spawnableMonsterList.add(new SpawnListEntry(EntityDepthsGhoul.class, 5, 1, 5)); - spawnableMonsterList.add(new SpawnListEntry(EntityAbyssalZombie.class, 5, 1, 5)); + spawnableMonsterList.add(new SpawnListEntry(EntityDepthsGhoul.class, 60, 1, 5)); + spawnableMonsterList.add(new SpawnListEntry(EntityAbyssalZombie.class, 60, 1, 5)); } @@ -59,7 +59,7 @@ public void decorate(World par1World, Random par2Random, int par3, int par4) { int var9 = par4 + par2Random.nextInt(16); Block var10 = par1World.getBlock(var7, var8, var9); - if (var10 == Blocks.stone || var10 == Blocks.iron_ore || var10 == Blocks.coal_ore) { + if (var10.isReplaceableOreGen(par1World, var7, var8, var9, Blocks.stone) || var10 == Blocks.iron_ore || var10 == Blocks.coal_ore) { par1World.setBlock(var7, var8, var9, AbyssalCraft.Coraliumore); if(var10 == Blocks.diamond_ore || var10 == Blocks.gold_ore || var10 == Blocks.iron_ore) par1World.setBlock(var7, var8, var9, AbyssalCraft.CoraliumInfusedStone); diff --git a/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenCorSwamp.java b/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenCorSwamp.java index 6a45b81b7..de1b1b356 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenCorSwamp.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenCorSwamp.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.world.biome; @@ -25,6 +26,7 @@ import com.shinoow.abyssalcraft.AbyssalCraft; import com.shinoow.abyssalcraft.common.entity.*; +import com.shinoow.abyssalcraft.common.entity.anti.*; import com.shinoow.abyssalcraft.common.world.gen.WorldGenAntimatterLake; import cpw.mods.fml.relauncher.Side; @@ -35,8 +37,6 @@ public class BiomeGenCorSwamp extends BiomeGenBase { @SuppressWarnings("unchecked") public BiomeGenCorSwamp(int par1) { super(par1); - spawnableCreatureList.clear(); - spawnableMonsterList.clear(); rootHeight = -0.2F; heightVariation = 0.1F; topBlock=Blocks.grass; @@ -52,8 +52,19 @@ public BiomeGenCorSwamp(int par1) { theBiomeDecorator.sandPerChunk = 0; theBiomeDecorator.grassPerChunk = 5; waterColorMultiplier = 0x24FF83; - spawnableMonsterList.add(new SpawnListEntry(EntityDepthsGhoul.class, 5, 1, 5)); - spawnableMonsterList.add(new SpawnListEntry(EntityAbyssalZombie.class, 5, 1, 5)); + spawnableMonsterList.add(new SpawnListEntry(EntityDepthsGhoul.class, 60, 1, 5)); + spawnableMonsterList.add(new SpawnListEntry(EntityAbyssalZombie.class, 60, 1, 5)); + spawnableCreatureList.add(new SpawnListEntry(EntityAntiPig.class, 5, 1, 2)); + spawnableCaveCreatureList.add(new SpawnListEntry(EntityAntiBat.class, 10, 1, 2)); + spawnableCreatureList.add(new SpawnListEntry(EntityAntiChicken.class, 5, 1, 2)); + spawnableCreatureList.add(new SpawnListEntry(EntityAntiCow.class, 5, 1, 2)); + spawnableMonsterList.add(new SpawnListEntry(EntityAntiAbyssalZombie.class, 5, 1, 2)); + spawnableMonsterList.add(new SpawnListEntry(EntityAntiCreeper.class, 5, 1, 2)); + spawnableMonsterList.add(new SpawnListEntry(EntityAntiGhoul.class, 5, 1, 2)); + spawnableMonsterList.add(new SpawnListEntry(EntityAntiPlayer.class, 5, 1, 2)); + spawnableMonsterList.add(new SpawnListEntry(EntityAntiSkeleton.class, 5, 1, 2)); + spawnableMonsterList.add(new SpawnListEntry(EntityAntiSpider.class, 5, 1, 2)); + spawnableMonsterList.add(new SpawnListEntry(EntityAntiZombie.class, 5, 1, 2)); } @Override @@ -61,18 +72,15 @@ public void decorate(World par1World, Random par2Random, int par3, int par4) { super.decorate(par1World, par2Random, par3, par4); int var5 = 3 + par2Random.nextInt(6); - int var6; - int var7; - int var8; - for (var6 = 0; var6 < var5; ++var6) + for (int var6 = 0; var6 < var5; ++var6) { - var7 = par3 + par2Random.nextInt(16); - var8 = par2Random.nextInt(28) + 4; + int var7 = par3 + par2Random.nextInt(16); + int var8 = par2Random.nextInt(28) + 4; int var9 = par4 + par2Random.nextInt(16); Block var10 = par1World.getBlock(var7, var8, var9); - if (var10 == Blocks.stone || var10 == Blocks.iron_ore || var10 == Blocks.coal_ore) + if (var10.isReplaceableOreGen(par1World, var7, var8, var9, Blocks.stone) || var10 == Blocks.iron_ore || var10 == Blocks.coal_ore) par1World.setBlock(var7, var8, var9, AbyssalCraft.Coraliumore); } for(int rarity = 0; rarity < 3; rarity++) diff --git a/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenDarkRealm.java b/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenDarkRealm.java index e10b8a175..416687b24 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenDarkRealm.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenDarkRealm.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.world.biome; @@ -32,9 +33,9 @@ public BiomeGenDarkRealm(int par1){ spawnableCreatureList.clear(); spawnableWaterCreatureList.clear(); spawnableCaveCreatureList.clear(); - spawnableMonsterList.add(new SpawnListEntry(EntityShadowCreature.class, 5, 1, 5)); - spawnableMonsterList.add(new SpawnListEntry(EntityShadowMonster.class, 3, 1, 3)); - spawnableMonsterList.add(new SpawnListEntry(EntityShadowBeast.class, 1, 1, 1)); + spawnableMonsterList.add(new SpawnListEntry(EntityShadowCreature.class, 60, 1, 5)); + spawnableMonsterList.add(new SpawnListEntry(EntityShadowMonster.class, 40, 1, 3)); + spawnableMonsterList.add(new SpawnListEntry(EntityShadowBeast.class, 10, 1, 1)); } @Override diff --git a/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenDarklands.java b/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenDarklands.java index 8b2aa4983..a266d4fdb 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenDarklands.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenDarklands.java @@ -1,100 +1,84 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.world.biome; import java.util.Random; import net.minecraft.block.Block; -import net.minecraft.entity.monster.EntitySkeleton; -import net.minecraft.entity.monster.EntityZombie; import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; -import net.minecraft.world.gen.feature.WorldGenAbstractTree; -import net.minecraft.world.gen.feature.WorldGenMinable; -import net.minecraft.world.gen.feature.WorldGenTrees; -import net.minecraft.world.gen.feature.WorldGenerator; +import net.minecraft.world.gen.feature.*; import com.shinoow.abyssalcraft.AbyssalCraft; -import com.shinoow.abyssalcraft.common.entity.EntityAbyssalZombie; -import com.shinoow.abyssalcraft.common.entity.EntityDepthsGhoul; +import com.shinoow.abyssalcraft.common.entity.*; import com.shinoow.abyssalcraft.common.world.gen.WorldGenDLT; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class BiomeGenDarklands extends BiomeGenBase -{ +public class BiomeGenDarklands extends BiomeGenBase { - private WorldGenerator theWorldGenerator; - private WorldGenerator theSecondWorldGenerator; private WorldGenTrees WorldGenDarkTrees; @SuppressWarnings("unchecked") public BiomeGenDarklands(int par1) { super(par1); - spawnableCreatureList.clear(); - spawnableMonsterList.clear(); topBlock = AbyssalCraft.Darkgrass; fillerBlock = Blocks.dirt; waterColorMultiplier = 14745518; - theWorldGenerator = new WorldGenMinable(AbyssalCraft.Darkstone, 20); - theSecondWorldGenerator = new WorldGenMinable(AbyssalCraft.abydreadstone, 1); WorldGenDarkTrees = new WorldGenDLT(false); theBiomeDecorator.treesPerChunk = 10; - spawnableMonsterList.add(new SpawnListEntry(EntityZombie.class, 5, 1, 5)); - spawnableMonsterList.add(new SpawnListEntry(EntitySkeleton.class, 5, 1, 5)); - spawnableMonsterList.add(new SpawnListEntry(EntityDepthsGhoul.class, 5, 1, 5)); - spawnableMonsterList.add(new SpawnListEntry(EntityAbyssalZombie.class, 3, 1, 3)); + spawnableMonsterList.add(new SpawnListEntry(EntityDepthsGhoul.class, 60, 1, 5)); + spawnableMonsterList.add(new SpawnListEntry(EntityAbyssalZombie.class, 60, 1, 3)); } + @Override public void decorate(World par1World, Random par2Random, int par3, int par4) { super.decorate(par1World, par2Random, par3, par4); int var5 = 3 + par2Random.nextInt(6); - int var6; - int var7; - int var8; - for (var6 = 0; var6 < var5; ++var6) + for (int rarity = 0; rarity < var5; ++rarity) { - var7 = par3 + par2Random.nextInt(16); - var8 = par2Random.nextInt(28) + 4; - int var9 = par4 + par2Random.nextInt(16); - Block var10 = par1World.getBlock(var7, var8, var9); + int x = par3 + par2Random.nextInt(16); + int y = par2Random.nextInt(28) + 4; + int z = par4 + par2Random.nextInt(16); + Block var10 = par1World.getBlock(x, y, z); - if (var10 == Blocks.stone) - par1World.setBlock(var7, var8, var9, AbyssalCraft.abyore); + if (var10.isReplaceableOreGen(par1World, x, y, z, Blocks.stone)) + par1World.setBlock(x, y, z, AbyssalCraft.abyore); } - for (var6 = 0; var6 < 7; ++var6) + for (int rarity = 0; rarity < 7; ++rarity) { - var7 = par3 + par2Random.nextInt(16); - var8 = par2Random.nextInt(64); - int var9 = par4 + par2Random.nextInt(16); - theWorldGenerator.generate(par1World, par2Random, var7, var8, var9); + int x = par3 + par2Random.nextInt(16); + int y = par2Random.nextInt(64); + int z = par4 + par2Random.nextInt(16); + new WorldGenMinable(AbyssalCraft.Darkstone, 20).generate(par1World, par2Random, x, y, z); } - for (var6 = 0; var6 < 7; ++var6) + for (int rarity = 0; rarity < 7; ++rarity) { - var7 = par3 + par2Random.nextInt(16); - var8 = par2Random.nextInt(64); - int var9 = par4 + par2Random.nextInt(16); - theSecondWorldGenerator.generate(par1World, par2Random, var7, var8, var9); + int x = par3 + par2Random.nextInt(16); + int y = par2Random.nextInt(64); + int z = par4 + par2Random.nextInt(16); + new WorldGenMinable(AbyssalCraft.abydreadstone, 1).generate(par1World, par2Random, x, y, z); } } diff --git a/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenDarklandsForest.java b/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenDarklandsForest.java index 5057b9973..0249798a9 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenDarklandsForest.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenDarklandsForest.java @@ -1,65 +1,51 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.world.biome; import java.util.Random; import net.minecraft.block.Block; -import net.minecraft.entity.monster.EntitySkeleton; -import net.minecraft.entity.monster.EntityZombie; import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; -import net.minecraft.world.gen.feature.WorldGenAbstractTree; -import net.minecraft.world.gen.feature.WorldGenMinable; -import net.minecraft.world.gen.feature.WorldGenTrees; -import net.minecraft.world.gen.feature.WorldGenerator; +import net.minecraft.world.gen.feature.*; import com.shinoow.abyssalcraft.AbyssalCraft; -import com.shinoow.abyssalcraft.common.entity.EntityAbyssalZombie; -import com.shinoow.abyssalcraft.common.entity.EntityDepthsGhoul; +import com.shinoow.abyssalcraft.common.entity.*; import com.shinoow.abyssalcraft.common.world.gen.WorldGenDLT; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class BiomeGenDarklandsForest extends BiomeGenBase -{ +public class BiomeGenDarklandsForest extends BiomeGenBase { - private WorldGenerator theWorldGenerator; - private WorldGenerator theSecondWorldGenerator; private WorldGenTrees WorldGenDarkTrees; @SuppressWarnings("unchecked") public BiomeGenDarklandsForest(int par1) { super(par1); - spawnableCreatureList.clear(); - spawnableMonsterList.clear(); topBlock = AbyssalCraft.Darkgrass; fillerBlock = Blocks.dirt; waterColorMultiplier = 14745518; - theWorldGenerator = new WorldGenMinable(AbyssalCraft.Darkstone, 20); - theSecondWorldGenerator = new WorldGenMinable(AbyssalCraft.abydreadstone, 1); WorldGenDarkTrees = new WorldGenDLT(false); theBiomeDecorator.treesPerChunk = 20; - spawnableMonsterList.add(new SpawnListEntry(EntityZombie.class, 5, 1, 5)); - spawnableMonsterList.add(new SpawnListEntry(EntitySkeleton.class, 5, 1, 5)); - spawnableMonsterList.add(new SpawnListEntry(EntityDepthsGhoul.class, 5, 1, 5)); - spawnableMonsterList.add(new SpawnListEntry(EntityAbyssalZombie.class, 3, 1, 3)); + spawnableMonsterList.add(new SpawnListEntry(EntityDepthsGhoul.class, 60, 1, 5)); + spawnableMonsterList.add(new SpawnListEntry(EntityAbyssalZombie.class, 60, 1, 3)); } @Override @@ -67,35 +53,32 @@ public void decorate(World par1World, Random par2Random, int par3, int par4) { super.decorate(par1World, par2Random, par3, par4); int var5 = 3 + par2Random.nextInt(6); - int var6; - int var7; - int var8; - for (var6 = 0; var6 < var5; ++var6) + for (int rarity = 0; rarity < var5; ++rarity) { - var7 = par3 + par2Random.nextInt(16); - var8 = par2Random.nextInt(28) + 4; - int var9 = par4 + par2Random.nextInt(16); - Block var10 = par1World.getBlock(var7, var8, var9); + int x = par3 + par2Random.nextInt(16); + int y = par2Random.nextInt(28) + 4; + int z = par4 + par2Random.nextInt(16); + Block var10 = par1World.getBlock(x, y, z); - if (var10 == Blocks.stone) - par1World.setBlock(var7, var8, var9, AbyssalCraft.abyore); + if (var10.isReplaceableOreGen(par1World, x, y, z, Blocks.stone)) + par1World.setBlock(x, y, z, AbyssalCraft.abyore); } - for (var6 = 0; var6 < 7; ++var6) + for (int rarity = 0; rarity < 7; ++rarity) { - var7 = par3 + par2Random.nextInt(16); - var8 = par2Random.nextInt(64); - int var9 = par4 + par2Random.nextInt(16); - theWorldGenerator.generate(par1World, par2Random, var7, var8, var9); + int x = par3 + par2Random.nextInt(16); + int y = par2Random.nextInt(64); + int z = par4 + par2Random.nextInt(16); + new WorldGenMinable(AbyssalCraft.Darkstone, 20).generate(par1World, par2Random, x, y, z); } - for (var6 = 0; var6 < 7; ++var6) + for (int rarity = 0; rarity < 7; ++rarity) { - var7 = par3 + par2Random.nextInt(16); - var8 = par2Random.nextInt(64); - int var9 = par4 + par2Random.nextInt(16); - theSecondWorldGenerator.generate(par1World, par2Random, var7, var8, var9); + int x = par3 + par2Random.nextInt(16); + int y = par2Random.nextInt(64); + int z = par4 + par2Random.nextInt(16); + new WorldGenMinable(AbyssalCraft.abydreadstone, 1).generate(par1World, par2Random, x, y, z); } } diff --git a/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenDarklandsHills.java b/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenDarklandsHills.java index d1937d3d6..65c709626 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenDarklandsHills.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenDarklandsHills.java @@ -1,47 +1,38 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.world.biome; import java.util.Random; import net.minecraft.block.Block; -import net.minecraft.entity.monster.EntitySkeleton; -import net.minecraft.entity.monster.EntityZombie; import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; -import net.minecraft.world.gen.feature.WorldGenAbstractTree; -import net.minecraft.world.gen.feature.WorldGenMinable; -import net.minecraft.world.gen.feature.WorldGenTrees; -import net.minecraft.world.gen.feature.WorldGenerator; +import net.minecraft.world.gen.feature.*; import com.shinoow.abyssalcraft.AbyssalCraft; -import com.shinoow.abyssalcraft.common.entity.EntityAbyssalZombie; -import com.shinoow.abyssalcraft.common.entity.EntityDepthsGhoul; +import com.shinoow.abyssalcraft.common.entity.*; import com.shinoow.abyssalcraft.common.world.gen.WorldGenDLT; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class BiomeGenDarklandsHills extends BiomeGenBase -{ +public class BiomeGenDarklandsHills extends BiomeGenBase { - private WorldGenerator theWorldGenerator; - private WorldGenerator theSecondWorldGenerator; - private WorldGenerator theThirdWorldGenerator; private WorldGenTrees WorldGenDarkTrees; @SuppressWarnings("unchecked") @@ -50,63 +41,57 @@ public BiomeGenDarklandsHills(int par1) super(par1); rootHeight = 1.1F; heightVariation = 0.5F; - spawnableCreatureList.clear(); - spawnableMonsterList.clear(); topBlock = AbyssalCraft.Darkgrass; fillerBlock = AbyssalCraft.Darkstone; waterColorMultiplier = 14745518; - theWorldGenerator = new WorldGenMinable(AbyssalCraft.Darkstone, 64); - theSecondWorldGenerator = new WorldGenMinable(AbyssalCraft.abydreadstone, 1); - theThirdWorldGenerator = new WorldGenMinable(AbyssalCraft.Darkstone, 32); WorldGenDarkTrees = new WorldGenDLT(false); theBiomeDecorator.treesPerChunk = 1; - spawnableMonsterList.add(new SpawnListEntry(EntityZombie.class, 5, 1, 5)); - spawnableMonsterList.add(new SpawnListEntry(EntitySkeleton.class, 5, 1, 5)); - spawnableMonsterList.add(new SpawnListEntry(EntityDepthsGhoul.class, 5, 1, 5)); - spawnableMonsterList.add(new SpawnListEntry(EntityAbyssalZombie.class, 3, 1, 3)); + spawnableMonsterList.add(new SpawnListEntry(EntityDepthsGhoul.class, 60, 1, 5)); + spawnableMonsterList.add(new SpawnListEntry(EntityAbyssalZombie.class, 60, 1, 3)); + spawnableMonsterList.add(new SpawnListEntry(EntityShadowCreature.class, 10, 1, 1)); + spawnableMonsterList.add(new SpawnListEntry(EntityShadowMonster.class, 5, 1, 1)); + spawnableMonsterList.add(new SpawnListEntry(EntityShadowBeast.class, 1, 1, 1)); } + @Override public void decorate(World par1World, Random par2Random, int par3, int par4) { super.decorate(par1World, par2Random, par3, par4); int var5 = 3 + par2Random.nextInt(6); - int var6; - int var7; - int var8; - for (var6 = 0; var6 < var5; ++var6) + for (int rarity = 0; rarity < var5; ++rarity) { - var7 = par3 + par2Random.nextInt(16); - var8 = par2Random.nextInt(28) + 4; - int var9 = par4 + par2Random.nextInt(16); - Block var10 = par1World.getBlock(var7, var8, var9); + int x = par3 + par2Random.nextInt(16); + int y = par2Random.nextInt(28) + 4; + int z = par4 + par2Random.nextInt(16); + Block var10 = par1World.getBlock(x, y, z); if (var10 == Blocks.stone) - par1World.setBlock(var7, var8, var9, AbyssalCraft.abyore); + par1World.setBlock(x, y, z, AbyssalCraft.abyore); } - for (var6 = 0; var6 < 7; ++var6) + for (int rarity = 0; rarity < 7; ++rarity) { - var7 = par3 + par2Random.nextInt(16); - var8 = par2Random.nextInt(64); - int var9 = par4 + par2Random.nextInt(16); - theWorldGenerator.generate(par1World, par2Random, var7, var8, var9); + int x = par3 + par2Random.nextInt(16); + int y = par2Random.nextInt(64); + int z = par4 + par2Random.nextInt(16); + new WorldGenMinable(AbyssalCraft.Darkstone, 64).generate(par1World, par2Random, x, y, z); } - for (var6 = 0; var6 < 7; ++var6) + for (int rarity = 0; rarity < 7; ++rarity) { - var7 = par3 + par2Random.nextInt(16); - var8 = par2Random.nextInt(64); - int var9 = par4 + par2Random.nextInt(16); - theSecondWorldGenerator.generate(par1World, par2Random, var7, var8, var9); + int x = par3 + par2Random.nextInt(16); + int y = par2Random.nextInt(64); + int z = par4 + par2Random.nextInt(16); + new WorldGenMinable(AbyssalCraft.abydreadstone, 1).generate(par1World, par2Random, x, y, z); } - for (var6 = 0; var6 < 7; ++var6) + for (int rarity = 0; rarity < 7; ++rarity) { - var7 = par3 + par2Random.nextInt(16); - var8 = par2Random.nextInt(64); - int var9 = par4 + par2Random.nextInt(16); - theThirdWorldGenerator.generate(par1World, par2Random, var7, var8, var9); + int x = par3 + par2Random.nextInt(16); + int y = par2Random.nextInt(64); + int z = par4 + par2Random.nextInt(16); + new WorldGenMinable(AbyssalCraft.Darkstone, 32).generate(par1World, par2Random, x, y, z); } } diff --git a/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenDarklandsMountains.java b/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenDarklandsMountains.java index 22e8fc00b..8e2c77368 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenDarklandsMountains.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenDarklandsMountains.java @@ -1,32 +1,30 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.world.biome; import java.util.Random; import net.minecraft.block.Block; -import net.minecraft.entity.monster.EntitySkeleton; -import net.minecraft.entity.monster.EntityZombie; import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import com.shinoow.abyssalcraft.AbyssalCraft; -import com.shinoow.abyssalcraft.common.entity.EntityAbyssalZombie; -import com.shinoow.abyssalcraft.common.entity.EntityDepthsGhoul; +import com.shinoow.abyssalcraft.common.entity.*; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -39,35 +37,31 @@ public BiomeGenDarklandsMountains(int par1) super(par1); rootHeight = 1.3F; heightVariation = 0.9F; - spawnableCreatureList.clear(); - spawnableMonsterList.clear(); topBlock = AbyssalCraft.Darkstone; fillerBlock = AbyssalCraft.Darkstone; waterColorMultiplier = 14745518; theBiomeDecorator.treesPerChunk = 0; - spawnableMonsterList.add(new SpawnListEntry(EntityZombie.class, 2, 1, 2)); - spawnableMonsterList.add(new SpawnListEntry(EntitySkeleton.class, 2, 1, 2)); - spawnableMonsterList.add(new SpawnListEntry(EntityDepthsGhoul.class, 2, 1, 2)); - spawnableMonsterList.add(new SpawnListEntry(EntityAbyssalZombie.class, 2, 1, 2)); + spawnableMonsterList.add(new SpawnListEntry(EntityDepthsGhoul.class, 45, 1, 2)); + spawnableMonsterList.add(new SpawnListEntry(EntityAbyssalZombie.class, 45, 1, 2)); + spawnableMonsterList.add(new SpawnListEntry(EntityShadowCreature.class, 60, 1, 3)); + spawnableMonsterList.add(new SpawnListEntry(EntityShadowMonster.class, 45, 1, 2)); + spawnableMonsterList.add(new SpawnListEntry(EntityShadowBeast.class, 15, 1, 1)); } @Override public void decorate(World par1World, Random par2Random, int par3, int par4) { super.decorate(par1World, par2Random, par3, par4); int var5 = 3 + par2Random.nextInt(6); - int var6; - int var7; - int var8; - for (var6 = 0; var6 < var5; ++var6) + for (int rarity = 0; rarity < var5; ++rarity) { - var7 = par3 + par2Random.nextInt(16); - var8 = par2Random.nextInt(28) + 4; - int var9 = par4 + par2Random.nextInt(16); - Block var10 = par1World.getBlock(var7, var8, var9); + int x = par3 + par2Random.nextInt(16); + int y = par2Random.nextInt(28) + 4; + int z = par4 + par2Random.nextInt(16); + Block var10 = par1World.getBlock(x, y, z); - if (var10 == Blocks.stone) - par1World.setBlock(var7, var8, var9, AbyssalCraft.abyore); + if (var10.isReplaceableOreGen(par1World, x, y, z, Blocks.stone)) + par1World.setBlock(x, y, z, AbyssalCraft.abyore); } } diff --git a/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenDarklandsPlains.java b/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenDarklandsPlains.java index f9422f283..4af4f70e7 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenDarklandsPlains.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenDarklandsPlains.java @@ -1,100 +1,84 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.world.biome; import java.util.Random; import net.minecraft.block.Block; -import net.minecraft.entity.monster.EntitySkeleton; -import net.minecraft.entity.monster.EntityZombie; import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; -import net.minecraft.world.gen.feature.WorldGenAbstractTree; -import net.minecraft.world.gen.feature.WorldGenMinable; -import net.minecraft.world.gen.feature.WorldGenTrees; -import net.minecraft.world.gen.feature.WorldGenerator; +import net.minecraft.world.gen.feature.*; import com.shinoow.abyssalcraft.AbyssalCraft; -import com.shinoow.abyssalcraft.common.entity.EntityAbyssalZombie; -import com.shinoow.abyssalcraft.common.entity.EntityDepthsGhoul; +import com.shinoow.abyssalcraft.common.entity.*; import com.shinoow.abyssalcraft.common.world.gen.WorldGenDLT; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class BiomeGenDarklandsPlains extends BiomeGenBase -{ +public class BiomeGenDarklandsPlains extends BiomeGenBase { - private WorldGenerator theWorldGenerator; - private WorldGenerator theSecondWorldGenerator; private WorldGenTrees WorldGenDarkTrees; @SuppressWarnings("unchecked") public BiomeGenDarklandsPlains(int par1) { super(par1); - spawnableCreatureList.clear(); - spawnableMonsterList.clear(); topBlock = AbyssalCraft.Darkgrass; fillerBlock = Blocks.dirt; waterColorMultiplier = 14745518; - theWorldGenerator = new WorldGenMinable(AbyssalCraft.Darkstone, 32); - theSecondWorldGenerator = new WorldGenMinable(AbyssalCraft.abydreadstone, 1); WorldGenDarkTrees = new WorldGenDLT(false); theBiomeDecorator.treesPerChunk = 1; - spawnableMonsterList.add(new SpawnListEntry(EntityZombie.class, 5, 1, 5)); - spawnableMonsterList.add(new SpawnListEntry(EntitySkeleton.class, 5, 1, 5)); - spawnableMonsterList.add(new SpawnListEntry(EntityDepthsGhoul.class, 5, 1, 5)); - spawnableMonsterList.add(new SpawnListEntry(EntityAbyssalZombie.class, 3, 1, 3)); + spawnableMonsterList.add(new SpawnListEntry(EntityDepthsGhoul.class, 60, 1, 5)); + spawnableMonsterList.add(new SpawnListEntry(EntityAbyssalZombie.class, 60, 1, 3)); } + @Override public void decorate(World par1World, Random par2Random, int par3, int par4) { super.decorate(par1World, par2Random, par3, par4); int var5 = 3 + par2Random.nextInt(6); - int var6; - int var7; - int var8; - for (var6 = 0; var6 < var5; ++var6) + for (int rarity = 0; rarity < var5; ++rarity) { - var7 = par3 + par2Random.nextInt(16); - var8 = par2Random.nextInt(28) + 4; - int var9 = par4 + par2Random.nextInt(16); - Block var10 = par1World.getBlock(var7, var8, var9); + int x = par3 + par2Random.nextInt(16); + int y = par2Random.nextInt(28) + 4; + int z = par4 + par2Random.nextInt(16); + Block var10 = par1World.getBlock(x, y, z); - if (var10 == Blocks.stone) - par1World.setBlock(var7, var8, var9, AbyssalCraft.abyore); + if (var10.isReplaceableOreGen(par1World, x, y, z, Blocks.stone)) + par1World.setBlock(x, y, z, AbyssalCraft.abyore); } - for (var6 = 0; var6 < 7; ++var6) + for (int rarity = 0; rarity < 7; ++rarity) { - var7 = par3 + par2Random.nextInt(16); - var8 = par2Random.nextInt(64); - int var9 = par4 + par2Random.nextInt(16); - theWorldGenerator.generate(par1World, par2Random, var7, var8, var9); + int x = par3 + par2Random.nextInt(16); + int y = par2Random.nextInt(64); + int z = par4 + par2Random.nextInt(16); + new WorldGenMinable(AbyssalCraft.Darkstone, 32).generate(par1World, par2Random, x, y, z); } - for (var6 = 0; var6 < 7; ++var6) + for (int rarity = 0; rarity < 7; ++rarity) { - var7 = par3 + par2Random.nextInt(16); - var8 = par2Random.nextInt(64); - int var9 = par4 + par2Random.nextInt(16); - theSecondWorldGenerator.generate(par1World, par2Random, var7, var8, var9); + int x = par3 + par2Random.nextInt(16); + int y = par2Random.nextInt(64); + int z = par4 + par2Random.nextInt(16); + new WorldGenMinable(AbyssalCraft.abydreadstone, 1).generate(par1World, par2Random, x, y, z); } } diff --git a/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenDreadlands.java b/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenDreadlands.java index 93ef42e5a..c50a7f947 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenDreadlands.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenDreadlands.java @@ -1,70 +1,33 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.world.biome; -import java.util.Random; - -import net.minecraft.block.Block; -import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; - -import com.shinoow.abyssalcraft.AbyssalCraft; -import com.shinoow.abyssalcraft.common.entity.EntityAbygolem; import com.shinoow.abyssalcraft.common.entity.EntityDreadgolem; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class BiomeGenDreadlands extends BiomeGenBase +public class BiomeGenDreadlands extends BiomeGenDreadlandsBase { @SuppressWarnings("unchecked") public BiomeGenDreadlands(int par1) { super(par1); - topBlock = AbyssalCraft.dreadstone; - fillerBlock = AbyssalCraft.dreadstone; - spawnableMonsterList.clear(); - spawnableCreatureList.clear(); - spawnableWaterCreatureList.clear(); - spawnableCaveCreatureList.clear(); - theBiomeDecorator.treesPerChunk = -1; - theBiomeDecorator.flowersPerChunk= -1; - spawnableMonsterList.add(new SpawnListEntry(EntityDreadgolem.class, 5, 1, 5)); - spawnableCreatureList.add(new SpawnListEntry(EntityAbygolem.class, 2, 1, 2)); - } - - @Override - public void decorate(World par1World, Random par2Random, int par3, int par4) - { - super.decorate(par1World, par2Random, par3, par4); - int var5 = 3 + par2Random.nextInt(6); - int var6; - int var7; - int var8; - - for (var6 = 0; var6 < var5; ++var6) - { - var7 = par3 + par2Random.nextInt(16); - var8 = par2Random.nextInt(28) + 4; - int var9 = par4 + par2Random.nextInt(16); - Block var10 = par1World.getBlock(var7, var8, var9); - - if (var10 == AbyssalCraft.dreadstone) - par1World.setBlock(var7, var8, var9, AbyssalCraft.dreadore); - } + spawnableCreatureList.add(new SpawnListEntry(EntityDreadgolem.class, 100, 1, 5)); } @Override diff --git a/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenDreadlandsBase.java b/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenDreadlandsBase.java new file mode 100644 index 000000000..adbb48ce3 --- /dev/null +++ b/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenDreadlandsBase.java @@ -0,0 +1,156 @@ +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.shinoow.abyssalcraft.common.world.biome; + +import java.util.Random; + +import com.shinoow.abyssalcraft.AbyssalCraft; +import com.shinoow.abyssalcraft.common.entity.*; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.init.Blocks; +import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.gen.feature.WorldGenMinable; + +public class BiomeGenDreadlandsBase extends BiomeGenBase { + + @SuppressWarnings("unchecked") + public BiomeGenDreadlandsBase(int par1) { + super(par1); + topBlock = AbyssalCraft.dreadstone; + fillerBlock = AbyssalCraft.dreadstone; + spawnableMonsterList.clear(); + spawnableCreatureList.clear(); + spawnableWaterCreatureList.clear(); + spawnableCaveCreatureList.clear(); + theBiomeDecorator.treesPerChunk = -1; + theBiomeDecorator.flowersPerChunk= -1; + spawnableMonsterList.add(new SpawnListEntry(EntityDreadgolem.class, 60, 1, 3)); + spawnableCreatureList.add(new SpawnListEntry(EntityAbygolem.class, 60, 1, 3)); + spawnableCreatureList.add(new SpawnListEntry(EntityDreadSpawn.class, 30, 1, 2)); + spawnableCreatureList.add(new SpawnListEntry(EntityDreadling.class, 40, 1, 2)); + spawnableCreatureList.add(new SpawnListEntry(EntityChagarothFist.class, 2, 1, 1)); + spawnableCreatureList.add(new SpawnListEntry(EntityDemonPig.class, 5, 1, 2)); + spawnableCreatureList.add(new SpawnListEntry(EntityDreadguard.class, 1, 1, 1)); + } + + @Override + public void decorate(World par1World, Random par2Random, int par3, int par4) + { + super.decorate(par1World, par2Random, par3, par4); + + for(int rarity = 0; rarity < 8; rarity++) { + int veinSize = 2 + par2Random.nextInt(4); + int x = par3 + par2Random.nextInt(16); + int y = par2Random.nextInt(55); + int z = par4 + par2Random.nextInt(16); + + new WorldGenMinable(AbyssalCraft.dreadore, veinSize, AbyssalCraft.dreadstone).generate(par1World, par2Random, x, y, z); + } + } + + @Override + public void genTerrainBlocks(World world, Random rand, Block[] blockArray, byte[] byteArray, int x, int z, double d) + { + genDreadlandsTerrain(world, rand, blockArray, byteArray, x, z, d); + } + + public final void genDreadlandsTerrain(World world, Random rand, Block[] blockArray, byte[] byteArray, int x, int z, double d) + { + Block block = topBlock; + byte b0 = (byte)(field_150604_aj & 255); + Block block1 = fillerBlock; + int k = -1; + int l = (int)(d / 3.0D + 3.0D + rand.nextDouble() * 0.25D); + int i1 = x & 15; + int j1 = z & 15; + int k1 = blockArray.length / 256; + + for (int l1 = 255; l1 >= 0; --l1) + { + int i2 = (j1 * 16 + i1) * k1 + l1; + + if (l1 <= 0 + rand.nextInt(5)) + blockArray[i2] = Blocks.bedrock; + else + { + Block block2 = blockArray[i2]; + + if (block2 != null && block2.getMaterial() != Material.air) + { + if (block2 == AbyssalCraft.dreadstone) + if (k == -1) + { + if (l <= 0) + { + block = null; + b0 = 0; + block1 = AbyssalCraft.dreadstone; + } + else if (l1 >= 59 && l1 <= 64) + { + block = topBlock; + b0 = (byte)(field_150604_aj & 255); + block1 = fillerBlock; + } + + if (l1 < 63 && (block == null || block.getMaterial() == Material.air)) + if (getFloatTemperature(x, l1, z) < 0.15F) + { + block = AbyssalCraft.dreadstone; + b0 = 0; + } + else + { + block = AbyssalCraft.dreadstone; + b0 = 0; + } + + k = l; + + if (l1 >= 62) + { + blockArray[i2] = block; + byteArray[i2] = b0; + } + else if (l1 < 56 - l) + { + block = null; + block1 = AbyssalCraft.dreadstone; + blockArray[i2] = AbyssalCraft.dreadstone; + } else + blockArray[i2] = block1; + } + else if (k > 0) + { + --k; + blockArray[i2] = block1; + + if (k == 0 && block1 == AbyssalCraft.dreadstone) + { + k = rand.nextInt(4) + Math.max(0, l1 - 63); + block1 = AbyssalCraft.dreadstone; + } + } + } else + k = -1; + } + } + } +} diff --git a/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenForestDreadlands.java b/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenForestDreadlands.java index b0aad74bd..7c76a2920 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenForestDreadlands.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenForestDreadlands.java @@ -1,34 +1,34 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.world.biome; import java.util.Random; -import net.minecraft.world.biome.BiomeGenBase; -import net.minecraft.world.gen.feature.WorldGenAbstractTree; -import net.minecraft.world.gen.feature.WorldGenTrees; +import net.minecraft.init.Blocks; +import net.minecraft.world.gen.feature.*; import com.shinoow.abyssalcraft.AbyssalCraft; -import com.shinoow.abyssalcraft.common.entity.EntityDemonPig; +import com.shinoow.abyssalcraft.common.entity.*; import com.shinoow.abyssalcraft.common.world.gen.WorldGenDrT; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class BiomeGenForestDreadlands extends BiomeGenBase +public class BiomeGenForestDreadlands extends BiomeGenDreadlandsBase { private WorldGenTrees WorldGenDreadTrees; @@ -37,15 +37,11 @@ public class BiomeGenForestDreadlands extends BiomeGenBase public BiomeGenForestDreadlands(int par1) { super(par1); topBlock = AbyssalCraft.dreadgrass; - fillerBlock = AbyssalCraft.dreadstone; + fillerBlock = Blocks.dirt; WorldGenDreadTrees = new WorldGenDrT(false); theBiomeDecorator.treesPerChunk = 20; - theBiomeDecorator.flowersPerChunk= -1; - spawnableMonsterList.clear(); - spawnableCreatureList.clear(); - spawnableWaterCreatureList.clear(); - spawnableCaveCreatureList.clear(); - spawnableMonsterList.add(new SpawnListEntry(EntityDemonPig.class, 2, 1, 3)); + spawnableMonsterList.add(new SpawnListEntry(EntityDemonPig.class, 40, 1, 3)); + spawnableMonsterList.add(new SpawnListEntry(EntityDreadSpawn.class, 50, 1, 2)); } diff --git a/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenMountainDreadlands.java b/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenMountainDreadlands.java index 52cf848e0..f8b01efed 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenMountainDreadlands.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenMountainDreadlands.java @@ -1,45 +1,38 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.world.biome; -import net.minecraft.world.biome.BiomeGenBase; -import com.shinoow.abyssalcraft.common.entity.EntityDreadling; -import com.shinoow.abyssalcraft.common.entity.EntityAbygolem; -import com.shinoow.abyssalcraft.common.entity.EntityDreadgolem; +import com.shinoow.abyssalcraft.common.entity.*; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class BiomeGenMountainDreadlands extends BiomeGenBase { +public class BiomeGenMountainDreadlands extends BiomeGenDreadlandsBase { @SuppressWarnings("unchecked") public BiomeGenMountainDreadlands(int par1) { super(par1); rootHeight = 1.3F; heightVariation = 0.9F; - spawnableMonsterList.clear(); - spawnableCreatureList.clear(); - spawnableWaterCreatureList.clear(); - spawnableCaveCreatureList.clear(); - theBiomeDecorator.treesPerChunk = -1; - theBiomeDecorator.flowersPerChunk= -1; - spawnableMonsterList.add(new SpawnListEntry(EntityDreadgolem.class, 2, 1, 2)); - spawnableCreatureList.add(new SpawnListEntry(EntityAbygolem.class, 2, 1, 2)); - spawnableMonsterList.add(new SpawnListEntry(EntityDreadling.class, 2, 1, 2)); + spawnableMonsterList.add(new SpawnListEntry(EntityDreadling.class, 40, 1, 3)); + spawnableMonsterList.add(new SpawnListEntry(EntityDreadguard.class, 15, 1, 1)); + spawnableMonsterList.add(new SpawnListEntry(EntityChagarothFist.class, 20, 1, 2)); + spawnableMonsterList.add(new SpawnListEntry(EntityChagarothSpawn.class, 30, 1, 2)); } @Override diff --git a/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenOmothol.java b/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenOmothol.java index aaa70e152..e673e7470 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenOmothol.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/world/biome/BiomeGenOmothol.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.world.biome; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/world/gen/WorldGenAbyLake.java b/src/main/java/com/shinoow/abyssalcraft/common/world/gen/WorldGenAbyLake.java index e2e825980..9375560a8 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/world/gen/WorldGenAbyLake.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/world/gen/WorldGenAbyLake.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.world.gen; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/world/gen/WorldGenAntimatterLake.java b/src/main/java/com/shinoow/abyssalcraft/common/world/gen/WorldGenAntimatterLake.java index 88245ae54..b41dcb919 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/world/gen/WorldGenAntimatterLake.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/world/gen/WorldGenAntimatterLake.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.world.gen; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/world/gen/WorldGenDLT.java b/src/main/java/com/shinoow/abyssalcraft/common/world/gen/WorldGenDLT.java index 5e40a5769..f87c3554a 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/world/gen/WorldGenDLT.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/world/gen/WorldGenDLT.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.world.gen; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/world/gen/WorldGenDrT.java b/src/main/java/com/shinoow/abyssalcraft/common/world/gen/WorldGenDrT.java index 23181a44e..b96967f9d 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/world/gen/WorldGenDrT.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/world/gen/WorldGenDrT.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.world.gen; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/world/gen/layer/GenLayerBiomesDL.java b/src/main/java/com/shinoow/abyssalcraft/common/world/gen/layer/GenLayerBiomesDL.java index ea9bd9eef..72aa362c9 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/world/gen/layer/GenLayerBiomesDL.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/world/gen/layer/GenLayerBiomesDL.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.world.gen.layer; diff --git a/src/main/java/com/shinoow/abyssalcraft/common/world/gen/layer/GenLayerDL.java b/src/main/java/com/shinoow/abyssalcraft/common/world/gen/layer/GenLayerDL.java index ac6407507..3cbc6622f 100644 --- a/src/main/java/com/shinoow/abyssalcraft/common/world/gen/layer/GenLayerDL.java +++ b/src/main/java/com/shinoow/abyssalcraft/common/world/gen/layer/GenLayerDL.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.common.world.gen.layer; diff --git a/src/main/java/com/shinoow/abyssalcraft/core/ACCorePlugin.java b/src/main/java/com/shinoow/abyssalcraft/core/ACCorePlugin.java deleted file mode 100644 index 64732e3c4..000000000 --- a/src/main/java/com/shinoow/abyssalcraft/core/ACCorePlugin.java +++ /dev/null @@ -1,64 +0,0 @@ -/**AbyssalCraft Core - *Copyright 2012-2014 Shinoow - * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. - */ -package com.shinoow.abyssalcraft.core; - -import java.io.File; -import java.util.Map; - -import cpw.mods.fml.relauncher.IFMLCallHook; -import cpw.mods.fml.relauncher.IFMLLoadingPlugin; -import cpw.mods.fml.relauncher.IFMLLoadingPlugin.MCVersion; -import cpw.mods.fml.relauncher.IFMLLoadingPlugin.Name; -import cpw.mods.fml.relauncher.IFMLLoadingPlugin.TransformerExclusions; - -@Name("AbyssalCraft Core") -@MCVersion("1.7.2") -@TransformerExclusions("com.shinoow.abyssalcraft.core") -public class ACCorePlugin implements IFMLLoadingPlugin, IFMLCallHook { - - public static File coreLocation; - - @Override - public String[] getASMTransformerClass() { - return new String[0]; - } - - @Override - public String getModContainerClass() { - return Core.class.getName(); - } - - @Override - public String getSetupClass() { - return "com.shinoow.abyssalcraft.core.ACCorePlugin"; - } - - @Override - public void injectData(Map data) { - if(data.containsKey("coremodLocation")) - coreLocation = (File) data.get("coremodLocation"); - } - - @Override - public Void call() throws Exception { - return null; - } - - @Override - public String getAccessTransformerClass() { - return null; - } -} \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/core/Core.java b/src/main/java/com/shinoow/abyssalcraft/core/Core.java deleted file mode 100644 index 74ce44269..000000000 --- a/src/main/java/com/shinoow/abyssalcraft/core/Core.java +++ /dev/null @@ -1,211 +0,0 @@ -/**AbyssalCraft Core - *Copyright 2012-2014 Shinoow - * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. - */ -package com.shinoow.abyssalcraft.core; - -import java.io.File; -import java.lang.reflect.*; -import java.util.*; - -import net.minecraft.potion.*; -import net.minecraftforge.common.config.Configuration; - -import com.google.common.collect.ImmutableList; -import com.google.common.eventbus.*; -import com.shinoow.abyssalcraft.core.common.CommonProxy; -import com.shinoow.abyssalcraft.core.handlers.CraftingHandler; -import com.shinoow.abyssalcraft.core.util.*; - -import cpw.mods.fml.client.*; -import cpw.mods.fml.client.event.ConfigChangedEvent; -import cpw.mods.fml.common.*; -import cpw.mods.fml.common.event.*; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; - -public class Core extends DummyModContainer { - - public static final String version = "1.2.0"; - public static final String modid = "accore"; - public static final String name = "AbyssalCraft Core"; - - public static Configuration cfg; - - public static boolean canRenderStarspawn; - - public static HashMap potionRequirements = null; - public static HashMap potionAmplifiers = null; - - public Core() { - super(new ModMetadata()); - ModMetadata meta = getMetadata(); - meta.modId = modid; - meta.name = name; - meta.version = version; - meta.credits = "shinoow (coding)"; - meta.authorList = Arrays.asList("shinoow"); - meta.description = "Library used by AbyssalCraft mods - contains API as well"; - meta.url = "https://shinoow.github.io/AbyssalCraft/"; - meta.updateUrl = "https://shinoow.github.io/AbyssalCraft/"; - meta.screenshots = new String[0]; - meta.logoFile = "assets/abyssalcraft/textures/logo_core.png"; - } - - @SidedProxy(clientSide = "com.shinoow.abyssalcraft.core.client.ClientProxy", - serverSide = "com.shinoow.abyssalcraft.core.common.CommonProxy") - public static CommonProxy proxy; - - @SuppressWarnings("unchecked") - @Subscribe - public void preInit(FMLPreInitializationEvent event) { - - CoreLogger.info("Pre-initializing Core."); - Potion[] potionTypes = null; - for (Field f : Potion.class.getDeclaredFields()) { - f.setAccessible(true); - try { - if (f.getName().equals("potionTypes") || f.getName().equals("field_76425_a")) { - Field modfield = Field.class.getDeclaredField("modifiers"); - modfield.setAccessible(true); - modfield.setInt(f, f.getModifiers() & ~Modifier.FINAL); - - potionTypes = (Potion[])f.get(null); - final Potion[] newPotionTypes = new Potion[256]; - System.arraycopy(potionTypes, 0, newPotionTypes, 0, potionTypes.length); - f.set(null, newPotionTypes); - } - } - catch (Exception e) { - System.err.println("Whoops, something screwed up here, please report this to shinoow:"); - System.err.println(e); - } - } - for(Field f : PotionHelper.class.getDeclaredFields()) - try { - if(f.getName().equals("potionRequirements") || f.getName().equals("field_77927_l")){ - f.setAccessible(true); - try { - potionRequirements = (HashMap)f.get(null); - } catch (IllegalArgumentException e) { - System.err.println("Whoops, something screwed up here, please report this to shinoow:"); - e.printStackTrace(); - } catch (IllegalAccessException e) { - System.err.println("Whoops, something screwed up here, please report this to shinoow:"); - e.printStackTrace(); - } - } - if(f.getName().equals("potionAmplifiers") || f.getName().equals("field_77928_m")){ - f.setAccessible(true); - try { - potionAmplifiers = (HashMap)f.get(null); - } catch (IllegalArgumentException e) { - System.err.println("Whoops, something screwed up here, please report this to shinoow:"); - e.printStackTrace(); - } catch (IllegalAccessException e) { - System.err.println("Whoops, something screwed up here, please report this to shinoow:"); - e.printStackTrace(); - } - } - } catch (SecurityException e) { - System.err.println("Whoops, something screwed up here, please report this to shinoow:"); - e.printStackTrace(); - } - - FMLCommonHandler.instance().bus().register(new CraftingHandler()); - FMLCommonHandler.instance().bus().register(this); - cfg = new Configuration(event.getSuggestedConfigurationFile()); - syncConfig(); - if(canRenderStarspawn == true) - CoreLogger.info("RenderPlayer Override enabled, the Coralium Longbow will render twice in your hand now."); - else CoreLogger.info("RenderPlayer Override disabled, Compatibility level +100."); - CoreRegistry.registerVanillaDimensions(); - proxy.PreInit(); - } - - @Subscribe - public void Init(FMLInitializationEvent event) { - - CoreLogger.info("Initializing Core."); - proxy.Init(); - proxy.registerRenderThings(); - } - - @Subscribe - public void postInit(FMLPostInitializationEvent event) { - - CoreLogger.info("Post-initializing Core."); - proxy.PostInit(); - CoreLogger.info("Core loaded."); - } - - public static void syncConfig(){ - - canRenderStarspawn = cfg.get("render", "RenderPlayer Override", true, "Whether or not to override the player model" - + "(set false for compatibility with other mods that alters the player model)").getBoolean(); - - if(cfg.hasChanged()) - cfg.save(); - } - - @SubscribeEvent - public void onConfigChanged(ConfigChangedEvent.OnConfigChangedEvent eventArgs) { - if(eventArgs.modID.equals("accore")) - syncConfig(); - } - - @Override - public boolean registerBus(EventBus bus, LoadController controller) { - bus.register(this); - return true; - } - - @Override - public File getSource() { - return ACCorePlugin.coreLocation; - } - - @Override - public Class getCustomResourcePackClass() { - return getSource().isDirectory() ? FMLFolderResourcePack.class : FMLFileResourcePack.class; - } - - @Override - public String getGuiClassName() - { - return "com.shinoow.abyssalcraft.core.client.config.ACCoreGuiFactory"; - } - - @Override - public List getOwnedPackages() { - return ImmutableList.of( - "com.shinoow.abyssalcraft.core", - "com.shinoow.abyssalcraft.core.api", - "com.shinoow.abyssalcraft.core.api.addon", - "com.shinoow.abyssalcraft.core.api.block", - "com.shinoow.abyssalcraft.core.api.enchantment", - "com.shinoow.abyssalcraft.core.api.entity", - "com.shinoow.abyssalcraft.core.api.item", - "com.shinoow.abyssalcraft.core.api.potion", - "com.shinoow.abyssalcraft.core.api.render", - "com.shinoow.abyssalcraft.core.client", - "com.shinoow.abyssalcraft.core.client.config", - "com.shinoow.abyssalcraft.core.client.model", - "com.shinoow.abyssalcraft.core.client.render", - "com.shinoow.abyssalcraft.core.common", - "com.shinoow.abyssalcraft.core.handlers", - "com.shinoow.abyssalcraft.core.util", - "com.shinoow.abyssalcraft.core.util.recipes" - ); - } -} \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/core/api/ACMod.java b/src/main/java/com/shinoow/abyssalcraft/core/api/ACMod.java deleted file mode 100644 index eca63381d..000000000 --- a/src/main/java/com/shinoow/abyssalcraft/core/api/ACMod.java +++ /dev/null @@ -1,33 +0,0 @@ -/**AbyssalCraft Core - *Copyright 2012-2014 Shinoow - * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. - */ -package com.shinoow.abyssalcraft.core.api; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * Annotation to define AbyssalCraft to Core, - * DO NOT USE THIS ON ANY MOD CLASSES! - * @author shinoow - * - */ -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.TYPE) -public @interface ACMod { - -} \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/core/api/addon/IACAddon.java b/src/main/java/com/shinoow/abyssalcraft/core/api/addon/IACAddon.java deleted file mode 100644 index d69728ebd..000000000 --- a/src/main/java/com/shinoow/abyssalcraft/core/api/addon/IACAddon.java +++ /dev/null @@ -1,43 +0,0 @@ -/**AbyssalCraft Core - *Copyright 2012-2014 Shinoow - * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. - */ -package com.shinoow.abyssalcraft.core.api.addon; - -import com.shinoow.abyssalcraft.core.api.addon.ACAddon.AddonType; - -/** - * Coremod interface for AbyssalCraft add-ons, - * implement it in the dummy class - * @author shinoow - * - */ -public interface IACAddon { - - /** - * ModId, used for indexing multiple add-ons - */ - String getModId(); - - /** - * Name of the add-on (same as mod name) - */ - String getName(); - - /** - * What kind of add-on (can be multiple kinds) - */ - AddonType[] getType(); - -} \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/core/api/addon/package-info.java b/src/main/java/com/shinoow/abyssalcraft/core/api/addon/package-info.java deleted file mode 100644 index c73f4ee84..000000000 --- a/src/main/java/com/shinoow/abyssalcraft/core/api/addon/package-info.java +++ /dev/null @@ -1,3 +0,0 @@ -@API(apiVersion="1.0",owner="accore",provides="AbyssalCraftAPI") -package com.shinoow.abyssalcraft.core.api.addon; -import cpw.mods.fml.common.API; \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/core/api/block/package-info.java b/src/main/java/com/shinoow/abyssalcraft/core/api/block/package-info.java deleted file mode 100644 index 97976b50f..000000000 --- a/src/main/java/com/shinoow/abyssalcraft/core/api/block/package-info.java +++ /dev/null @@ -1,3 +0,0 @@ -@API(apiVersion="1.0",owner="accore",provides="AbyssalCraftAPI") -package com.shinoow.abyssalcraft.core.api.block; -import cpw.mods.fml.common.API; \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/core/api/damagesource/ACDamageSource.java b/src/main/java/com/shinoow/abyssalcraft/core/api/damagesource/ACDamageSource.java deleted file mode 100644 index b2e0b7cd0..000000000 --- a/src/main/java/com/shinoow/abyssalcraft/core/api/damagesource/ACDamageSource.java +++ /dev/null @@ -1,31 +0,0 @@ -/**AbyssalCraft Core - *Copyright 2012-2014 Shinoow - * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. - */ -package com.shinoow.abyssalcraft.core.api.damagesource; - -import net.minecraft.util.DamageSource; - -/** - * Contains all Damagesources added in AbyssalCraft. - * This was originally in the main mod, but moved over to Core so other mods can use it. - * @author shinoow - * - */ -public class ACDamageSource { - - public static DamageSource coralium = new DamageSource("coralium").setDamageBypassesArmor().setMagicDamage(); - public static DamageSource dread = new DamageSource("dread").setDamageBypassesArmor().setMagicDamage(); - public static DamageSource antimatter = new DamageSource("antimatter").setDamageBypassesArmor().setMagicDamage(); -} \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/core/api/damagesource/package-info.java b/src/main/java/com/shinoow/abyssalcraft/core/api/damagesource/package-info.java deleted file mode 100644 index f4b3cfb8a..000000000 --- a/src/main/java/com/shinoow/abyssalcraft/core/api/damagesource/package-info.java +++ /dev/null @@ -1,3 +0,0 @@ -@API(apiVersion="1.0",owner="accore",provides="AbyssalCraftAPI") -package com.shinoow.abyssalcraft.core.api.damagesource; -import cpw.mods.fml.common.API; \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/core/api/enchantment/ACEnchantments.java b/src/main/java/com/shinoow/abyssalcraft/core/api/enchantment/ACEnchantments.java deleted file mode 100644 index 58b9b9eb9..000000000 --- a/src/main/java/com/shinoow/abyssalcraft/core/api/enchantment/ACEnchantments.java +++ /dev/null @@ -1,31 +0,0 @@ -/**AbyssalCraft Core - *Copyright 2012-2014 Shinoow - * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. - */ -package com.shinoow.abyssalcraft.core.api.enchantment; - -import net.minecraft.enchantment.Enchantment; - -/** - * Contains all potion effects added in AbyssalCraft - * @author shinoow - * - */ -public class ACEnchantments { - - public static Enchantment coralium_infusion = Enchantment.enchantmentsList[150]; - public static Enchantment dread_infusion = Enchantment.enchantmentsList[151]; - public static Enchantment light_pierce = Enchantment.enchantmentsList[152]; - // public static Enchantment iron_wall = Enchantment.enchantmentsList[153]; -} \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/core/api/enchantment/package-info.java b/src/main/java/com/shinoow/abyssalcraft/core/api/enchantment/package-info.java deleted file mode 100644 index a38706a5c..000000000 --- a/src/main/java/com/shinoow/abyssalcraft/core/api/enchantment/package-info.java +++ /dev/null @@ -1,3 +0,0 @@ -@API(apiVersion="1.0",owner="accore",provides="AbyssalCraftAPI") -package com.shinoow.abyssalcraft.core.api.enchantment; -import cpw.mods.fml.common.API; \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/core/api/entity/ACEntities.java b/src/main/java/com/shinoow/abyssalcraft/core/api/entity/ACEntities.java deleted file mode 100644 index 5985bde0f..000000000 --- a/src/main/java/com/shinoow/abyssalcraft/core/api/entity/ACEntities.java +++ /dev/null @@ -1,64 +0,0 @@ -/**AbyssalCraft Core - *Copyright 2012-2014 Shinoow - * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. - */ -package com.shinoow.abyssalcraft.core.api.entity; - -import cpw.mods.fml.common.registry.EntityRegistry; - -/** - * Contains the names of all mobs added in AbyssalCraft. - * Use these with {@link EntityRegistry} to make them spawn in your biomes. - * @author shinoow - * - */ -public class ACEntities { - - public static String depths_ghoul = "depthsghoul"; - public static String evil_pig = "evilpig"; - public static String abyssal_zombie = "abyssalzombie"; - public static String jzahar = "Jzahar"; - public static String abyssalnite_golem = "abygolem"; - public static String dreaded_abyssalnite_golem = "dreadgolem"; - public static String dreadguard = "dreadguard"; - public static String spectral_dragon = "dragonminion"; - public static String asorah = "dragonboss"; - public static String shadow_creature = "shadowcreature"; - public static String shadow_monster = "shadowmonster"; - public static String dreadling = "dreadling"; - public static String dread_spawn = "dreadspawn"; - public static String demon_pig = "demonpig"; - public static String skeleton_goliath = "gskeleton"; - public static String spawn_of_chagaroth = "chagarothspawn"; - public static String fist_of_chagaroth = "chagarothfist"; - public static String chagaroth = "chagaroth"; - public static String shadow_beast = "shadowbeast"; - public static String sacthoth = "shadowboss"; - public static String abyssal_anti_zombie = "antiabyssalzombie"; - public static String anti_bat = "antibat"; - public static String anti_chicken = "antichicken"; - public static String anti_cow = "anticow"; - public static String anti_creeper = "anticreeper"; - public static String anti_ghoul = "antighoul"; - public static String anti_pig = "antipig"; - public static String anti_player = "antiplayer"; - public static String anti_Skeleton = "antiskeleton"; - public static String anti_spider = "antispider"; - public static String anti_zombie = "antizombie"; - public static String lesser_shoggoth = "lessershoggoth"; - public static String shadow_titan = "shadowtitan"; - public static String omothol_warden = "omotholwarden"; - public static String minion_of_the_gatekeeper = "jzaharminion"; - public static String omothol_ghoul = "omotholghoul"; -} \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/core/api/entity/IAntiEntity.java b/src/main/java/com/shinoow/abyssalcraft/core/api/entity/IAntiEntity.java deleted file mode 100644 index b46d3edc6..000000000 --- a/src/main/java/com/shinoow/abyssalcraft/core/api/entity/IAntiEntity.java +++ /dev/null @@ -1,25 +0,0 @@ -/**AbyssalCraft Core - *Copyright 2012-2014 Shinoow - * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. - */ -package com.shinoow.abyssalcraft.core.api.entity; - -/** - * Interface to define a entity that's immune to the Antimatter potion effect - * @author shinoow - * - */ -public interface IAntiEntity { - -} \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/core/api/entity/ICoraliumEntity.java b/src/main/java/com/shinoow/abyssalcraft/core/api/entity/ICoraliumEntity.java deleted file mode 100644 index fd84e65f6..000000000 --- a/src/main/java/com/shinoow/abyssalcraft/core/api/entity/ICoraliumEntity.java +++ /dev/null @@ -1,25 +0,0 @@ -/**AbyssalCraft Core - *Copyright 2012-2014 Shinoow - * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. - */ -package com.shinoow.abyssalcraft.core.api.entity; - -/** - * Interface to define a entity that's immune to the Coralium Plague - * @author shinoow - * - */ -public interface ICoraliumEntity { - -} \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/core/api/entity/IDreadEntity.java b/src/main/java/com/shinoow/abyssalcraft/core/api/entity/IDreadEntity.java deleted file mode 100644 index f0fa49f18..000000000 --- a/src/main/java/com/shinoow/abyssalcraft/core/api/entity/IDreadEntity.java +++ /dev/null @@ -1,25 +0,0 @@ -/**AbyssalCraft Core - *Copyright 2012-2014 Shinoow - * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. - */ -package com.shinoow.abyssalcraft.core.api.entity; - -/** - * Interface to define a entity that's immune to the Dread Plague - * @author shinoow - * - */ -public interface IDreadEntity { - -} \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/core/api/entity/package-info.java b/src/main/java/com/shinoow/abyssalcraft/core/api/entity/package-info.java deleted file mode 100644 index 1d1a5eb12..000000000 --- a/src/main/java/com/shinoow/abyssalcraft/core/api/entity/package-info.java +++ /dev/null @@ -1,3 +0,0 @@ -@API(apiVersion="1.0",owner="accore",provides="AbyssalCraftAPI") -package com.shinoow.abyssalcraft.core.api.entity; -import cpw.mods.fml.common.API; \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/core/api/item/package-info.java b/src/main/java/com/shinoow/abyssalcraft/core/api/item/package-info.java deleted file mode 100644 index f3d0c0cdb..000000000 --- a/src/main/java/com/shinoow/abyssalcraft/core/api/item/package-info.java +++ /dev/null @@ -1,3 +0,0 @@ -@API(apiVersion="1.0",owner="accore",provides="AbyssalCraftAPI") -package com.shinoow.abyssalcraft.core.api.item; -import cpw.mods.fml.common.API; \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/core/api/package-info.java b/src/main/java/com/shinoow/abyssalcraft/core/api/package-info.java deleted file mode 100644 index 3508583d7..000000000 --- a/src/main/java/com/shinoow/abyssalcraft/core/api/package-info.java +++ /dev/null @@ -1,3 +0,0 @@ -@API(apiVersion="1.0",owner="accore",provides="AbyssalCraftAPI") -package com.shinoow.abyssalcraft.core.api; -import cpw.mods.fml.common.API; \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/core/api/potion/ACPotions.java b/src/main/java/com/shinoow/abyssalcraft/core/api/potion/ACPotions.java deleted file mode 100644 index 2b21631f1..000000000 --- a/src/main/java/com/shinoow/abyssalcraft/core/api/potion/ACPotions.java +++ /dev/null @@ -1,30 +0,0 @@ -/**AbyssalCraft Core - *Copyright 2012-2014 Shinoow - * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. - */ -package com.shinoow.abyssalcraft.core.api.potion; - -import net.minecraft.potion.Potion; - -/** - * Contains all potion effects added in AbyssalCraft - * @author shinoow - * - */ -public class ACPotions { - - public static Potion Coralium_plague = Potion.potionTypes[100]; - public static Potion Dread_plague = Potion.potionTypes[101]; - public static Potion Antimatter = Potion.potionTypes[102]; -} \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/core/api/potion/package-info.java b/src/main/java/com/shinoow/abyssalcraft/core/api/potion/package-info.java deleted file mode 100644 index f5ca13a7f..000000000 --- a/src/main/java/com/shinoow/abyssalcraft/core/api/potion/package-info.java +++ /dev/null @@ -1,3 +0,0 @@ -@API(apiVersion="1.0",owner="accore",provides="AbyssalCraftAPI") -package com.shinoow.abyssalcraft.core.api.potion; -import cpw.mods.fml.common.API; \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/core/api/render/package-info.java b/src/main/java/com/shinoow/abyssalcraft/core/api/render/package-info.java deleted file mode 100644 index f4b05f9e5..000000000 --- a/src/main/java/com/shinoow/abyssalcraft/core/api/render/package-info.java +++ /dev/null @@ -1,3 +0,0 @@ -@API(apiVersion="1.0",owner="accore",provides="AbyssalCraftAPI") -package com.shinoow.abyssalcraft.core.api.render; -import cpw.mods.fml.common.API; \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/core/client/ClientProxy.java b/src/main/java/com/shinoow/abyssalcraft/core/client/ClientProxy.java deleted file mode 100644 index 6e4a2f577..000000000 --- a/src/main/java/com/shinoow/abyssalcraft/core/client/ClientProxy.java +++ /dev/null @@ -1,36 +0,0 @@ -/**AbyssalCraft Core - *Copyright 2012-2014 Shinoow - * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. - */ -package com.shinoow.abyssalcraft.core.client; - -import net.minecraft.entity.player.EntityPlayer; - -import com.shinoow.abyssalcraft.core.Core; -import com.shinoow.abyssalcraft.core.client.render.RenderPlayerAC; -import com.shinoow.abyssalcraft.core.common.CommonProxy; - -import cpw.mods.fml.client.registry.RenderingRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -public class ClientProxy extends CommonProxy { - - @Override - @SideOnly(Side.CLIENT) - public void registerRenderThings(){ - if(Core.canRenderStarspawn == true) - RenderingRegistry.registerEntityRenderingHandler(EntityPlayer.class, new RenderPlayerAC()); - } -} \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/core/client/config/ACCoreConfigGUI.java b/src/main/java/com/shinoow/abyssalcraft/core/client/config/ACCoreConfigGUI.java deleted file mode 100644 index 0be805725..000000000 --- a/src/main/java/com/shinoow/abyssalcraft/core/client/config/ACCoreConfigGUI.java +++ /dev/null @@ -1,30 +0,0 @@ -/**AbyssalCraft Core - *Copyright 2012-2014 Shinoow - * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. - */ -package com.shinoow.abyssalcraft.core.client.config; - -import net.minecraft.client.gui.GuiScreen; -import net.minecraftforge.common.config.ConfigElement; -import com.shinoow.abyssalcraft.core.Core; -import cpw.mods.fml.client.config.GuiConfig; - -public class ACCoreConfigGUI extends GuiConfig { - @SuppressWarnings({ "rawtypes", "unchecked" }) - public ACCoreConfigGUI(GuiScreen parent) { - super(parent, - new ConfigElement(Core.cfg.getCategory("render")).getChildElements(), - "accore", true, true, "AbyssalCraft Core"); - } -} \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/core/client/config/ACCoreGuiFactory.java b/src/main/java/com/shinoow/abyssalcraft/core/client/config/ACCoreGuiFactory.java deleted file mode 100644 index 5533b4d49..000000000 --- a/src/main/java/com/shinoow/abyssalcraft/core/client/config/ACCoreGuiFactory.java +++ /dev/null @@ -1,44 +0,0 @@ -/**AbyssalCraft Core - *Copyright 2012-2014 Shinoow - * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. - */ -package com.shinoow.abyssalcraft.core.client.config; - -import java.util.Set; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiScreen; -import cpw.mods.fml.client.IModGuiFactory; - -public class ACCoreGuiFactory implements IModGuiFactory { - @Override - public void initialize(Minecraft minecraftInstance) { - - } - - @Override - public Class mainConfigGuiClass() { - return ACCoreConfigGUI.class; - } - - @Override - public Set runtimeGuiCategories() { - return null; - } - - @Override - public RuntimeOptionGuiHandler getHandlerFor(RuntimeOptionCategoryElement element) { - return null; - } -} \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/core/common/CommonProxy.java b/src/main/java/com/shinoow/abyssalcraft/core/common/CommonProxy.java deleted file mode 100644 index b8091091a..000000000 --- a/src/main/java/com/shinoow/abyssalcraft/core/common/CommonProxy.java +++ /dev/null @@ -1,47 +0,0 @@ -/**AbyssalCraft Core - *Copyright 2012-2014 Shinoow - * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. - */ -package com.shinoow.abyssalcraft.core.common; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; -import cpw.mods.fml.common.network.IGuiHandler; - -public class CommonProxy implements IGuiHandler { - - @Override - public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - - return null; - } - - @Override - public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - - return null; - } - - public void registerRenderThings() { - } - - public void PreInit() { - } - - public void Init() { - } - - public void PostInit() { - } -} \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/core/handlers/CraftingHandler.java b/src/main/java/com/shinoow/abyssalcraft/core/handlers/CraftingHandler.java deleted file mode 100644 index ea7f57bce..000000000 --- a/src/main/java/com/shinoow/abyssalcraft/core/handlers/CraftingHandler.java +++ /dev/null @@ -1,60 +0,0 @@ -/**AbyssalCraft Core - *Copyright 2012-2014 Shinoow - * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. - */ -package com.shinoow.abyssalcraft.core.handlers; - -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; - -import com.shinoow.abyssalcraft.core.api.item.ItemUpgradeKit; - -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent; - -public class CraftingHandler { - - @SubscribeEvent - public void onCraftingEvent(PlayerEvent.ItemCraftedEvent event) - { - for(int h=0; h < event.craftMatrix.getSizeInventory(); h++) - if(event.craftMatrix.getStackInSlot(h) != null) - for(int i=0; i < event.craftMatrix.getSizeInventory(); i++) - if(event.craftMatrix.getStackInSlot(i) != null) - { - ItemStack k = event.craftMatrix.getStackInSlot(h); - ItemStack j = event.craftMatrix.getStackInSlot(i); - - if(k.getItem() != null && j.getItem() != null && k.getItem() instanceof ItemUpgradeKit) - { - NBTTagCompound nbttest = new NBTTagCompound(); - NBTTagList tag = new NBTTagList(); - - if(j.isItemEnchanted()) - { - NBTTagList test = j.stackTagCompound.getTagList("ench", 10); - tag = test; - } - ItemStack l = event.crafting; - if(j.isItemEnchanted()) - { - l.stackTagCompound = nbttest; - l.stackTagCompound.setTag("ench", tag); - } - event.craftMatrix.setInventorySlotContents(i, l); - } - } - } -} \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/core/util/CoreLogger.java b/src/main/java/com/shinoow/abyssalcraft/core/util/CoreLogger.java deleted file mode 100644 index 229cc1272..000000000 --- a/src/main/java/com/shinoow/abyssalcraft/core/util/CoreLogger.java +++ /dev/null @@ -1,47 +0,0 @@ -/**AbyssalCraft Core - *Copyright 2012-2014 Shinoow - * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. - */ -package com.shinoow.abyssalcraft.core.util; - -import org.apache.logging.log4j.Level; - -import cpw.mods.fml.common.FMLLog; - -public class CoreLogger { - - public static void log(Level level, String format, Object... data) { - FMLLog.log("AbyssalCraft Core", level, format, data); - } - - public static void severe(String format, Object... data) { - log(Level.ERROR, format, data); - } - - public static void warning(String format, Object... data) { - log(Level.WARN, format, data); - } - - public static void info(String format, Object... data) { - log(Level.INFO, format, data); - } - - public static void fine(String format, Object... data) { - log(Level.DEBUG, format, data); - } - - public static void finer(String format, Object... data) { - log(Level.TRACE, format, data); - } -} \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/core/util/CoreRegistry.java b/src/main/java/com/shinoow/abyssalcraft/core/util/CoreRegistry.java deleted file mode 100644 index 5ec408ae4..000000000 --- a/src/main/java/com/shinoow/abyssalcraft/core/util/CoreRegistry.java +++ /dev/null @@ -1,353 +0,0 @@ -/**AbyssalCraft Core - *Copyright 2012-2014 Shinoow - * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. - */ -package com.shinoow.abyssalcraft.core.util; - -import java.util.*; - -import net.minecraft.block.Block; -import net.minecraft.item.*; -import net.minecraft.item.crafting.FurnaceRecipes; -import net.minecraft.world.*; -import net.minecraftforge.common.DimensionManager; -import net.minecraftforge.oredict.OreDictionary; - -import com.google.common.collect.Lists; -import com.shinoow.abyssalcraft.core.Core; -import com.shinoow.abyssalcraft.core.util.recipes.*; - -import cpw.mods.fml.common.IFuelHandler; -import cpw.mods.fml.common.registry.GameRegistry; - -/** - * Core's equivalent to FML's {@link GameRegistry} - * @author shinoow - * - */ -public class CoreRegistry { - - private static List crystallizerFuelHandlers = Lists.newArrayList(); - private static List transmutatorFuelHandlers = Lists.newArrayList(); - - /** Hashtable of world providers, will be used for dimension-specific generation */ - private static Hashtable> dimensions = new Hashtable>(); - - /** - * Fuel types, also has support for the vanilla furnace. - * @author shinoow - * - */ - public enum FuelType{ - CRYSTALLIZER, TRANSMUTATOR, FURNACE - } - - /** - * Basic Crystallization - * @param input The block to crystallize - * @param output1 The first crystal output - * @param output2 The second crystal output - * @param xp Amount of exp given - */ - public static void addCrystallization(Block input, ItemStack output1, ItemStack output2, float xp){ - CrystallizerRecipes.crystallization().crystallize(input, output1, output2, xp); - } - - /** - * Basic Crystallization - * @param input The item to crystallize - * @param output1 The first crystal output - * @param output2 The second crystal output - * @param xp Amount of exp given - */ - public static void addCrystallization(Item input, ItemStack output1, ItemStack output2, float xp){ - CrystallizerRecipes.crystallization().crystallize(input, output1, output2, xp); - } - - /** - * Basic Crystallization - * @param input The itemstack to crystallize - * @param output1 The first crystal output - * @param output2 The second crystal output - * @param xp Amount of exp given - */ - public static void addCrystallization(ItemStack input, ItemStack output1, ItemStack output2, float xp){ - CrystallizerRecipes.crystallization().crystallize(input, output1, output2, xp); - } - - /** - * Single-output Crystallization - * @param input The block to crystallize - * @param output The crystal output - * @param xp Amount of exp given - */ - public static void addSingleCrystallization(Block input, ItemStack output, float xp){ - addCrystallization(input, output, null, xp); - } - - /** - * Single-output Crystallization - * @param input The item to crystallize - * @param output The crystal output - * @param xp Amount of exp given - */ - public static void addSingleCrystallization(Item input, ItemStack output, float xp){ - addCrystallization(input, output, null, xp); - } - - /** - * Single-output Crystallization - * @param input The itemstack to crystallize - * @param output The crystal output - * @param xp Amount of exp given - */ - public static void addSingleCrystallization(ItemStack input, ItemStack output, float xp){ - addCrystallization(input, output, null, xp); - } - - /** - * Basic Transmutation - * @param input The block to transmutate - * @param output The transmutated output - * @param xp Amount of exp given - */ - public static void addTransmutation(Block input, ItemStack output, float xp){ - TransmutatorRecipes.transmutation().transmutate(input, output, xp); - } - - /** - * Basic Transmutation - * @param input The item to transmutate - * @param output The transmutated output - * @param xp Amount of exp given - */ - public static void addTransmutation(Item input, ItemStack output, float xp){ - TransmutatorRecipes.transmutation().transmutate(input, output, xp); - } - - /** - * Basic Transmutation - * @param input The itemstack to transmutate - * @param output The transmutated output - * @param xp Amount of exp given - */ - public static void addTransmutation(ItemStack input, ItemStack output, float xp){ - TransmutatorRecipes.transmutation().transmutate(input, output, xp); - } - - /** - * Registers a fuel handler for an AbyssalCraft fuel type - * @param handler The file that implements {@link IFuelHandler} - * @param type The fuel type - */ - public static void registerFuelHandler(IFuelHandler handler, FuelType type){ - switch(type){ - case CRYSTALLIZER: - crystallizerFuelHandlers.add(handler); - break; - case TRANSMUTATOR: - transmutatorFuelHandlers.add(handler); - break; - case FURNACE: - GameRegistry.registerFuelHandler(handler); - } - } - - /** - * Gets the fuel value from an ItemStack, depending on the fuel type - * @param itemStack The ItemStack getting checked - * @param type The fuel type - * @return The fuel value for the specified machine - */ - public static int getFuelValue(ItemStack itemStack, FuelType type){ - int fuelValue = 0; - switch(type){ - case CRYSTALLIZER: - for (IFuelHandler handler : crystallizerFuelHandlers) - fuelValue = Math.max(fuelValue, handler.getBurnTime(itemStack)); - break; - case TRANSMUTATOR: - for (IFuelHandler handler : transmutatorFuelHandlers) - fuelValue = Math.max(fuelValue, handler.getBurnTime(itemStack)); - break; - case FURNACE: - GameRegistry.getFuelValue(itemStack); - } - return fuelValue; - } - - /** - * Smelting through the OreDictionary - * @param input The ore input - * @param output The ore output - * @param xp Amount of exp given - */ - public static void addOreSmelting(String input, String output, float xp){ - Iterator inputIter = OreDictionary.getOres(input).iterator(); - if(!OreDictionary.getOres(output).isEmpty()) - while(inputIter.hasNext()) - FurnaceRecipes.smelting().func_151394_a(inputIter.next(), OreDictionary.getOres(output).iterator().next(), xp); - } - - /** - * OreDictionary specific Crystallization - * @param input The ore input - * @param output1 The first ore output - * @param output2 The second ore output - * @param xp Amount of exp given - */ - public static void addCrystallization(String input, String output1, String output2, float xp){ - Iterator inputIter = OreDictionary.getOres(input).iterator(); - if(!OreDictionary.getOres(output1).isEmpty() && !OreDictionary.getOres(output2).isEmpty()) - while(inputIter.hasNext()) - addCrystallization(inputIter.next(), OreDictionary.getOres(output1).iterator().next(), OreDictionary.getOres(output2).iterator().next(), xp); - } - - /** - * OreDictionary specific Crystallization - * @param input The ore input - * @param output1 The first ore output - * @param out1 Quantity of the first output - * @param output2 The second ore output - * @param out2 Quantity of the second output - * @param xp Amount of exp given - */ - public static void addCrystallization(String input, String output1, int out1, String output2, int out2, float xp){ - Iterator inputIter = OreDictionary.getOres(input).iterator(); - if(!OreDictionary.getOres(output1).isEmpty() && !OreDictionary.getOres(output2).isEmpty()) - while(inputIter.hasNext()) - addCrystallization(inputIter.next(), new ItemStack(OreDictionary.getOres(output1).iterator().next().getItem(), out1), new ItemStack(OreDictionary.getOres(output2).iterator().next().getItem(), out2), xp); - } - - /** - * OreDictionary specific single-output Crystallization - * @param input The ore input - * @param output The ore output - * @param xp Amount of exp given - */ - public static void addSingleCrystallization(String input, String output, float xp){ - Iterator inputIter = OreDictionary.getOres(input).iterator(); - if(!OreDictionary.getOres(output).isEmpty()) - while(inputIter.hasNext()) - addSingleCrystallization(inputIter.next(), new ItemStack(OreDictionary.getOres(output).iterator().next().getItem()), xp); - } - - /** - * OreDictionary specific single-output Crystallization - * @param input The ore input - * @param output The ore output - * @param out The output quantity - * @param xp Amount of exp given - */ - public static void addSingleCrystallization(String input, String output, int out, float xp){ - Iterator inputIter = OreDictionary.getOres(input).iterator(); - if(!OreDictionary.getOres(output).isEmpty()) - while(inputIter.hasNext()) - addSingleCrystallization(inputIter.next(), new ItemStack(OreDictionary.getOres(output).iterator().next().getItem(), out), xp); - } - - /** - * OreDictionary specific Transmutation - * @param input The ore input - * @param output The ore output - * @param xp Amount of exp given - */ - public static void addTransmutation(String input, String output, float xp){ - Iterator inputIter = OreDictionary.getOres(input).iterator(); - if(!OreDictionary.getOres(output).isEmpty()) - while(inputIter.hasNext()) - addTransmutation(inputIter.next(), new ItemStack(OreDictionary.getOres(output).iterator().next().getItem()), xp); - } - - /** - * OreDictionary specific Transmutation - * @param input The ore input - * @param output The ore output - * @param out The output quantity - * @param xp Amount of exp given - */ - public static void addTransmutation(String input, String output, int out, float xp){ - Iterator inputIter = OreDictionary.getOres(input).iterator(); - if(!OreDictionary.getOres(output).isEmpty()) - while(inputIter.hasNext()) - addTransmutation(inputIter.next(), new ItemStack(OreDictionary.getOres(output).iterator().next().getItem(), out), xp); - } - - /** - * OreDictionary specific Transmutation - * @param input The ore input - * @param output The ore output - * @param out The output quantity - * @param meta The output metadata - * @param xp Amount of exp given - */ - public static void addTransmutation(String input, String output, int out, int meta, float xp){ - Iterator inputIter = OreDictionary.getOres(input).iterator(); - if(!OreDictionary.getOres(output).isEmpty()) - while(inputIter.hasNext()) - addTransmutation(inputIter.next(), new ItemStack(OreDictionary.getOres(output).iterator().next().getItem(), out, meta), xp); - } - - /** - * Adds a bit sequence used to calculate the status on a potion. - * This description probably hardly makes any sense, deal with it. - * @param id The potion id - * @param requirements A bit sequence - */ - public static void addPotionRequirements(int id, String requirements){ - Core.potionRequirements.put(Integer.valueOf(id), requirements); - } - - /** - * Adds an amplifier to a potion. - * This description probably hardly makes any sense, deal with it. - * @param id The potion id - * @param amplifier The potion amplifier value (usually 5) - */ - public static void addPotionAmplifiers(int id, String amplifier){ - Core.potionAmplifiers.put(Integer.valueOf(id), amplifier); - } - - /** - * Bridge method for registering a dimension, used to store dimensions in Core - * @param name The dimension name - * @param id The dimension id - * @param provider World provider used for the dimension - * @param keepLoaded Whether the world should be kept loaded at all times - */ - public static void registerDimension(String name, int id, Class provider, boolean keepLoaded){ - registerWorldProvider(name, provider); - DimensionManager.registerProviderType(id, provider, keepLoaded); - DimensionManager.registerDimension(id, id); - } - - /** - * Used to add a dimension to {@link Core}'s dimension list - * @param name Dimension name, used to fetch the dimension later - * @param provider The world provider used for the dimension - * @return True if the world provider was successfully added. - */ - public static boolean registerWorldProvider(String name, Class provider){ - if(dimensions.containsKey(name.toLowerCase())) - return false; - dimensions.put(name.toLowerCase(), provider); - return true; - } - - public static void registerVanillaDimensions(){ - registerWorldProvider("overworld", WorldProviderSurface.class); - registerWorldProvider("nether", WorldProviderHell.class); - registerWorldProvider("end", WorldProviderEnd.class); - } -} \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/core/util/RandomFiltered.java b/src/main/java/com/shinoow/abyssalcraft/core/util/RandomFiltered.java deleted file mode 100644 index 4b6ee6900..000000000 --- a/src/main/java/com/shinoow/abyssalcraft/core/util/RandomFiltered.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.shinoow.abyssalcraft.core.util; - -import java.util.Random; - -public class RandomFiltered extends Random { - - private static final long serialVersionUID = 1L; - - public RandomFiltered(long par2) { - super(par2); - } - - @Override - public int nextInt() { - return this.nextInt(1); - } - - @Override - public int nextInt(int n) { - if (n > 0) - return super.nextInt(n); - return 0; - } -} \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/integration/nei/CrystallizerRecipeHandler.java b/src/main/java/com/shinoow/abyssalcraft/integration/nei/CrystallizerRecipeHandler.java index 25042304e..1566c2c44 100644 --- a/src/main/java/com/shinoow/abyssalcraft/integration/nei/CrystallizerRecipeHandler.java +++ b/src/main/java/com/shinoow/abyssalcraft/integration/nei/CrystallizerRecipeHandler.java @@ -1,3 +1,19 @@ +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.shinoow.abyssalcraft.integration.nei; import java.awt.Rectangle; @@ -12,9 +28,9 @@ import codechicken.nei.*; import codechicken.nei.recipe.TemplateRecipeHandler; +import com.shinoow.abyssalcraft.api.recipe.CrystallizerRecipes; import com.shinoow.abyssalcraft.client.gui.GuiCrystallizer; import com.shinoow.abyssalcraft.common.blocks.tile.TileEntityCrystallizer; -import com.shinoow.abyssalcraft.core.util.recipes.CrystallizerRecipes; public class CrystallizerRecipeHandler extends TemplateRecipeHandler { diff --git a/src/main/java/com/shinoow/abyssalcraft/integration/nei/EngraverRecipeHandler.java b/src/main/java/com/shinoow/abyssalcraft/integration/nei/EngraverRecipeHandler.java new file mode 100644 index 000000000..97cc09008 --- /dev/null +++ b/src/main/java/com/shinoow/abyssalcraft/integration/nei/EngraverRecipeHandler.java @@ -0,0 +1,173 @@ +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.shinoow.abyssalcraft.integration.nei; + +import java.awt.Rectangle; +import java.util.*; +import java.util.Map.Entry; + +import net.minecraft.block.Block; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.init.Blocks; +import net.minecraft.item.*; +import net.minecraft.util.StatCollector; +import codechicken.nei.*; +import codechicken.nei.recipe.TemplateRecipeHandler; + +import com.shinoow.abyssalcraft.api.recipe.EngraverRecipes; +import com.shinoow.abyssalcraft.client.gui.GuiEngraver; + +public class EngraverRecipeHandler extends TemplateRecipeHandler +{ + public class EngravingPair extends CachedRecipe + { + public EngravingPair(ItemStack ingred, ItemStack result) { + ingred.stackSize = 1; + this.ingred = new PositionedStack(ingred, 51, 6); + this.result = new PositionedStack(result, 111, 24); + } + + @Override + public List getIngredients() { + return getCycledIngredients(cycleticks / 48, Arrays.asList(ingred)); + } + + @Override + public PositionedStack getResult() { + return result; + } + + @Override + public PositionedStack getOtherStack() { + return afuels.get(cycleticks / 48 % afuels.size()).stack; + } + + PositionedStack ingred; + PositionedStack result; + } + + public static class FuelPair + { + public FuelPair(ItemStack ingred) { + stack = new PositionedStack(ingred, 51, 42, false); + } + + public PositionedStack stack; + public int burnTime; + } + + public static ArrayList afuels; + public static HashSet efuels; + + @Override + public void loadTransferRects() { + transferRects.add(new RecipeTransferRect(new Rectangle(50, 23, 18, 18), "fuel")); + transferRects.add(new RecipeTransferRect(new Rectangle(74, 23, 24, 18), "engraving")); + } + + @Override + public Class getGuiClass() { + return GuiEngraver.class; + } + + @Override + public String getRecipeName() { + return StatCollector.translateToLocal("container.abyssalcraft.engraver.nei"); + } + + @Override + public TemplateRecipeHandler newInstance() { + if (afuels == null) + findFuels(); + return super.newInstance(); + } + + @Override + public void loadCraftingRecipes(String outputId, Object... results) { + if (outputId.equals("engraving") && getClass() == EngraverRecipeHandler.class) {//don't want subclasses getting a hold of this + Map recipes = EngraverRecipes.engraving().getEngravingList(); + for (Entry recipe : recipes.entrySet()) + arecipes.add(new EngravingPair(recipe.getKey(), recipe.getValue())); + } else + super.loadCraftingRecipes(outputId, results); + } + + @Override + public void loadCraftingRecipes(ItemStack result) { + Map recipes = EngraverRecipes.engraving().getEngravingList(); + for (Entry recipe : recipes.entrySet()) + if (NEIServerUtils.areStacksSameType(recipe.getValue(), result)) + arecipes.add(new EngravingPair(recipe.getKey(), recipe.getValue())); + } + + @Override + public void loadUsageRecipes(String inputId, Object... ingredients) { + if (inputId.equals("fuel") && getClass() == EngraverRecipeHandler.class)//don't want subclasses getting a hold of this + loadCraftingRecipes("engraving"); + else + super.loadUsageRecipes(inputId, ingredients); + } + + @Override + public void loadUsageRecipes(ItemStack ingredient) { + Map recipes = EngraverRecipes.engraving().getEngravingList(); + for (Entry recipe : recipes.entrySet()) + if (NEIServerUtils.areStacksSameTypeCrafting(recipe.getKey(), ingredient)) { + EngravingPair arecipe = new EngravingPair(recipe.getKey(), recipe.getValue()); + arecipe.setIngredientPermutation(Arrays.asList(arecipe.ingred), ingredient); + arecipes.add(arecipe); + } + } + + @Override + public String getGuiTexture() { + return "abyssalcraft:textures/gui/container/engraver.png"; + } + + @Override + public void drawExtras(int recipe) { + drawProgressBar(51, 25, 176, 0, 14, 14, 48, 7); + drawProgressBar(74, 23, 176, 14, 24, 16, 48, 0); + } + + private static Set excludedFuels() { + Set efuels = new HashSet(); + efuels.add(Item.getItemFromBlock(Blocks.brown_mushroom)); + efuels.add(Item.getItemFromBlock(Blocks.red_mushroom)); + efuels.add(Item.getItemFromBlock(Blocks.standing_sign)); + efuels.add(Item.getItemFromBlock(Blocks.wall_sign)); + efuels.add(Item.getItemFromBlock(Blocks.wooden_door)); + efuels.add(Item.getItemFromBlock(Blocks.trapped_chest)); + return efuels; + } + + private static void findFuels() { + afuels = new ArrayList(); + Set efuels = excludedFuels(); + for (ItemStack item : ItemList.items) + if (!efuels.contains(item.getItem())) { + boolean test = EngraverRecipes.engraving().getEngravingTemplates().containsKey(item.getItem()); + if (test) + afuels.add(new FuelPair(item.copy())); + } + } + + @Override + public String getOverlayIdentifier() { + return "engraving"; + } +} diff --git a/src/main/java/com/shinoow/abyssalcraft/integration/nei/NEIACConfig.java b/src/main/java/com/shinoow/abyssalcraft/integration/nei/NEIACConfig.java index 7dcaccc0e..342f46dc6 100644 --- a/src/main/java/com/shinoow/abyssalcraft/integration/nei/NEIACConfig.java +++ b/src/main/java/com/shinoow/abyssalcraft/integration/nei/NEIACConfig.java @@ -1,3 +1,19 @@ +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.shinoow.abyssalcraft.integration.nei; import net.minecraft.item.ItemStack; @@ -15,9 +31,13 @@ public void loadConfig() { API.registerRecipeHandler(new TransmutatorRecipeHandler()); API.registerUsageHandler(new TransmutatorRecipeHandler()); + API.registerRecipeHandler(new EngraverRecipeHandler()); + API.registerUsageHandler(new EngraverRecipeHandler()); + API.hideItem(new ItemStack(AbyssalCraft.devsword)); API.hideItem(new ItemStack(AbyssalCraft.crystallizer_on)); API.hideItem(new ItemStack(AbyssalCraft.transmutator_on)); + API.hideItem(new ItemStack(AbyssalCraft.engraver_on)); } @Override diff --git a/src/main/java/com/shinoow/abyssalcraft/integration/nei/TransmutatorRecipeHandler.java b/src/main/java/com/shinoow/abyssalcraft/integration/nei/TransmutatorRecipeHandler.java index 6c93d412f..18e486bcb 100644 --- a/src/main/java/com/shinoow/abyssalcraft/integration/nei/TransmutatorRecipeHandler.java +++ b/src/main/java/com/shinoow/abyssalcraft/integration/nei/TransmutatorRecipeHandler.java @@ -1,3 +1,19 @@ +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.shinoow.abyssalcraft.integration.nei; import java.awt.Rectangle; @@ -12,9 +28,9 @@ import codechicken.nei.*; import codechicken.nei.recipe.TemplateRecipeHandler; +import com.shinoow.abyssalcraft.api.recipe.TransmutatorRecipes; import com.shinoow.abyssalcraft.client.gui.GuiTransmutator; import com.shinoow.abyssalcraft.common.blocks.tile.TileEntityTransmutator; -import com.shinoow.abyssalcraft.core.util.recipes.TransmutatorRecipes; public class TransmutatorRecipeHandler extends TemplateRecipeHandler { diff --git a/src/main/java/com/shinoow/abyssalcraft/integration/thaumcraft/ACThaumcraftIntegration.java b/src/main/java/com/shinoow/abyssalcraft/integration/thaumcraft/ACThaumcraftIntegration.java new file mode 100644 index 000000000..13d2ff913 --- /dev/null +++ b/src/main/java/com/shinoow/abyssalcraft/integration/thaumcraft/ACThaumcraftIntegration.java @@ -0,0 +1,111 @@ +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.shinoow.abyssalcraft.integration.thaumcraft; + +import net.minecraft.item.ItemStack; + +import com.shinoow.abyssalcraft.AbyssalCraft; +import com.shinoow.abyssalcraft.api.AbyssalCraftAPI.ACEntities; + +import thaumcraft.api.ThaumcraftApi; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; + +public class ACThaumcraftIntegration { + + public static void init(){ + ThaumcraftApi.registerObjectTag(new ItemStack(AbyssalCraft.Darkstone), new AspectList().add(Aspect.EARTH, 2).add(Aspect.DARKNESS, 1)); + ThaumcraftApi.registerObjectTag(new ItemStack(AbyssalCraft.Darkgrass), new AspectList().add(Aspect.EARTH, 1).add(Aspect.PLANT, 1).add(Aspect.DARKNESS, 1)); + ThaumcraftApi.registerObjectTag(new ItemStack(AbyssalCraft.Darkstone_brick), new AspectList().add(Aspect.EARTH, 2).add(Aspect.DARKNESS, 1)); + ThaumcraftApi.registerObjectTag(new ItemStack(AbyssalCraft.Darkstone_cobble), new AspectList().add(Aspect.EARTH, 1).add(Aspect.ENTROPY, 1).add(Aspect.DARKNESS, 1)); + ThaumcraftApi.registerObjectTag(new ItemStack(AbyssalCraft.abyore), new AspectList().add(Aspect.METAL, 3).add(Aspect.EARTH, 1).add(Aspect.CRYSTAL, 1)); + ThaumcraftApi.registerObjectTag(new ItemStack(AbyssalCraft.abydreadore), new AspectList().add(Aspect.METAL, 3).add(Aspect.EARTH, 1).add(Aspect.CRYSTAL, 1).add(Aspect.FIRE, 1)); + ThaumcraftApi.registerObjectTag(new ItemStack(AbyssalCraft.dreadore), new AspectList().add(Aspect.METAL, 3).add(Aspect.EARTH, 1).add(Aspect.CRYSTAL, 1).add(Aspect.FIRE, 1)); + ThaumcraftApi.registerObjectTag(new ItemStack(AbyssalCraft.Coraliumore), new AspectList().add(Aspect.CRYSTAL, 2).add(Aspect.EARTH, 1).add(Aspect.WATER, 1)); + ThaumcraftApi.registerObjectTag(new ItemStack(AbyssalCraft.CoraliumInfusedStone), new AspectList().add(Aspect.CRYSTAL, 2).add(Aspect.EARTH, 1).add(Aspect.WATER, 1)); + ThaumcraftApi.registerObjectTag(new ItemStack(AbyssalCraft.AbyCorOre), new AspectList().add(Aspect.CRYSTAL, 2).add(Aspect.EARTH, 1).add(Aspect.WATER, 1).add(Aspect.ELDRITCH, 1)); + ThaumcraftApi.registerObjectTag(new ItemStack(AbyssalCraft.AbyLCorOre), new AspectList().add(Aspect.METAL, 3).add(Aspect.EARTH, 1).add(Aspect.WATER, 1).add(Aspect.ELDRITCH, 1)); + ThaumcraftApi.registerObjectTag(new ItemStack(AbyssalCraft.AbyPCorOre), new AspectList().add(Aspect.CRYSTAL, 2).add(Aspect.EARTH, 1).add(Aspect.WATER, 1).add(Aspect.ELDRITCH, 1)); + ThaumcraftApi.registerObjectTag(new ItemStack(AbyssalCraft.abystone), new AspectList().add(Aspect.EARTH, 2).add(Aspect.WATER, 1).add(Aspect.ELDRITCH, 1)); + ThaumcraftApi.registerObjectTag(new ItemStack(AbyssalCraft.dreadstone), new AspectList().add(Aspect.EARTH, 2).add(Aspect.FIRE, 1)); + ThaumcraftApi.registerObjectTag(new ItemStack(AbyssalCraft.abydreadstone), new AspectList().add(Aspect.EARTH, 2)); + ThaumcraftApi.registerObjectTag(new ItemStack(AbyssalCraft.Cwater), new AspectList().add(Aspect.WATER, 3).add(Aspect.POISON, 1)); + ThaumcraftApi.registerObjectTag(new ItemStack(AbyssalCraft.anticwater), new AspectList().add(Aspect.WATER, 3).add(Aspect.VOID, 1)); + ThaumcraftApi.registerObjectTag(new ItemStack(AbyssalCraft.ethaxium), new AspectList().add(Aspect.SOUL, 2).add(Aspect.ELDRITCH, 1)); + ThaumcraftApi.registerObjectTag(new ItemStack(AbyssalCraft.ethaxiumbrick), new int[]{0}, new AspectList().add(Aspect.SOUL, 3).add(Aspect.ELDRITCH, 1)); + ThaumcraftApi.registerObjectTag(new ItemStack(AbyssalCraft.ethaxiumbrick), new int[]{1}, new AspectList().add(Aspect.SOUL, 3).add(Aspect.ELDRITCH, 2)); + + ThaumcraftApi.registerObjectTag(new ItemStack(AbyssalCraft.abyingot), new AspectList().add(Aspect.METAL, 3).add(Aspect.MAGIC, 1)); + ThaumcraftApi.registerObjectTag(new ItemStack(AbyssalCraft.Cingot), new AspectList().add(Aspect.METAL, 3).add(Aspect.ELDRITCH, 1)); + ThaumcraftApi.registerObjectTag(new ItemStack(AbyssalCraft.dreadiumingot), new AspectList().add(Aspect.METAL, 3).add(Aspect.FIRE, 1)); + ThaumcraftApi.registerObjectTag(new ItemStack(AbyssalCraft.Coralium), new AspectList().add(Aspect.CRYSTAL, 2).add(Aspect.WATER, 1)); + ThaumcraftApi.registerObjectTag(new ItemStack(AbyssalCraft.ethaxiumIngot), new AspectList().add(Aspect.METAL, 1).add(Aspect.SOUL, 3)); + ThaumcraftApi.registerObjectTag(new ItemStack(AbyssalCraft.cbrick), new AspectList().add(Aspect.FIRE, 1)); + ThaumcraftApi.registerObjectTag(new ItemStack(AbyssalCraft.ethaxium_brick), new AspectList().add(Aspect.FIRE, 1).add(Aspect.SOUL, 2)); + ThaumcraftApi.registerObjectTag(new ItemStack(AbyssalCraft.shadowgem), new AspectList().add(Aspect.CRYSTAL, 3).add(Aspect.DARKNESS, 2)); + ThaumcraftApi.registerObjectTag(new ItemStack(AbyssalCraft.shadowshard), new AspectList().add(Aspect.CRYSTAL, 2).add(Aspect.DARKNESS, 2)); + ThaumcraftApi.registerObjectTag(new ItemStack(AbyssalCraft.shadowfragment), new AspectList().add(Aspect.CRYSTAL, 1).add(Aspect.DARKNESS, 2)); + + ThaumcraftApi.registerObjectTag(new ItemStack(AbyssalCraft.crystalIron), new AspectList().add(Aspect.CRYSTAL, 3).add(Aspect.METAL, 1)); + ThaumcraftApi.registerObjectTag(new ItemStack(AbyssalCraft.crystalSulfur), new AspectList().add(Aspect.CRYSTAL, 3).add(Aspect.FIRE, 1)); + ThaumcraftApi.registerObjectTag(new ItemStack(AbyssalCraft.crystalCarbon), new AspectList().add(Aspect.CRYSTAL, 3).add(Aspect.FIRE, 1)); + ThaumcraftApi.registerObjectTag(new ItemStack(AbyssalCraft.crystalOxygen), new AspectList().add(Aspect.CRYSTAL, 3).add(Aspect.AIR, 1)); + ThaumcraftApi.registerObjectTag(new ItemStack(AbyssalCraft.crystalHydrogen), new AspectList().add(Aspect.CRYSTAL, 3).add(Aspect.FIRE, 1)); + ThaumcraftApi.registerObjectTag(new ItemStack(AbyssalCraft.crystalNitrogen), new AspectList().add(Aspect.CRYSTAL, 3).add(Aspect.COLD, 1)); + ThaumcraftApi.registerObjectTag(new ItemStack(AbyssalCraft.crystalPhosphorus), new AspectList().add(Aspect.CRYSTAL, 3).add(Aspect.MAGIC, 1)); + ThaumcraftApi.registerObjectTag(new ItemStack(AbyssalCraft.crystalPotassium), new AspectList().add(Aspect.CRYSTAL, 3).add(Aspect.METAL, 1)); + ThaumcraftApi.registerObjectTag(new ItemStack(AbyssalCraft.crystalNitrate), new AspectList().add(Aspect.CRYSTAL, 3).add(Aspect.COLD, 1)); + ThaumcraftApi.registerObjectTag(new ItemStack(AbyssalCraft.crystalMethane), new AspectList().add(Aspect.CRYSTAL, 3).add(Aspect.FIRE, 1)); + ThaumcraftApi.registerObjectTag(new ItemStack(AbyssalCraft.crystalRedstone), new AspectList().add(Aspect.CRYSTAL, 3).add(Aspect.MECHANISM, 1)); + ThaumcraftApi.registerObjectTag(new ItemStack(AbyssalCraft.crystalAbyssalnite), new AspectList().add(Aspect.CRYSTAL, 3).add(Aspect.METAL, 1)); + ThaumcraftApi.registerObjectTag(new ItemStack(AbyssalCraft.crystalCoralium), new AspectList().add(Aspect.CRYSTAL, 3).add(Aspect.WATER, 1)); + ThaumcraftApi.registerObjectTag(new ItemStack(AbyssalCraft.crystalDreadium), new AspectList().add(Aspect.CRYSTAL, 3).add(Aspect.FIRE, 1)); + ThaumcraftApi.registerObjectTag(new ItemStack(AbyssalCraft.crystalBlaze), new AspectList().add(Aspect.CRYSTAL, 3).add(Aspect.FIRE, 1)); + ThaumcraftApi.registerObjectTag(new ItemStack(AbyssalCraft.crystalTin), new AspectList().add(Aspect.CRYSTAL, 3).add(Aspect.METAL, 1)); + ThaumcraftApi.registerObjectTag(new ItemStack(AbyssalCraft.crystalCopper), new AspectList().add(Aspect.CRYSTAL, 3).add(Aspect.METAL, 1)); + ThaumcraftApi.registerObjectTag(new ItemStack(AbyssalCraft.crystalSilicon), new AspectList().add(Aspect.CRYSTAL, 3).add(Aspect.METAL, 1)); + ThaumcraftApi.registerObjectTag(new ItemStack(AbyssalCraft.crystalMagnesium), new AspectList().add(Aspect.CRYSTAL, 3).add(Aspect.METAL, 1)); + ThaumcraftApi.registerObjectTag(new ItemStack(AbyssalCraft.crystalAluminium), new AspectList().add(Aspect.CRYSTAL, 3).add(Aspect.METAL, 1)); + ThaumcraftApi.registerObjectTag(new ItemStack(AbyssalCraft.crystalSilica), new AspectList().add(Aspect.CRYSTAL, 3).add(Aspect.METAL, 1)); + ThaumcraftApi.registerObjectTag(new ItemStack(AbyssalCraft.crystalAlumina), new AspectList().add(Aspect.CRYSTAL, 3).add(Aspect.METAL, 1)); + ThaumcraftApi.registerObjectTag(new ItemStack(AbyssalCraft.crystalMagnesia), new AspectList().add(Aspect.CRYSTAL, 3).add(Aspect.METAL, 1)); + ThaumcraftApi.registerObjectTag(new ItemStack(AbyssalCraft.crystalZinc), new AspectList().add(Aspect.CRYSTAL, 3).add(Aspect.METAL, 1)); + + ThaumcraftApi.registerEntityTag(getMobName(ACEntities.depths_ghoul), new AspectList().add(Aspect.DEATH, 5)); + ThaumcraftApi.registerEntityTag(getMobName(ACEntities.evil_pig), new AspectList().add(Aspect.BEAST, 5)); + ThaumcraftApi.registerEntityTag(getMobName(ACEntities.abyssal_zombie), new AspectList().add(Aspect.DEATH, 5)); + ThaumcraftApi.registerEntityTag(getMobName(ACEntities.jzahar), new AspectList().add(Aspect.DEATH, 5).add(Aspect.DARKNESS, 5).add(Aspect.ELDRITCH, 5)); + ThaumcraftApi.registerEntityTag(getMobName(ACEntities.dreadguard), new AspectList().add(Aspect.DEATH, 5).add(Aspect.FLESH, 3)); + ThaumcraftApi.registerEntityTag(getMobName(ACEntities.spectral_dragon), new AspectList().add(Aspect.DEATH, 5).add(Aspect.AIR, 3)); + ThaumcraftApi.registerEntityTag(getMobName(ACEntities.asorah), new AspectList().add(Aspect.DEATH, 5).add(Aspect.AIR, 5)); + ThaumcraftApi.registerEntityTag(getMobName(ACEntities.shadow_creature), new AspectList().add(Aspect.DARKNESS, 5)); + ThaumcraftApi.registerEntityTag(getMobName(ACEntities.shadow_monster), new AspectList().add(Aspect.DARKNESS, 5)); + ThaumcraftApi.registerEntityTag(getMobName(ACEntities.dreadling), new AspectList().add(Aspect.DEATH, 5)); + ThaumcraftApi.registerEntityTag(getMobName(ACEntities.dread_spawn), new AspectList().add(Aspect.DEATH, 5)); + ThaumcraftApi.registerEntityTag(getMobName(ACEntities.demon_pig), new AspectList().add(Aspect.FLESH, 5).add(Aspect.FIRE, 3)); + ThaumcraftApi.registerEntityTag(getMobName(ACEntities.skeleton_goliath), new AspectList().add(Aspect.DEATH, 5)); + ThaumcraftApi.registerEntityTag(getMobName(ACEntities.spawn_of_chagaroth), new AspectList().add(Aspect.DEATH, 5).add(Aspect.FLESH, 3)); + ThaumcraftApi.registerEntityTag(getMobName(ACEntities.fist_of_chagaroth), new AspectList().add(Aspect.DEATH, 5).add(Aspect.FLESH, 3)); + ThaumcraftApi.registerEntityTag(getMobName(ACEntities.chagaroth), new AspectList().add(Aspect.DEATH, 5).add(Aspect.FLESH, 5)); + ThaumcraftApi.registerEntityTag(getMobName(ACEntities.shadow_beast), new AspectList().add(Aspect.DARKNESS, 5)); + ThaumcraftApi.registerEntityTag(getMobName(ACEntities.sacthoth), new AspectList().add(Aspect.DEATH, 5).add(Aspect.DARKNESS, 5)); + } + + public static String getMobName(String name){ + return "abyssalcraft." + name; + } +} \ No newline at end of file diff --git a/src/main/java/com/shinoow/abyssalcraft/update/IUpdateProxy.java b/src/main/java/com/shinoow/abyssalcraft/update/IUpdateProxy.java index ed0019ab5..933c5dafa 100644 --- a/src/main/java/com/shinoow/abyssalcraft/update/IUpdateProxy.java +++ b/src/main/java/com/shinoow/abyssalcraft/update/IUpdateProxy.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.update; diff --git a/src/main/java/com/shinoow/abyssalcraft/update/UpdateProxyClient.java b/src/main/java/com/shinoow/abyssalcraft/update/UpdateProxyClient.java index a4268aab4..1a0b8def5 100644 --- a/src/main/java/com/shinoow/abyssalcraft/update/UpdateProxyClient.java +++ b/src/main/java/com/shinoow/abyssalcraft/update/UpdateProxyClient.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.update; diff --git a/src/main/java/com/shinoow/abyssalcraft/update/UpdateProxyServer.java b/src/main/java/com/shinoow/abyssalcraft/update/UpdateProxyServer.java index 504318588..440bffe88 100644 --- a/src/main/java/com/shinoow/abyssalcraft/update/UpdateProxyServer.java +++ b/src/main/java/com/shinoow/abyssalcraft/update/UpdateProxyServer.java @@ -1,17 +1,18 @@ -/**AbyssalCraft - *Copyright 2012-2014 Shinoow +/** + * AbyssalCraft + * Copyright 2012-2014 Shinoow * - *Licensed under the Apache License, Version 2.0 (the "License"); - *you may not use this file except in compliance with the License. - *You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - *Unless required by applicable law or agreed to in writing, software - *distributed under the License is distributed on an "AS IS" BASIS, - *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - *See the License for the specific language governing permissions and - *limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.shinoow.abyssalcraft.update; diff --git a/src/main/resources/assets/abyssalcraft/lang/en_US.lang b/src/main/resources/assets/abyssalcraft/lang/en_US.lang index f867ae6d0..7d6dd85ab 100644 --- a/src/main/resources/assets/abyssalcraft/lang/en_US.lang +++ b/src/main/resources/assets/abyssalcraft/lang/en_US.lang @@ -497,7 +497,7 @@ item.shoggothFlesh.abyssalwasteland.name=Abyssal Shoggoth Flesh item.shoggothFlesh.dreadlands.name=Dreaded Shoggoth Flesh item.shoggothFlesh.omothol.name=Omothol Shoggoth Flesh item.shoggothFlesh.darkrealm.name=Shadow Shoggoth Flesh -item.eldirtchscale.name=Eldritch Scale +item.eldritchscale.name=Eldritch Scale item.omotholflesh.name=Omothol Ghoul Flesh item.shadowplate.name=Shadow Titan Armor Plate diff --git a/src/main/resources/assets/abyssalcraft/sounds.json b/src/main/resources/assets/abyssalcraft/sounds.json index b055ca510..4af1defc4 100644 --- a/src/main/resources/assets/abyssalcraft/sounds.json +++ b/src/main/resources/assets/abyssalcraft/sounds.json @@ -22,10 +22,20 @@ "dreadguard/hit4" ] }, - "ghoul.pete.death": { + "ghoul.normal.idle": { "category": "hostile", "sounds": [ - "ghoul/pete/death" + "ghoul/normal/idle1", + "ghoul/normal/idle2", + "ghoul/normal/idle3", + "ghoul/normal/idle4", + "ghoul/normal/idle5" + ] + }, + "ghoul.death": { + "category": "hostile", + "sounds": [ + "ghoul/death" ] }, "ghoul.pete.hit": { @@ -69,5 +79,11 @@ "sounds": [ "golem/idle1" ] + }, + "sacthoth.death": { + "category": "hostile", + "sounds": [ + "shadow/sacthoth/death" + ] } } \ No newline at end of file diff --git a/src/main/resources/assets/abyssalcraft/sounds/ghoul/death.ogg b/src/main/resources/assets/abyssalcraft/sounds/ghoul/death.ogg new file mode 100644 index 000000000..009e9b31f Binary files /dev/null and b/src/main/resources/assets/abyssalcraft/sounds/ghoul/death.ogg differ diff --git a/src/main/resources/assets/abyssalcraft/sounds/ghoul/normal/idle1.ogg b/src/main/resources/assets/abyssalcraft/sounds/ghoul/normal/idle1.ogg new file mode 100644 index 000000000..12105d37e Binary files /dev/null and b/src/main/resources/assets/abyssalcraft/sounds/ghoul/normal/idle1.ogg differ diff --git a/src/main/resources/assets/abyssalcraft/sounds/ghoul/normal/idle2.ogg b/src/main/resources/assets/abyssalcraft/sounds/ghoul/normal/idle2.ogg new file mode 100644 index 000000000..da8841f0f Binary files /dev/null and b/src/main/resources/assets/abyssalcraft/sounds/ghoul/normal/idle2.ogg differ diff --git a/src/main/resources/assets/abyssalcraft/sounds/ghoul/normal/idle3.ogg b/src/main/resources/assets/abyssalcraft/sounds/ghoul/normal/idle3.ogg new file mode 100644 index 000000000..1087efe78 Binary files /dev/null and b/src/main/resources/assets/abyssalcraft/sounds/ghoul/normal/idle3.ogg differ diff --git a/src/main/resources/assets/abyssalcraft/sounds/ghoul/normal/idle4.ogg b/src/main/resources/assets/abyssalcraft/sounds/ghoul/normal/idle4.ogg new file mode 100644 index 000000000..dc1150266 Binary files /dev/null and b/src/main/resources/assets/abyssalcraft/sounds/ghoul/normal/idle4.ogg differ diff --git a/src/main/resources/assets/abyssalcraft/sounds/ghoul/normal/idle5.ogg b/src/main/resources/assets/abyssalcraft/sounds/ghoul/normal/idle5.ogg new file mode 100644 index 000000000..7d54ea7c8 Binary files /dev/null and b/src/main/resources/assets/abyssalcraft/sounds/ghoul/normal/idle5.ogg differ diff --git a/src/main/resources/assets/abyssalcraft/sounds/shadow/sacthoth/death.ogg b/src/main/resources/assets/abyssalcraft/sounds/shadow/sacthoth/death.ogg new file mode 100644 index 000000000..18eb211f7 Binary files /dev/null and b/src/main/resources/assets/abyssalcraft/sounds/shadow/sacthoth/death.ogg differ diff --git a/src/main/resources/assets/abyssalcraft/textures/armor/abyssalnite_1.png b/src/main/resources/assets/abyssalcraft/textures/armor/abyssalnite_1.png index b2990e7a0..7a5848012 100644 Binary files a/src/main/resources/assets/abyssalcraft/textures/armor/abyssalnite_1.png and b/src/main/resources/assets/abyssalcraft/textures/armor/abyssalnite_1.png differ diff --git a/src/main/resources/assets/abyssalcraft/textures/armor/abyssalnite_2.png b/src/main/resources/assets/abyssalcraft/textures/armor/abyssalnite_2.png index 37c18a8b3..3daae20f2 100644 Binary files a/src/main/resources/assets/abyssalcraft/textures/armor/abyssalnite_2.png and b/src/main/resources/assets/abyssalcraft/textures/armor/abyssalnite_2.png differ diff --git a/src/main/resources/assets/abyssalcraft/textures/armor/coralium_1.png b/src/main/resources/assets/abyssalcraft/textures/armor/coralium_1.png index 7144d5b7f..8a80c1ca6 100644 Binary files a/src/main/resources/assets/abyssalcraft/textures/armor/coralium_1.png and b/src/main/resources/assets/abyssalcraft/textures/armor/coralium_1.png differ diff --git a/src/main/resources/assets/abyssalcraft/textures/armor/coralium_2.png b/src/main/resources/assets/abyssalcraft/textures/armor/coralium_2.png index 60ca61107..78ce2af1b 100644 Binary files a/src/main/resources/assets/abyssalcraft/textures/armor/coralium_2.png and b/src/main/resources/assets/abyssalcraft/textures/armor/coralium_2.png differ diff --git a/src/main/resources/assets/abyssalcraft/textures/armor/dread_1.png b/src/main/resources/assets/abyssalcraft/textures/armor/dread_1.png index 7b5e7deae..2bfa5a6fa 100644 Binary files a/src/main/resources/assets/abyssalcraft/textures/armor/dread_1.png and b/src/main/resources/assets/abyssalcraft/textures/armor/dread_1.png differ diff --git a/src/main/resources/assets/abyssalcraft/textures/armor/dreadium_1.png b/src/main/resources/assets/abyssalcraft/textures/armor/dreadium_1.png index 3557326db..884604ce3 100644 Binary files a/src/main/resources/assets/abyssalcraft/textures/armor/dreadium_1.png and b/src/main/resources/assets/abyssalcraft/textures/armor/dreadium_1.png differ diff --git a/src/main/resources/assets/abyssalcraft/textures/armor/dreadium_2.png b/src/main/resources/assets/abyssalcraft/textures/armor/dreadium_2.png index ded5900ac..5a3e33e08 100644 Binary files a/src/main/resources/assets/abyssalcraft/textures/armor/dreadium_2.png and b/src/main/resources/assets/abyssalcraft/textures/armor/dreadium_2.png differ diff --git a/src/main/resources/assets/abyssalcraft/textures/blocks/DSsSides.png b/src/main/resources/assets/abyssalcraft/textures/blocks/DSsSides.png index 5b8fbdb6b..a0038520f 100644 Binary files a/src/main/resources/assets/abyssalcraft/textures/blocks/DSsSides.png and b/src/main/resources/assets/abyssalcraft/textures/blocks/DSsSides.png differ diff --git a/src/main/resources/assets/abyssalcraft/textures/blocks/DSsTop.png b/src/main/resources/assets/abyssalcraft/textures/blocks/DSsTop.png index d7ef927eb..4529ed0ab 100644 Binary files a/src/main/resources/assets/abyssalcraft/textures/blocks/DSsTop.png and b/src/main/resources/assets/abyssalcraft/textures/blocks/DSsTop.png differ diff --git a/src/main/resources/assets/abyssalcraft/textures/blocks/EB.png b/src/main/resources/assets/abyssalcraft/textures/blocks/EB.png index 4d9572a0d..eb90bca5b 100644 Binary files a/src/main/resources/assets/abyssalcraft/textures/blocks/EB.png and b/src/main/resources/assets/abyssalcraft/textures/blocks/EB.png differ diff --git a/src/main/resources/assets/abyssalcraft/textures/blocks/EBC.png b/src/main/resources/assets/abyssalcraft/textures/blocks/EBC.png index 9f76cae88..c147a963e 100644 Binary files a/src/main/resources/assets/abyssalcraft/textures/blocks/EBC.png and b/src/main/resources/assets/abyssalcraft/textures/blocks/EBC.png differ diff --git a/src/main/resources/assets/abyssalcraft/textures/font/aklo-ascii-256x.png b/src/main/resources/assets/abyssalcraft/textures/font/aklo-ascii-256x.png new file mode 100644 index 000000000..baf218151 Binary files /dev/null and b/src/main/resources/assets/abyssalcraft/textures/font/aklo-ascii-256x.png differ diff --git a/src/main/resources/assets/abyssalcraft/textures/gui/container/engraver.png b/src/main/resources/assets/abyssalcraft/textures/gui/container/engraver.png new file mode 100644 index 000000000..fcde62239 Binary files /dev/null and b/src/main/resources/assets/abyssalcraft/textures/gui/container/engraver.png differ diff --git a/src/main/resources/assets/abyssalcraft/textures/items/AAC.png b/src/main/resources/assets/abyssalcraft/textures/items/AAC.png index 197efcc4f..38a11aece 100644 Binary files a/src/main/resources/assets/abyssalcraft/textures/items/AAC.png and b/src/main/resources/assets/abyssalcraft/textures/items/AAC.png differ diff --git a/src/main/resources/assets/abyssalcraft/textures/items/AAH.png b/src/main/resources/assets/abyssalcraft/textures/items/AAH.png index 83512fae0..cc4e1d708 100644 Binary files a/src/main/resources/assets/abyssalcraft/textures/items/AAH.png and b/src/main/resources/assets/abyssalcraft/textures/items/AAH.png differ diff --git a/src/main/resources/assets/abyssalcraft/textures/items/ACC.png b/src/main/resources/assets/abyssalcraft/textures/items/ACC.png index 266d0f98a..cd81b4dd6 100644 Binary files a/src/main/resources/assets/abyssalcraft/textures/items/ACC.png and b/src/main/resources/assets/abyssalcraft/textures/items/ACC.png differ diff --git a/src/main/resources/assets/abyssalcraft/textures/items/ACH.png b/src/main/resources/assets/abyssalcraft/textures/items/ACH.png index 89102b8d6..2b075091d 100644 Binary files a/src/main/resources/assets/abyssalcraft/textures/items/ACH.png and b/src/main/resources/assets/abyssalcraft/textures/items/ACH.png differ diff --git a/src/main/resources/assets/abyssalcraft/textures/items/ADDC.png b/src/main/resources/assets/abyssalcraft/textures/items/ADDC.png index a56076cc8..6863bc567 100644 Binary files a/src/main/resources/assets/abyssalcraft/textures/items/ADDC.png and b/src/main/resources/assets/abyssalcraft/textures/items/ADDC.png differ diff --git a/src/main/resources/assets/abyssalcraft/textures/items/ADDH.png b/src/main/resources/assets/abyssalcraft/textures/items/ADDH.png index 1c167798d..f9047afab 100644 Binary files a/src/main/resources/assets/abyssalcraft/textures/items/ADDH.png and b/src/main/resources/assets/abyssalcraft/textures/items/ADDH.png differ diff --git a/src/main/resources/assets/abyssalcraft/textures/items/DDSW.png b/src/main/resources/assets/abyssalcraft/textures/items/DDSW.png index c9ee13a65..7231e4064 100644 Binary files a/src/main/resources/assets/abyssalcraft/textures/items/DDSW.png and b/src/main/resources/assets/abyssalcraft/textures/items/DDSW.png differ diff --git a/src/main/resources/assets/abyssalcraft/textures/items/TG.png b/src/main/resources/assets/abyssalcraft/textures/items/TG.png index 8084e8620..d25813810 100644 Binary files a/src/main/resources/assets/abyssalcraft/textures/items/TG.png and b/src/main/resources/assets/abyssalcraft/textures/items/TG.png differ diff --git a/src/main/resources/assets/abyssalcraft/textures/items/coin.png b/src/main/resources/assets/abyssalcraft/textures/items/coin.png index 98ecd34ff..2166130b5 100644 Binary files a/src/main/resources/assets/abyssalcraft/textures/items/coin.png and b/src/main/resources/assets/abyssalcraft/textures/items/coin.png differ diff --git a/src/main/resources/assets/abyssalcraft/textures/items/cthulhucoin.png b/src/main/resources/assets/abyssalcraft/textures/items/cthulhucoin.png new file mode 100644 index 000000000..98ecd34ff Binary files /dev/null and b/src/main/resources/assets/abyssalcraft/textures/items/cthulhucoin.png differ diff --git a/src/main/resources/assets/abyssalcraft/textures/items/eldercoin.png b/src/main/resources/assets/abyssalcraft/textures/items/eldercoin.png new file mode 100644 index 000000000..5b9064f33 Binary files /dev/null and b/src/main/resources/assets/abyssalcraft/textures/items/eldercoin.png differ diff --git a/src/main/resources/assets/abyssalcraft/textures/items/eldritchScale.png b/src/main/resources/assets/abyssalcraft/textures/items/eldritchScale.png new file mode 100644 index 000000000..b675beea9 Binary files /dev/null and b/src/main/resources/assets/abyssalcraft/textures/items/eldritchScale.png differ diff --git a/src/main/resources/assets/abyssalcraft/textures/items/engraving_blank.png b/src/main/resources/assets/abyssalcraft/textures/items/engraving_blank.png new file mode 100644 index 000000000..f48542710 Binary files /dev/null and b/src/main/resources/assets/abyssalcraft/textures/items/engraving_blank.png differ diff --git a/src/main/resources/assets/abyssalcraft/textures/items/engraving_cthulhu.png b/src/main/resources/assets/abyssalcraft/textures/items/engraving_cthulhu.png new file mode 100644 index 000000000..fd0e99ea7 Binary files /dev/null and b/src/main/resources/assets/abyssalcraft/textures/items/engraving_cthulhu.png differ diff --git a/src/main/resources/assets/abyssalcraft/textures/items/engraving_elder.png b/src/main/resources/assets/abyssalcraft/textures/items/engraving_elder.png new file mode 100644 index 000000000..ea51b7392 Binary files /dev/null and b/src/main/resources/assets/abyssalcraft/textures/items/engraving_elder.png differ diff --git a/src/main/resources/assets/abyssalcraft/textures/items/engraving_jzahar.png b/src/main/resources/assets/abyssalcraft/textures/items/engraving_jzahar.png new file mode 100644 index 000000000..5df831947 Binary files /dev/null and b/src/main/resources/assets/abyssalcraft/textures/items/engraving_jzahar.png differ diff --git a/src/main/resources/assets/abyssalcraft/textures/items/jzaharcoin.png b/src/main/resources/assets/abyssalcraft/textures/items/jzaharcoin.png new file mode 100644 index 000000000..81b1121b8 Binary files /dev/null and b/src/main/resources/assets/abyssalcraft/textures/items/jzaharcoin.png differ diff --git a/src/main/resources/assets/abyssalcraft/textures/items/methane.png b/src/main/resources/assets/abyssalcraft/textures/items/methane.png index e6f8f924c..968c70f22 100644 Binary files a/src/main/resources/assets/abyssalcraft/textures/items/methane.png and b/src/main/resources/assets/abyssalcraft/textures/items/methane.png differ diff --git a/src/main/resources/assets/abyssalcraft/textures/items/nitre.png b/src/main/resources/assets/abyssalcraft/textures/items/nitre.png index 4d3637c33..22077e5ef 100644 Binary files a/src/main/resources/assets/abyssalcraft/textures/items/nitre.png and b/src/main/resources/assets/abyssalcraft/textures/items/nitre.png differ diff --git a/src/main/resources/assets/abyssalcraft/textures/items/shoggothFlesh.png b/src/main/resources/assets/abyssalcraft/textures/items/shoggothFlesh.png new file mode 100644 index 000000000..dfced5eea Binary files /dev/null and b/src/main/resources/assets/abyssalcraft/textures/items/shoggothFlesh.png differ diff --git a/src/main/resources/assets/abyssalcraft/textures/logo_core.png b/src/main/resources/assets/abyssalcraft/textures/logo_core.png deleted file mode 100644 index a2a485b06..000000000 Binary files a/src/main/resources/assets/abyssalcraft/textures/logo_core.png and /dev/null differ diff --git a/src/main/resources/assets/abyssalcraft/textures/model/blocks/Engraver.png b/src/main/resources/assets/abyssalcraft/textures/model/blocks/Engraver.png new file mode 100644 index 000000000..855f3813d Binary files /dev/null and b/src/main/resources/assets/abyssalcraft/textures/model/blocks/Engraver.png differ diff --git a/src/main/resources/assets/abyssalcraft/textures/model/elite/dragonminion.png b/src/main/resources/assets/abyssalcraft/textures/model/elite/dragonminion.png index 1d8218fb7..1e6851e5d 100644 Binary files a/src/main/resources/assets/abyssalcraft/textures/model/elite/dragonminion.png and b/src/main/resources/assets/abyssalcraft/textures/model/elite/dragonminion.png differ diff --git a/src/main/resources/assets/abyssalcraft/textures/model/elite/dragonminion_eyes.png b/src/main/resources/assets/abyssalcraft/textures/model/elite/dragonminion_eyes.png index abd32285b..fc93716ee 100644 Binary files a/src/main/resources/assets/abyssalcraft/textures/model/elite/dragonminion_eyes.png and b/src/main/resources/assets/abyssalcraft/textures/model/elite/dragonminion_eyes.png differ diff --git a/src/main/resources/version.properties b/src/main/resources/version.properties index 3bab6c02b..36d3673a6 100644 --- a/src/main/resources/version.properties +++ b/src/main/resources/version.properties @@ -1,4 +1,3 @@ abyssalcraft.version=${acversion} -accore.version=${coreversion} forge.version=${forgeversion} minecraft.version=${mcversion} \ No newline at end of file diff --git a/version.txt b/version.txt index be91c7511..afa2b3515 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.7.8.1 \ No newline at end of file +1.8.0 \ No newline at end of file