diff --git a/src/main/java/makeo/gadomancy/common/Gadomancy.java b/src/main/java/makeo/gadomancy/common/Gadomancy.java index f6eca6c..d9cfbdd 100644 --- a/src/main/java/makeo/gadomancy/common/Gadomancy.java +++ b/src/main/java/makeo/gadomancy/common/Gadomancy.java @@ -66,9 +66,9 @@ public class Gadomancy { @Mod.EventHandler public void preInit(FMLPreInitializationEvent event) { - proxy.preInitalize(); event.getModMetadata().version = VERSION; ModConfig.init(event.getSuggestedConfigurationFile()); + proxy.preInitalize(); } @Mod.EventHandler diff --git a/src/main/java/makeo/gadomancy/common/data/config/ModConfig.java b/src/main/java/makeo/gadomancy/common/data/config/ModConfig.java index c2798df..795e5e6 100644 --- a/src/main/java/makeo/gadomancy/common/data/config/ModConfig.java +++ b/src/main/java/makeo/gadomancy/common/data/config/ModConfig.java @@ -64,6 +64,6 @@ public class ModConfig { ancientStoneRecipes = config.getBoolean("ancientStoneRecipes", "skyblock", false, "TRUE = Adds recipes for Ancient Stone and Ancient Stone Pedestal (This may be usefull for severs and skyblock packs to craft the Node Manipulator and get more primodial pearls). You have to change this client- and server-side!"); renderParticleDistance = config.getInt("particleRenderDistance", "general", 100, 5, 1000, "Defines, how close a player has to be towards the particle origin to see the particles created by it."); - enableAdditionalNodeTypes = config.getBoolean("disableAdditionalNodeTypes", "general", true, "Enables our custom node types. This might solve some compatibility issues (e.g. WitchingGadgets). You have to change this client- and server-side! Only change when you experience issues with special mods' features ONLY not working when using the mod together with Gadomancy."); + enableAdditionalNodeTypes = config.getBoolean("enableAdditionalNodeTypes", "general", true, "Enables our custom node types. This might solve some compatibility issues (e.g. WitchingGadgets). You have to change this client- and server-side! Only change when you experience issues with special mods' features ONLY not working when using the mod together with Gadomancy."); } } diff --git a/src/main/java/makeo/gadomancy/common/integration/IntegrationAutomagy.java b/src/main/java/makeo/gadomancy/common/integration/IntegrationAutomagy.java index 2182e70..c40f38e 100644 --- a/src/main/java/makeo/gadomancy/common/integration/IntegrationAutomagy.java +++ b/src/main/java/makeo/gadomancy/common/integration/IntegrationAutomagy.java @@ -1,6 +1,7 @@ package makeo.gadomancy.common.integration; import makeo.gadomancy.common.CommonProxy; +import makeo.gadomancy.common.data.config.ModConfig; import makeo.gadomancy.common.registration.RegisteredBlocks; import makeo.gadomancy.common.registration.RegisteredItems; import makeo.gadomancy.common.utils.Injector; @@ -41,7 +42,10 @@ public class IntegrationAutomagy extends IntegrationMod { RegisteredBlocks.registerStickyJar(infinityJar, 3, false, true); RegisteredItems.registerStickyJar(Item.getItemFromBlock(infinityJar), 3); } - CommonProxy.unregisterWandHandler("Automagy", ConfigBlocks.blockWarded, -1); + + if(ModConfig.enableAdditionalNodeTypes) { + CommonProxy.unregisterWandHandler("Automagy", ConfigBlocks.blockWarded, -1); + } } public boolean handleNodeJarVisCost(ItemStack wandStack, EntityPlayer player) { diff --git a/src/main/java/makeo/gadomancy/common/items/ItemCreativeNode.java b/src/main/java/makeo/gadomancy/common/items/ItemCreativeNode.java index 75a37ac..3ed1f33 100644 --- a/src/main/java/makeo/gadomancy/common/items/ItemCreativeNode.java +++ b/src/main/java/makeo/gadomancy/common/items/ItemCreativeNode.java @@ -1,7 +1,6 @@ package makeo.gadomancy.common.items; import makeo.gadomancy.common.Gadomancy; -import makeo.gadomancy.common.blocks.tiles.TileExtendedNode; import makeo.gadomancy.common.registration.RegisteredItems; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -16,6 +15,7 @@ import thaumcraft.api.nodes.NodeModifier; import thaumcraft.api.nodes.NodeType; import thaumcraft.common.config.ConfigBlocks; import thaumcraft.common.lib.world.ThaumcraftWorldGenerator; +import thaumcraft.common.tiles.TileNode; import java.util.List; @@ -55,7 +55,7 @@ public class ItemCreativeNode extends Item { if(placeRandomNode(world, x, y, z)) { int metadata = stack.getItemDamage(); - TileExtendedNode node = (TileExtendedNode) world.getTileEntity(x, y, z); + TileNode node = (TileNode) world.getTileEntity(x, y, z); if(metadata == 0) { node.setNodeType(NodeType.NORMAL); diff --git a/src/main/java/makeo/gadomancy/common/node/NodeManipulatorResultHandler.java b/src/main/java/makeo/gadomancy/common/node/NodeManipulatorResultHandler.java index 96b99de..348e0fb 100644 --- a/src/main/java/makeo/gadomancy/common/node/NodeManipulatorResultHandler.java +++ b/src/main/java/makeo/gadomancy/common/node/NodeManipulatorResultHandler.java @@ -1,6 +1,7 @@ package makeo.gadomancy.common.node; import makeo.gadomancy.common.blocks.tiles.TileExtendedNode; +import makeo.gadomancy.common.data.config.ModConfig; import makeo.gadomancy.common.registration.RegisteredManipulations; import net.minecraft.util.WeightedRandom; import thaumcraft.api.aspects.Aspect; @@ -86,8 +87,10 @@ public class NodeManipulatorResultHandler { //Switch node Type possibleResults.add(RegisteredManipulations.resultSwitchType); - //Almighty Growing - possibleResults.add(RegisteredManipulations.resultApplyGrowing); + if(ModConfig.enableAdditionalNodeTypes) { + //Almighty Growing + possibleResults.add(RegisteredManipulations.resultApplyGrowing); + } //Let the node gain primals possibleResults.add(RegisteredManipulations.resultGainPrimal); diff --git a/src/main/java/makeo/gadomancy/common/potions/PotionAchromatic.java b/src/main/java/makeo/gadomancy/common/potions/PotionAchromatic.java index 82aab39..0457d17 100644 --- a/src/main/java/makeo/gadomancy/common/potions/PotionAchromatic.java +++ b/src/main/java/makeo/gadomancy/common/potions/PotionAchromatic.java @@ -1,5 +1,7 @@ package makeo.gadomancy.common.potions; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.ai.attributes.BaseAttributeMap; import thaumcraft.api.aspects.Aspect; /** @@ -15,4 +17,18 @@ public class PotionAchromatic extends PotionCustomTexture { super(id, false, Aspect.CRYSTAL.getColor(), Aspect.CRYSTAL.getImage()); setPotionName("potion.achromatic"); } + + @Override + public void applyAttributesModifiersToEntity(EntityLivingBase entity, BaseAttributeMap p_111185_2_, int p_111185_3_) { + super.applyAttributesModifiersToEntity(entity, p_111185_2_, p_111185_3_); + + + } + + @Override + public void removeAttributesModifiersFromEntity(EntityLivingBase entity, BaseAttributeMap p_111187_2_, int p_111187_3_) { + super.removeAttributesModifiersFromEntity(entity, p_111187_2_, p_111187_3_); + + + } } diff --git a/src/main/java/makeo/gadomancy/common/registration/ModSubstitutions.java b/src/main/java/makeo/gadomancy/common/registration/ModSubstitutions.java index 1f098b6..cb265fb 100644 --- a/src/main/java/makeo/gadomancy/common/registration/ModSubstitutions.java +++ b/src/main/java/makeo/gadomancy/common/registration/ModSubstitutions.java @@ -4,6 +4,7 @@ import com.google.common.collect.BiMap; import cpw.mods.fml.common.registry.FMLControlledNamespacedRegistry; import cpw.mods.fml.common.registry.GameData; import makeo.gadomancy.common.CommonProxy; +import makeo.gadomancy.common.data.config.ModConfig; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.Item; @@ -21,24 +22,25 @@ import thaumcraft.common.config.ConfigBlocks; public class ModSubstitutions { public static void preInit() { - try { - ItemBlock item = (ItemBlock) Item.getItemFromBlock(ConfigBlocks.blockAiry); + if(ModConfig.enableAdditionalNodeTypes) { + try { + ItemBlock item = (ItemBlock) Item.getItemFromBlock(ConfigBlocks.blockAiry); - item.field_150939_a = RegisteredBlocks.blockNode; + item.field_150939_a = RegisteredBlocks.blockNode; - //Hacky way - FMLControlledNamespacedRegistry registry = GameData.getBlockRegistry(); - registry.underlyingIntegerMap.field_148749_a.put(RegisteredBlocks.blockNode, Block.getIdFromBlock(ConfigBlocks.blockAiry)); - registry.underlyingIntegerMap.field_148748_b.set(Block.getIdFromBlock(ConfigBlocks.blockAiry), RegisteredBlocks.blockNode); - ((BiMap)registry.field_148758_b).forcePut(RegisteredBlocks.blockNode, registry.field_148758_b.get(ConfigBlocks.blockAiry)); + //Hacky way + FMLControlledNamespacedRegistry registry = GameData.getBlockRegistry(); + registry.underlyingIntegerMap.field_148749_a.put(RegisteredBlocks.blockNode, Block.getIdFromBlock(ConfigBlocks.blockAiry)); + registry.underlyingIntegerMap.field_148748_b.set(Block.getIdFromBlock(ConfigBlocks.blockAiry), RegisteredBlocks.blockNode); + ((BiMap)registry.field_148758_b).forcePut(RegisteredBlocks.blockNode, registry.field_148758_b.get(ConfigBlocks.blockAiry)); - registry.underlyingIntegerMap.field_148749_a.remove(ConfigBlocks.blockAiry); + registry.underlyingIntegerMap.field_148749_a.remove(ConfigBlocks.blockAiry); - - ConfigBlocks.blockAiry = RegisteredBlocks.blockNode; - } catch (Exception e) { - e.printStackTrace(); - } + ConfigBlocks.blockAiry = RegisteredBlocks.blockNode; + } catch (Exception e) { + e.printStackTrace(); + } + } } public static void init() { @@ -46,6 +48,8 @@ public class ModSubstitutions { } public static void postInit() { - CommonProxy.unregisterWandHandler("Thaumcraft", Blocks.glass, -1); + if(ModConfig.enableAdditionalNodeTypes) { + CommonProxy.unregisterWandHandler("Thaumcraft", Blocks.glass, -1); + } } } diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredBlocks.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredBlocks.java index d3b3234..c0c6f74 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredBlocks.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredBlocks.java @@ -13,6 +13,7 @@ import makeo.gadomancy.common.blocks.BlockRemoteJar; import makeo.gadomancy.common.blocks.BlockStickyJar; import makeo.gadomancy.common.blocks.BlockStoneMachine; import makeo.gadomancy.common.blocks.tiles.*; +import makeo.gadomancy.common.data.config.ModConfig; import makeo.gadomancy.common.items.ItemBlockAdditionalEldritchPortal; import makeo.gadomancy.common.items.ItemBlockAuraPylon; import makeo.gadomancy.common.items.ItemBlockRemoteJar; @@ -23,6 +24,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import thaumcraft.common.blocks.BlockAiry; import thaumcraft.common.config.ConfigBlocks; import thaumcraft.common.tiles.TileInfusionMatrix; @@ -48,7 +50,7 @@ public class RegisteredBlocks { public static BlockArcaneDropper blockArcaneDropper; public static BlockInfusionClaw blockInfusionClaw; public static BlockRemoteJar blockRemoteJar; - public static BlockNode blockNode; + public static BlockAiry blockNode = (BlockAiry) ConfigBlocks.blockAiry; public static BlockExtendedNodeJar blockExtendedNodeJar; public static BlockNodeManipulator blockNodeManipulator; public static BlockStoneMachine blockStoneMachine; @@ -70,7 +72,7 @@ public class RegisteredBlocks { blockArcaneDropper = registerBlock(new BlockArcaneDropper()); blockInfusionClaw = registerBlock(new BlockInfusionClaw()); blockRemoteJar = registerBlock(new BlockRemoteJar(), ItemBlockRemoteJar.class); - blockNode = (BlockNode) new BlockNode().setBlockName("blockAiry"); + blockNode = ModConfig.enableAdditionalNodeTypes ? (BlockAiry) new BlockNode().setBlockName("blockAiry") : (BlockAiry) ConfigBlocks.blockAiry; blockExtendedNodeJar = registerBlock(new BlockExtendedNodeJar()); blockNodeManipulator = registerBlock(new BlockNodeManipulator(), ItemNodeManipulator.class); blockStoneMachine = registerBlock(new BlockStoneMachine(), ItemBlockStoneMachine.class); diff --git a/src/main/java/makeo/gadomancy/common/utils/WandHandler.java b/src/main/java/makeo/gadomancy/common/utils/WandHandler.java index 3e533cf..e1bb2b3 100644 --- a/src/main/java/makeo/gadomancy/common/utils/WandHandler.java +++ b/src/main/java/makeo/gadomancy/common/utils/WandHandler.java @@ -4,6 +4,7 @@ import cpw.mods.fml.common.network.NetworkRegistry; import makeo.gadomancy.common.Gadomancy; import makeo.gadomancy.common.blocks.tiles.TileExtendedNode; import makeo.gadomancy.common.blocks.tiles.TileExtendedNodeJar; +import makeo.gadomancy.common.data.config.ModConfig; import makeo.gadomancy.common.entities.EntityAuraCore; import makeo.gadomancy.common.items.ItemAuraCore; import makeo.gadomancy.common.network.PacketHandler; @@ -53,16 +54,21 @@ public class WandHandler { public static void handleWandInteract(World world, int x, int y, int z, EntityPlayer entityPlayer, ItemStack i) { Block target = world.getBlock(x, y, z); if(target == null) return; - if (target.equals(Blocks.glass)) { - if (ResearchManager.isResearchComplete(entityPlayer.getCommandSenderName(), "NODEJAR")) { - tryTCJarNodeCreation(i, entityPlayer, world, x, y, z); + + if(ModConfig.enableAdditionalNodeTypes) { + if (target.equals(Blocks.glass)) { + if (ResearchManager.isResearchComplete(entityPlayer.getCommandSenderName(), "NODEJAR")) { + tryTCJarNodeCreation(i, entityPlayer, world, x, y, z); + } + } else if (target.equals(ConfigBlocks.blockWarded)) { + if (RegisteredIntegrations.automagy.isPresent() && + ResearchManager.isResearchComplete(entityPlayer.getCommandSenderName(), "ADVNODEJAR")) { + tryAutomagyJarNodeCreation(i, entityPlayer, world, x, y, z); + } } - } else if (target.equals(ConfigBlocks.blockWarded)) { - if (RegisteredIntegrations.automagy.isPresent() && - ResearchManager.isResearchComplete(entityPlayer.getCommandSenderName(), "ADVNODEJAR")) { - tryAutomagyJarNodeCreation(i, entityPlayer, world, x, y, z); - } - } else if(target.equals(ConfigBlocks.blockCrystal)) { + } + + if(target.equals(ConfigBlocks.blockCrystal)) { if (ResearchManager.isResearchComplete(entityPlayer.getCommandSenderName(), Gadomancy.MODID.toUpperCase() + ".AURA_CORE")) tryAuraCoreCreation(i, entityPlayer, world, x, y, z); }