diff --git a/src/main/java/fox/spiteful/avaritia/Avaritia.java b/src/main/java/fox/spiteful/avaritia/Avaritia.java index 82f7234..3a6e186 100644 --- a/src/main/java/fox/spiteful/avaritia/Avaritia.java +++ b/src/main/java/fox/spiteful/avaritia/Avaritia.java @@ -59,11 +59,13 @@ public class Avaritia { LudicrousItems.grind(); LudicrousBlocks.voxelize(); Compat.census(); - if(!Config.craftingOnly) - LudicrousEntities.letLooseTheDogsOfWar(); + if(Config.craftingOnly) + return; + + LudicrousEntities.letLooseTheDogsOfWar(); proxy.prepareForPretty(); - - Alfheim.packYourBags(); + if(Compat.botan && Config.alfheim) + Alfheim.packYourBags(); } @EventHandler diff --git a/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java b/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java index f4dd486..4720485 100644 --- a/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java +++ b/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java @@ -88,7 +88,7 @@ public class LudicrousEvents { if(held.getItem() == LudicrousItems.infinity_pickaxe) { extraLuck(event, 4); - if (held.getTagCompound().getBoolean("hammer") + if (held.getTagCompound() != null && held.getTagCompound().getBoolean("hammer") && ToolHelper.hammering.contains(event.harvester) && ToolHelper.hammerdrops.containsKey(event.harvester) && ToolHelper.hammerdrops.get(event.harvester) != null) { @@ -99,7 +99,7 @@ public class LudicrousEvents { } else if(held.getItem() == LudicrousItems.infinity_shovel) { - if (held.getTagCompound().getBoolean("destroyer") + if (held.getTagCompound() != null && held.getTagCompound().getBoolean("destroyer") && ToolHelper.hammering.contains(event.harvester) && ToolHelper.hammerdrops.containsKey(event.harvester) && ToolHelper.hammerdrops.get(event.harvester) != null) { diff --git a/src/main/java/fox/spiteful/avaritia/blocks/LudicrousBlocks.java b/src/main/java/fox/spiteful/avaritia/blocks/LudicrousBlocks.java index f7223a2..e475f06 100644 --- a/src/main/java/fox/spiteful/avaritia/blocks/LudicrousBlocks.java +++ b/src/main/java/fox/spiteful/avaritia/blocks/LudicrousBlocks.java @@ -36,10 +36,7 @@ public class LudicrousBlocks { return; crystal_matrix = GameRegistry.registerBlock(new BlockCrystalMatrix(), "Crystal_Matrix"); - OreDictionary.registerOre("blockCrystalMatrix", new ItemStack(crystal_matrix, 1, 0)); resource_block = GameRegistry.registerBlock(new BlockResource(), ItemBlockResource.class, "Resource_Block"); - OreDictionary.registerOre("blockCosmicNeutronium", new ItemStack(resource_block, 1, 0)); - OreDictionary.registerOre("blockInfinity", new ItemStack(resource_block, 1, 1)); neutron_collector = GameRegistry.registerBlock(new BlockNeutronCollector(), "Neutron_Collector"); GameRegistry.registerTileEntity(TileEntityNeutron.class, "Avaritia_Neutron"); compressor = GameRegistry.registerBlock(new BlockCompressor(), "Neutronium_Compressor"); diff --git a/src/main/java/fox/spiteful/avaritia/compat/botania/alfheim/Alfheim.java b/src/main/java/fox/spiteful/avaritia/compat/botania/alfheim/Alfheim.java index dbebf01..8b584ec 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/botania/alfheim/Alfheim.java +++ b/src/main/java/fox/spiteful/avaritia/compat/botania/alfheim/Alfheim.java @@ -17,6 +17,7 @@ public class Alfheim { } // this stuff needs to happen whether or not botania is active it seems D: + // DON'T LIE LIKE THAT, CUTS >:P public static void packYourBags() { int dim = WorldProviderAlfheim.dimensionID; DimensionManager.registerProviderType(dim, WorldProviderAlfheim.class, false); diff --git a/src/main/java/fox/spiteful/avaritia/crafting/Grinder.java b/src/main/java/fox/spiteful/avaritia/crafting/Grinder.java index 0d0410b..75957d1 100644 --- a/src/main/java/fox/spiteful/avaritia/crafting/Grinder.java +++ b/src/main/java/fox/spiteful/avaritia/crafting/Grinder.java @@ -20,6 +20,13 @@ public class Grinder { public static void artsAndCrafts(){ + OreDictionary.registerOre("blockCrystalMatrix", new ItemStack(LudicrousBlocks.crystal_matrix, 1, 0)); + OreDictionary.registerOre("blockCosmicNeutronium", new ItemStack(LudicrousBlocks.resource_block, 1, 0)); + OreDictionary.registerOre("blockInfinity", new ItemStack(LudicrousBlocks.resource_block, 1, 1)); + OreDictionary.registerOre("ingotCrystalMatrix", new ItemStack(LudicrousItems.resource, 1, 1)); + OreDictionary.registerOre("ingotCosmicNeutronium", new ItemStack(LudicrousItems.resource, 1, 4)); + OreDictionary.registerOre("ingotInfinity", new ItemStack(LudicrousItems.resource, 1, 6)); + GameRegistry.addShapedRecipe(new ItemStack(LudicrousItems.resource, 1, 0), "X X", " X ", "X X", 'X', new ItemStack(Items.diamond)); GameRegistry.addShapedRecipe(new ItemStack(LudicrousItems.resource, 1, 1), "DSD", "DSD", 'D', new ItemStack(LudicrousItems.resource, 1, 0), 'S', new ItemStack(Items.nether_star)); GameRegistry.addShapedRecipe(new ItemStack(LudicrousBlocks.double_craft, 1), "CCC", "CCC", "CCC", 'C', new ItemStack(Blocks.crafting_table)); diff --git a/src/main/java/fox/spiteful/avaritia/gui/ContainerNeutron.java b/src/main/java/fox/spiteful/avaritia/gui/ContainerNeutron.java index 0ae174f..b07efb5 100644 --- a/src/main/java/fox/spiteful/avaritia/gui/ContainerNeutron.java +++ b/src/main/java/fox/spiteful/avaritia/gui/ContainerNeutron.java @@ -60,24 +60,20 @@ public class ContainerNeutron extends Container { slot.onSlotChange(itemstack1, itemstack); } - else if (slotNumber != 1 && slotNumber != 0) + else { - if (slotNumber >= 3 && slotNumber < 30) + if (slotNumber >= 1 && slotNumber < 28) { if (!this.mergeItemStack(itemstack1, 28, 37, false)) { return null; } } - else if (slotNumber >= 28 && slotNumber < 37 && !this.mergeItemStack(itemstack1, 3, 30, false)) + else if (slotNumber >= 28 && slotNumber < 37 && !this.mergeItemStack(itemstack1, 1, 28, false)) { return null; } } - else if (!this.mergeItemStack(itemstack1, 1, 37, false)) - { - return null; - } if (itemstack1.stackSize == 0) { diff --git a/src/main/java/fox/spiteful/avaritia/items/ItemResource.java b/src/main/java/fox/spiteful/avaritia/items/ItemResource.java index 7505815..139cdd9 100644 --- a/src/main/java/fox/spiteful/avaritia/items/ItemResource.java +++ b/src/main/java/fox/spiteful/avaritia/items/ItemResource.java @@ -36,9 +36,6 @@ public class ItemResource extends Item implements IHaloRenderItem { this.setMaxDamage(0); this.setUnlocalizedName("avaritia_resource"); this.setCreativeTab(Avaritia.tab); - OreDictionary.registerOre("ingotCrystalMatrix", new ItemStack(this, 1, 1)); - OreDictionary.registerOre("ingotCosmicNeutronium", new ItemStack(this, 1, 4)); - OreDictionary.registerOre("ingotInfinity", new ItemStack(this, 1, 6)); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/fox/spiteful/avaritia/render/MorvInABoxRenderer.java b/src/main/java/fox/spiteful/avaritia/render/MorvInABoxRenderer.java index f000a0f..73d0caa 100644 --- a/src/main/java/fox/spiteful/avaritia/render/MorvInABoxRenderer.java +++ b/src/main/java/fox/spiteful/avaritia/render/MorvInABoxRenderer.java @@ -240,7 +240,12 @@ public class MorvInABoxRenderer implements IItemRenderer { public void getMorvy() { if (!morvy.isComplete() || !morvy.getProperties().containsKey("textures")) { - GameProfile gameprofile = MinecraftServer.getServer().func_152358_ax().func_152655_a(morvy.getName()); + GameProfile gameprofile = null; + + //Which one is returning null? Who knooooooooows + if(MinecraftServer.getServer() != null && MinecraftServer.getServer().func_152358_ax() != null + && morvy != null) + gameprofile = MinecraftServer.getServer().func_152358_ax().func_152655_a(morvy.getName()); if (gameprofile != null) {