From f1115785e73c096537337ad4b9a43305d6fdebae Mon Sep 17 00:00:00 2001 From: Henry Mao Date: Tue, 18 Dec 2012 22:14:35 +0800 Subject: [PATCH] Fixed create bug --- .../common/block/TileEntityCrate.java | 6 +- .../prefab/ItemElectric.java | 2 +- .../prefab/UpdateNotifier.java | 2 +- .../prefab/modifier/IModifier.java | 22 --- .../prefab/modifier/SlotModifier.java | 29 ---- .../prefab/ore/OreGenBase.java | 99 -------------- .../prefab/ore/OreGenReplace.java | 126 ------------------ .../prefab/ore/OreGenReplaceStone.java | 18 --- .../prefab/ore/OreGenerator.java | 75 ----------- .../prefab/potion/CustomPotion.java | 37 ----- .../prefab/potion/CustomPotionEffect.java | 40 ------ .../tile/TileEntityElectricityProducer.java | 2 + .../tile/TileEntityElectricityReceiver.java | 2 + 13 files changed, 10 insertions(+), 450 deletions(-) delete mode 100644 src/minecraft/universalelectricity/prefab/modifier/IModifier.java delete mode 100644 src/minecraft/universalelectricity/prefab/modifier/SlotModifier.java delete mode 100644 src/minecraft/universalelectricity/prefab/ore/OreGenBase.java delete mode 100644 src/minecraft/universalelectricity/prefab/ore/OreGenReplace.java delete mode 100644 src/minecraft/universalelectricity/prefab/ore/OreGenReplaceStone.java delete mode 100644 src/minecraft/universalelectricity/prefab/ore/OreGenerator.java delete mode 100644 src/minecraft/universalelectricity/prefab/potion/CustomPotion.java delete mode 100644 src/minecraft/universalelectricity/prefab/potion/CustomPotionEffect.java diff --git a/src/minecraft/assemblyline/common/block/TileEntityCrate.java b/src/minecraft/assemblyline/common/block/TileEntityCrate.java index e5a11514..fc73c205 100644 --- a/src/minecraft/assemblyline/common/block/TileEntityCrate.java +++ b/src/minecraft/assemblyline/common/block/TileEntityCrate.java @@ -84,7 +84,7 @@ public class TileEntityCrate extends TileEntityAdvanced implements ISidedInvento if (this.containingItems[par1].stackSize <= par2) { var3 = this.containingItems[par1]; - this.containingItems[par1] = null; + this.setInventorySlotContents(par1, null); return var3; } else @@ -93,8 +93,10 @@ public class TileEntityCrate extends TileEntityAdvanced implements ISidedInvento if (this.containingItems[par1].stackSize == 0) { - this.containingItems[par1] = null; + this.setInventorySlotContents(par1, null); } + + this.setInventorySlotContents(par1, this.containingItems[par1]); return var3; } diff --git a/src/minecraft/universalelectricity/prefab/ItemElectric.java b/src/minecraft/universalelectricity/prefab/ItemElectric.java index 861f6038..9e48ac05 100644 --- a/src/minecraft/universalelectricity/prefab/ItemElectric.java +++ b/src/minecraft/universalelectricity/prefab/ItemElectric.java @@ -68,7 +68,7 @@ public abstract class ItemElectric extends Item implements IItemElectric // for this electric item! ItemElectric item = ((ItemElectric) par1ItemStack.getItem()); item.setJoules(item.getJoules(par1ItemStack), par1ItemStack); - + // For items that can change electricity capacity this.setMaxDamage((int) this.getMaxJoules(par1ItemStack)); } diff --git a/src/minecraft/universalelectricity/prefab/UpdateNotifier.java b/src/minecraft/universalelectricity/prefab/UpdateNotifier.java index 2d7b496c..ac4e2822 100644 --- a/src/minecraft/universalelectricity/prefab/UpdateNotifier.java +++ b/src/minecraft/universalelectricity/prefab/UpdateNotifier.java @@ -43,7 +43,7 @@ public class UpdateNotifier implements IPlayerTracker String latestUpdate = getLatestVersion(updateUrl); - if (latestUpdate != null && latestUpdate != "" && !latestUpdate.equals(currentVersion.trim())) + if (latestUpdate != null && latestUpdate != "" && !currentVersion.trim().equals(latestUpdate.trim())) { modsToUpdate.put(modName, latestUpdate); } diff --git a/src/minecraft/universalelectricity/prefab/modifier/IModifier.java b/src/minecraft/universalelectricity/prefab/modifier/IModifier.java deleted file mode 100644 index dd0b49f4..00000000 --- a/src/minecraft/universalelectricity/prefab/modifier/IModifier.java +++ /dev/null @@ -1,22 +0,0 @@ -package universalelectricity.prefab.modifier; - -import net.minecraft.item.ItemStack; - -/** - * This must be applied to an item that acts as a modifier or an upgrade. - * - * @author Calclavia - * - */ -public interface IModifier -{ - /** - * @return - The name of the modifier. - */ - public String getName(ItemStack itemstack); - - /** - * @return - How much effect does this modifier have? - */ - public int getEffectiveness(ItemStack itemstack); -} diff --git a/src/minecraft/universalelectricity/prefab/modifier/SlotModifier.java b/src/minecraft/universalelectricity/prefab/modifier/SlotModifier.java deleted file mode 100644 index f06b5b27..00000000 --- a/src/minecraft/universalelectricity/prefab/modifier/SlotModifier.java +++ /dev/null @@ -1,29 +0,0 @@ -package universalelectricity.prefab.modifier; - -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; - -/** - * This slot should be used by any container that contains an item that is a modifier. An example of - * this would be upgrade slots. - * - * @author Calclavia - * - */ -public class SlotModifier extends Slot -{ - public SlotModifier(IInventory par2IInventory, int par3, int par4, int par5) - { - super(par2IInventory, par3, par4, par5); - } - - /** - * Check if the stack is a valid item for this slot. Always true beside for the armor slots. - */ - @Override - public boolean isItemValid(ItemStack par1ItemStack) - { - return par1ItemStack.getItem() instanceof IModifier; - } -} diff --git a/src/minecraft/universalelectricity/prefab/ore/OreGenBase.java b/src/minecraft/universalelectricity/prefab/ore/OreGenBase.java deleted file mode 100644 index 6065965c..00000000 --- a/src/minecraft/universalelectricity/prefab/ore/OreGenBase.java +++ /dev/null @@ -1,99 +0,0 @@ -package universalelectricity.prefab.ore; - -import java.util.Random; - -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import net.minecraft.world.chunk.IChunkProvider; -import net.minecraftforge.common.Configuration; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.oredict.OreDictionary; -import universalelectricity.core.UniversalElectricity; - -/** - * This class is used for storing ore generation data. If you are too lazy to generate your own - * ores, you can do {@link #OreGenerator.ORES_TO_GENERATE.add()} to add your ore to the list of ores - * to generate. - * - * @author Calclavia - * - */ -public abstract class OreGenBase -{ - public String name; - - public String oreDictionaryName; - - public boolean shouldGenerate; - - public int blockIndexTexture; - - public ItemStack oreStack; - - public int oreID; - - public int oreMeta; - - /** - * What harvest level does this machine need to be acquired? - */ - public int harvestLevel; - - /** - * The predefined tool classes are "pickaxe", "shovel", "axe". You can add others for custom - * tools. - */ - public String harvestTool; - - /** - * @param name - The name of the ore for display - * @param textureFile - The 16x16 png texture of your ore to override - * @param minGenerateLevel - The highest generation level of your ore - * @param maxGenerateLevel - The lowest generation level of your ore - * @param amountPerChunk - The amount of ores to generate per chunk - * @param amountPerBranch - The amount of ores to generate in a clutter. E.g coal generates with - * a lot of other coal next to it. How much do you want? - */ - public OreGenBase(String name, String oreDiectionaryName, ItemStack stack, String harvestTool, int harvestLevel) - { - this.name = name; - this.shouldGenerate = false; - this.harvestTool = harvestTool; - this.harvestLevel = harvestLevel; - this.oreDictionaryName = oreDiectionaryName; - this.oreStack = stack; - this.oreID = stack.itemID; - this.oreMeta = stack.getItemDamage(); - - OreDictionary.registerOre(oreDictionaryName, stack); - MinecraftForge.setBlockHarvestLevel(Block.blocksList[stack.itemID], stack.getItemDamage(), harvestTool, harvestLevel); - } - - public OreGenBase enable(Configuration config) - { - this.shouldGenerate = shouldGenerateOre(config, this.name); - return this; - } - - public OreGenBase enable() - { - this.enable(UniversalElectricity.CONFIGURATION); - return this; - } - - /** - * Checks the config file and see if Universal Electricity should generate this ore - */ - private static boolean shouldGenerateOre(Configuration configuration, String oreName) - { - configuration.load(); - boolean shouldGenerate = configuration.get("Ore Generation", "Generate " + oreName, true).getBoolean(true); - configuration.save(); - return shouldGenerate; - } - - public abstract void generate(World world, Random random, int varX, int varZ); - - public abstract boolean isOreGeneratedInWorld(World world, IChunkProvider chunkGenerator); -} diff --git a/src/minecraft/universalelectricity/prefab/ore/OreGenReplace.java b/src/minecraft/universalelectricity/prefab/ore/OreGenReplace.java deleted file mode 100644 index 410f06d7..00000000 --- a/src/minecraft/universalelectricity/prefab/ore/OreGenReplace.java +++ /dev/null @@ -1,126 +0,0 @@ -package universalelectricity.prefab.ore; - -import java.util.Random; - -import net.minecraft.item.ItemStack; -import net.minecraft.util.MathHelper; -import net.minecraft.world.World; -import net.minecraft.world.chunk.IChunkProvider; -import net.minecraft.world.gen.ChunkProviderEnd; -import net.minecraft.world.gen.ChunkProviderGenerate; -import net.minecraft.world.gen.ChunkProviderHell; - -/** - * This class is used for storing ore generation data. If you are too lazy to generate your own - * ores, you can do {@link #OreGenerator.ORES_TO_GENERATE.add()} to add your ore to the list of ores - * to generate. - * - * @author Calclavia - * - */ -public class OreGenReplace extends OreGenBase -{ - - public int minGenerateLevel; - public int maxGenerateLevel; - public int amountPerChunk; - public int amountPerBranch; - public int replaceID; - - public boolean generateSurface; - public boolean generateNether; - public boolean generateEnd; - - /** - * @param name - The name of the ore for display - * @param textureFile - The 16x16 png texture of your ore to override - * @param minGenerateLevel - The highest generation level of your ore - * @param maxGenerateLevel - The lowest generation level of your ore - * @param amountPerChunk - The amount of ores to generate per chunk - * @param amountPerBranch - The amount of ores to generate in a clutter. E.g coal generates with - * a lot of other coal next to it. How much do you want? - */ - public OreGenReplace(String name, String oreDiectionaryName, ItemStack stack, int replaceID, int minGenerateLevel, int maxGenerateLevel, int amountPerChunk, int amountPerBranch, String harvestTool, int harvestLevel) - { - super(name, oreDiectionaryName, stack, harvestTool, harvestLevel); - this.minGenerateLevel = minGenerateLevel; - this.maxGenerateLevel = maxGenerateLevel; - this.amountPerChunk = amountPerChunk; - this.amountPerBranch = amountPerBranch; - this.replaceID = replaceID; - } - - public void generate(World world, Random random, int varX, int varZ) - { - - for (int i = 0; i < this.amountPerChunk; i++) - { - int x = varX + random.nextInt(16); - int z = varZ + random.nextInt(16); - int y = random.nextInt(this.maxGenerateLevel - this.minGenerateLevel) + this.minGenerateLevel; - generateReplace(world, random, x, y, z); - } - } - - public boolean generateReplace(World par1World, Random par2Random, int par3, int par4, int par5) - { - float var6 = par2Random.nextFloat() * (float) Math.PI; - double var7 = (double) ((float) (par3 + 8) + MathHelper.sin(var6) * (float) this.amountPerBranch / 8.0F); - double var9 = (double) ((float) (par3 + 8) - MathHelper.sin(var6) * (float) this.amountPerBranch / 8.0F); - double var11 = (double) ((float) (par5 + 8) + MathHelper.cos(var6) * (float) this.amountPerBranch / 8.0F); - double var13 = (double) ((float) (par5 + 8) - MathHelper.cos(var6) * (float) this.amountPerBranch / 8.0F); - double var15 = (double) (par4 + par2Random.nextInt(3) - 2); - double var17 = (double) (par4 + par2Random.nextInt(3) - 2); - - for (int var19 = 0; var19 <= this.amountPerBranch; ++var19) - { - double var20 = var7 + (var9 - var7) * (double) var19 / (double) this.amountPerBranch; - double var22 = var15 + (var17 - var15) * (double) var19 / (double) this.amountPerBranch; - double var24 = var11 + (var13 - var11) * (double) var19 / (double) this.amountPerBranch; - double var26 = par2Random.nextDouble() * (double) this.amountPerBranch / 16.0D; - double var28 = (double) (MathHelper.sin((float) var19 * (float) Math.PI / (float) this.amountPerBranch) + 1.0F) * var26 + 1.0D; - double var30 = (double) (MathHelper.sin((float) var19 * (float) Math.PI / (float) this.amountPerBranch) + 1.0F) * var26 + 1.0D; - int var32 = MathHelper.floor_double(var20 - var28 / 2.0D); - int var33 = MathHelper.floor_double(var22 - var30 / 2.0D); - int var34 = MathHelper.floor_double(var24 - var28 / 2.0D); - int var35 = MathHelper.floor_double(var20 + var28 / 2.0D); - int var36 = MathHelper.floor_double(var22 + var30 / 2.0D); - int var37 = MathHelper.floor_double(var24 + var28 / 2.0D); - - for (int var38 = var32; var38 <= var35; ++var38) - { - double var39 = ((double) var38 + 0.5D - var20) / (var28 / 2.0D); - - if (var39 * var39 < 1.0D) - { - for (int var41 = var33; var41 <= var36; ++var41) - { - double var42 = ((double) var41 + 0.5D - var22) / (var30 / 2.0D); - - if (var39 * var39 + var42 * var42 < 1.0D) - { - for (int var44 = var34; var44 <= var37; ++var44) - { - double var45 = ((double) var44 + 0.5D - var24) / (var28 / 2.0D); - - int block = par1World.getBlockId(var38, var41, var44); - if (var39 * var39 + var42 * var42 + var45 * var45 < 1.0D && (this.replaceID == 0 || block == this.replaceID)) - { - par1World.setBlockAndMetadata(var38, var41, var44, this.oreID, this.oreMeta); - } - } - } - } - } - } - } - - return true; - } - - @Override - public boolean isOreGeneratedInWorld(World world, IChunkProvider chunkGenerator) - { - return ((this.generateSurface && chunkGenerator instanceof ChunkProviderGenerate) || (this.generateNether && chunkGenerator instanceof ChunkProviderHell) || (this.generateEnd && chunkGenerator instanceof ChunkProviderEnd)); - } -} diff --git a/src/minecraft/universalelectricity/prefab/ore/OreGenReplaceStone.java b/src/minecraft/universalelectricity/prefab/ore/OreGenReplaceStone.java deleted file mode 100644 index 1df9611d..00000000 --- a/src/minecraft/universalelectricity/prefab/ore/OreGenReplaceStone.java +++ /dev/null @@ -1,18 +0,0 @@ -package universalelectricity.prefab.ore; - -import net.minecraft.item.ItemStack; - -public class OreGenReplaceStone extends OreGenReplace -{ - public OreGenReplaceStone(String name, String oreDiectionaryName, ItemStack stack, int replaceID, int minGenerateLevel, int maxGenerateLevel, int amountPerChunk, int amountPerBranch, String harvestTool, int harvestLevel) - { - super(name, oreDiectionaryName, stack, 1, minGenerateLevel, maxGenerateLevel, amountPerChunk, amountPerBranch, harvestTool, harvestLevel); - this.generateSurface = true; - } - - // A simplified version of the constructor - public OreGenReplaceStone(String name, String oreDiectionaryName, ItemStack stack, int replaceID, int maxGenerateLevel, int amountPerChunk, int amountPerBranch) - { - this(name, oreDiectionaryName, stack, 0, replaceID, maxGenerateLevel, amountPerChunk, amountPerBranch, "pickaxe", 1); - } -} \ No newline at end of file diff --git a/src/minecraft/universalelectricity/prefab/ore/OreGenerator.java b/src/minecraft/universalelectricity/prefab/ore/OreGenerator.java deleted file mode 100644 index 95e65601..00000000 --- a/src/minecraft/universalelectricity/prefab/ore/OreGenerator.java +++ /dev/null @@ -1,75 +0,0 @@ -package universalelectricity.prefab.ore; - -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - -import net.minecraft.world.World; -import net.minecraft.world.chunk.IChunkProvider; -import cpw.mods.fml.common.IWorldGenerator; -import cpw.mods.fml.common.registry.GameRegistry; - -public class OreGenerator implements IWorldGenerator -{ - public static boolean isInitiated = false; - - /** - * Add your ore data to this list of ores for it to automatically generate! No hassle indeed! - */ - private static final List 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/minecraft/universalelectricity/prefab/potion/CustomPotion.java b/src/minecraft/universalelectricity/prefab/potion/CustomPotion.java deleted file mode 100644 index 11f6c865..00000000 --- a/src/minecraft/universalelectricity/prefab/potion/CustomPotion.java +++ /dev/null @@ -1,37 +0,0 @@ -package universalelectricity.prefab.potion; - -import net.minecraft.potion.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/minecraft/universalelectricity/prefab/potion/CustomPotionEffect.java b/src/minecraft/universalelectricity/prefab/potion/CustomPotionEffect.java deleted file mode 100644 index 788b623d..00000000 --- a/src/minecraft/universalelectricity/prefab/potion/CustomPotionEffect.java +++ /dev/null @@ -1,40 +0,0 @@ -package universalelectricity.prefab.potion; - -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.item.ItemStack; -import net.minecraft.potion.Potion; -import net.minecraft.potion.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); - } - } -} diff --git a/src/minecraft/universalelectricity/prefab/tile/TileEntityElectricityProducer.java b/src/minecraft/universalelectricity/prefab/tile/TileEntityElectricityProducer.java index 78457a01..996220d7 100644 --- a/src/minecraft/universalelectricity/prefab/tile/TileEntityElectricityProducer.java +++ b/src/minecraft/universalelectricity/prefab/tile/TileEntityElectricityProducer.java @@ -36,5 +36,7 @@ public abstract class TileEntityElectricityProducer extends TileEntityDisableabl public void invalidate() { Electricity.instance.unregister(this); + super.invalidate(); + } } diff --git a/src/minecraft/universalelectricity/prefab/tile/TileEntityElectricityReceiver.java b/src/minecraft/universalelectricity/prefab/tile/TileEntityElectricityReceiver.java index 14060e41..eda39a7e 100644 --- a/src/minecraft/universalelectricity/prefab/tile/TileEntityElectricityReceiver.java +++ b/src/minecraft/universalelectricity/prefab/tile/TileEntityElectricityReceiver.java @@ -36,5 +36,7 @@ public abstract class TileEntityElectricityReceiver extends TileEntityDisableabl public void invalidate() { Electricity.instance.unregister(this); + super.invalidate(); + } }