diff --git a/info.txt b/info.txt index fb9ac863..5fdffd0d 100644 --- a/info.txt +++ b/info.txt @@ -5,5 +5,7 @@ @ AssemblyLine_v0.0.6.6.jar @ AssemblyLine_v0.0.6.7.jar @ AssemblyLine_v0.0.6.8.jar AssemblyLine_v0.0.6.8_api.zip -stable AssemblyLine_v0.0.6.10.jar AssemblyLine_v0.0.6.10_api.zip +@ AssemblyLine_v0.0.6.10.jar AssemblyLine_v0.0.6.10_api.zip +Minecraft 1.3.2 * AssemblyLine_v0.1.2.10.jar AssemblyLine_v0.1.2.10_api.zip +Minecraft 1.4.2 \ No newline at end of file diff --git a/mcmod.info b/mcmod.info deleted file mode 100644 index 0fd44988..00000000 --- a/mcmod.info +++ /dev/null @@ -1,22 +0,0 @@ -[ -{ - "modid": "AssemblyLine", - "name": "Assembly Line", - "description": "A mod that brings conveyor belt transporting systems to Minecraft.", - "version": "0.1.2", - "mcversion": "1.4.4", - "url": "http://calclavia.com/universalelectricity/?m=18", - "updateUrl": "http://calclavia.com/universalelectricity/?m=18", - "authors": [ - "Calclavia", - "Darkguardsman" - ], - "credits": "Authored by Calclavia and Darkguardsman", - "logoFile": "", - "screenshots": [ - ], - "parent":"", - "dependencies": [ - ] -} -] \ No newline at end of file diff --git a/modversion.txt b/modversion.txt index 8294c184..7693c96b 100644 --- a/modversion.txt +++ b/modversion.txt @@ -1 +1 @@ -0.1.2 \ No newline at end of file +0.1.3 \ No newline at end of file diff --git a/publish.bat b/publish.bat index d2e42854..678c5477 100644 --- a/publish.bat +++ b/publish.bat @@ -1,6 +1,6 @@ ::ASSEMBLY LINE BUILDER @echo off -echo Promotion Type? +echo Promotion Type? (Choose * for recommended, @ for stable and x for unstable) set /p PROMOTION= set /p MODVERSION= ORES_TO_GENERATE = new ArrayList(); - - /** - * Adds an ore to the ore generate list. Do this in pre-init. - */ - public static void addOre(OreGenBase data) - { - if (!isInitiated) - { - GameRegistry.registerWorldGenerator(new OreGenerator()); - } - - ORES_TO_GENERATE.add(data); - } - - /** - * Checks to see if this ore - * - * @param oreName - * @return - */ - public static boolean oreExists(String oreName) - { - for (OreGenBase ore : ORES_TO_GENERATE) - { - if (ore.oreDictionaryName == oreName) { return true; } - } - - return false; - } - - /** - * Removes an ore to the ore generate list. Do this in init. - */ - public static void removeOre(OreGenBase data) - { - ORES_TO_GENERATE.remove(data); - } - - @Override - public void generate(Random rand, int chunkX, int chunkZ, World world, IChunkProvider chunkGenerator, IChunkProvider chunkProvider) - { - chunkX = chunkX << 4; - chunkZ = chunkZ << 4; - - // Checks to make sure this is the normal - // world - for (OreGenBase oreData : ORES_TO_GENERATE) - { - if (oreData.shouldGenerate && oreData.isOreGeneratedInWorld(world, chunkGenerator)) - { - oreData.generate(world, rand, chunkX, chunkZ); - } - - } - } -} diff --git a/src/common/universalelectricity/prefab/potion/CustomPotion.java b/src/common/universalelectricity/prefab/potion/CustomPotion.java deleted file mode 100644 index fc13deb9..00000000 --- a/src/common/universalelectricity/prefab/potion/CustomPotion.java +++ /dev/null @@ -1,41 +0,0 @@ -package universalelectricity.prefab.potion; - -import net.minecraft.src.Potion; -import cpw.mods.fml.common.registry.LanguageRegistry; - -public abstract class CustomPotion extends Potion -{ - /** - * Creates a new type of potion - * - * @param id - * - The ID of this potion. Make it greater than 20. - * @param isBadEffect - * - Is this potion a good potion or a bad one? - * @param color - * - The color of this potion. - * @param name - * - The name of this potion. - */ - public CustomPotion(int id, boolean isBadEffect, int color, String name) - { - super(id, isBadEffect, color); - this.setPotionName("potion." + name); - LanguageRegistry.instance().addStringLocalization(this.getName(), name); - } - - @Override - public Potion setIconIndex(int par1, int par2) - { - super.setIconIndex(par1, par2); - return this; - } - - /** - * You must register all your potion effects during mod initialization! - */ - public void register() - { - Potion.potionTypes[this.getId()] = this; - } -} diff --git a/src/common/universalelectricity/prefab/potion/CustomPotionEffect.java b/src/common/universalelectricity/prefab/potion/CustomPotionEffect.java deleted file mode 100644 index fedd88cc..00000000 --- a/src/common/universalelectricity/prefab/potion/CustomPotionEffect.java +++ /dev/null @@ -1,41 +0,0 @@ -package universalelectricity.prefab.potion; - -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.src.ItemStack; -import net.minecraft.src.Potion; -import net.minecraft.src.PotionEffect; - -public class CustomPotionEffect extends PotionEffect -{ - public CustomPotionEffect(int potionID, int duration, int amplifier) - { - super(potionID, duration, amplifier); - } - - public CustomPotionEffect(Potion potion, int duration, int amplifier) - { - this(potion.getId(), duration, amplifier); - } - - /** - * Creates a potion effect with custom curable items. - * - * @param curativeItems - * - ItemStacks that can cure this potion effect - */ - public CustomPotionEffect(int potionID, int duration, int amplifier, List curativeItems) - { - super(potionID, duration, amplifier); - - if (curativeItems == null) - { - this.setCurativeItems(new ArrayList()); - } - else - { - this.setCurativeItems(curativeItems); - } - } -}