diff --git a/build.properties b/build.properties index d11632e3..ade97d90 100644 --- a/build.properties +++ b/build.properties @@ -6,7 +6,7 @@ ccc_version=1.0.4.29 nei_version=1.0.3.64 //=Dependency Information package_group=com.wayoftime.bloodmagic -mod_version=1.2.1 +mod_version=1.2.1a minetweaker_version=Dev-1.7.10-3.0.9B -build_number=2 +build_number=1 mc_version=1.7.10 diff --git a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java index 039fa473..2b0a663b 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java +++ b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java @@ -248,7 +248,7 @@ import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.EntityRegistry; import cpw.mods.fml.common.registry.GameRegistry; -@Mod(modid = "AWWayofTime", name = "AlchemicalWizardry", version = "v1.2.1", guiFactory = "WayofTime.alchemicalWizardry.client.gui.ConfigGuiFactory") +@Mod(modid = "AWWayofTime", name = "AlchemicalWizardry", version = "v1.2.1a", guiFactory = "WayofTime.alchemicalWizardry.client.gui.ConfigGuiFactory") public class AlchemicalWizardry { diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/rituals/IRitualStone.java b/src/main/java/WayofTime/alchemicalWizardry/api/rituals/IRitualStone.java index 1bd7b328..c2cec510 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/rituals/IRitualStone.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/rituals/IRitualStone.java @@ -4,5 +4,15 @@ import net.minecraft.world.World; public interface IRitualStone { + /** + * x, y, and z give the position of the Ritual Stone + * @param world + * @param x + * @param y + * @param z + * @param meta + * @param runeType + * @return + */ public boolean isRuneType(World world, int x, int y, int z, int meta, int runeType); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/rituals/Rituals.java b/src/main/java/WayofTime/alchemicalWizardry/api/rituals/Rituals.java index 4eb76f62..a04d5095 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/rituals/Rituals.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/rituals/Rituals.java @@ -152,70 +152,19 @@ public class Rituals Block test = null; TileEntity te = null; - switch (direction) + for (RitualComponent rc : ritual) { - case 1: - for (RitualComponent rc : ritual) - { - test = world.getBlock(x + rc.getX(), y + rc.getY(), z + rc.getZ()); - te = world.getTileEntity(x + rc.getX(), y + rc.getY(), z + rc.getZ()); + test = world.getBlock(x + rc.getX(direction), y + rc.getY(), z + rc.getZ(direction)); + te = world.getTileEntity(x + rc.getX(direction), y + rc.getY(), z + rc.getZ(direction)); - if (!(test instanceof IRitualStone && ((IRitualStone)test).isRuneType(world, x, y, z, world.getBlockMetadata(x + rc.getX(), y + rc.getY(), z + rc.getZ()), rc.getStoneType())) - && !(test instanceof ITileRitualStone && ((ITileRitualStone)te).isRuneType(rc.getStoneType()))) - { - return false; - } - } - - return true; - - case 2: - for (RitualComponent rc : ritual) - { - test = world.getBlock(x - rc.getZ(), y + rc.getY(), z + rc.getX()); - te = world.getTileEntity(x - rc.getZ(), y + rc.getY(), z + rc.getX()); - - if (!(test instanceof IRitualStone && ((IRitualStone)test).isRuneType(world, x, y, z, world.getBlockMetadata(x - rc.getZ(), y + rc.getY(), z + rc.getX()), rc.getStoneType())) - && !(test instanceof ITileRitualStone && ((ITileRitualStone)te).isRuneType(rc.getStoneType()))) - { - return false; - } - } - - return true; - - case 3: - for (RitualComponent rc : ritual) - { - test = world.getBlock(x - rc.getX(), y + rc.getY(), z - rc.getZ()); - te = world.getTileEntity(x - rc.getX(), y + rc.getY(), z - rc.getZ()); - - if (!(test instanceof IRitualStone && ((IRitualStone)test).isRuneType(world, x, y, z, world.getBlockMetadata(x - rc.getX(), y + rc.getY(), z - rc.getZ()), rc.getStoneType())) - && !(test instanceof ITileRitualStone && ((ITileRitualStone)te).isRuneType(rc.getStoneType()))) - { - return false; - } - } - - return true; - - case 4: - for (RitualComponent rc : ritual) - { - test = world.getBlock(x + rc.getZ(), y + rc.getY(), z - rc.getX()); - te = world.getTileEntity(x + rc.getZ(), y + rc.getY(), z - rc.getX()); - - if (!(test instanceof IRitualStone && ((IRitualStone)test).isRuneType(world, x, y, z, world.getBlockMetadata(x + rc.getZ(), y + rc.getY(), z - rc.getX()), rc.getStoneType())) - && !(test instanceof ITileRitualStone && ((ITileRitualStone)te).isRuneType(rc.getStoneType()))) - { - return false; - } - } - - return true; + if (!(test instanceof IRitualStone && ((IRitualStone)test).isRuneType(world, x + rc.getX(direction), y, z+ rc.getZ(direction), world.getBlockMetadata(x + rc.getX(direction), y + rc.getY(), z + rc.getZ(direction)), rc.getStoneType())) + && !(test instanceof ITileRitualStone && ((ITileRitualStone)te).isRuneType(rc.getStoneType()))) + { + return false; + } } - return false; + return true; } public static int getDirectionOfRitual(World world, int x, int y, int z, String ritualID) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/compress/AdvancedCompressionHandler.java b/src/main/java/WayofTime/alchemicalWizardry/common/compress/AdvancedCompressionHandler.java index 72888fda..ed823b8c 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/compress/AdvancedCompressionHandler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/compress/AdvancedCompressionHandler.java @@ -100,6 +100,10 @@ public class AdvancedCompressionHandler extends CompressionHandler public boolean isResultStackReversible(ItemStack stack, int gridSize, World world) { + if(stack == null) + { + return false; + } InventoryCrafting inventory = new InventoryCrafting(new Container() { public boolean canInteractWith(EntityPlayer player) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/compress/DumbyInventoryCrafting.java b/src/main/java/WayofTime/alchemicalWizardry/common/compress/DumbyInventoryCrafting.java deleted file mode 100644 index 75e19eef..00000000 --- a/src/main/java/WayofTime/alchemicalWizardry/common/compress/DumbyInventoryCrafting.java +++ /dev/null @@ -1,17 +0,0 @@ -package WayofTime.alchemicalWizardry.common.compress; - -import net.minecraft.inventory.InventoryCrafting; -import net.minecraft.item.ItemStack; - -public class DumbyInventoryCrafting extends InventoryCrafting -{ - public DumbyInventoryCrafting(int x, int y) - { - super(null, x, y); - } - - @Override - public void setInventorySlotContents(int slot, ItemStack stack) - { - } -}