Boat

src/main/java/com/teamwizardry/wizardry/Wizardry.java

@@ -1,6 +1,5 @@
 package com.teamwizardry.wizardry;
 
-import com.teamwizardry.librarianlib.features.utilities.UnsafeKt;
 import com.teamwizardry.wizardry.common.command.CommandWizardry;
 import com.teamwizardry.wizardry.proxy.CommonProxy;
 import net.minecraft.world.DimensionType;

src/main/java/com/teamwizardry/wizardry/api/ConfigValues.java

@@ -31,6 +31,9 @@ public class ConfigValues {
 	@ConfigProperty(category = "world", comment = "If you have a dimension ID conflict with this mod and something else, change this number")
 	public static int underworldID = 33;
 
+	@ConfigProperty(category = "world", comment = "Chance of an underworld boat being generated in a chunk (1 in X)")
+	public static int underworldBoatChance = 1000;
+
 	@ConfigProperty(category = "world", comment = "If you have a dimension ID conflict with this mod and something else, change this number")
 	public static int torikkiID = 34;
 

src/main/java/com/teamwizardry/wizardry/api/capability/player/miscdata/MiscCapabilityStorage.java

@@ -1,7 +1,6 @@
 package com.teamwizardry.wizardry.api.capability.player.miscdata;
 
 import com.teamwizardry.librarianlib.features.helpers.NBTHelper;
-import com.teamwizardry.wizardry.common.module.effects.ModuleEffectBackup;
 import net.minecraft.nbt.NBTBase;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumFacing;

src/main/java/com/teamwizardry/wizardry/api/spell/module/IModuleEvent.java

@@ -1,9 +1,13 @@
 package com.teamwizardry.wizardry.api.spell.module;
 
+import com.teamwizardry.wizardry.api.spell.SpellData;
+import com.teamwizardry.wizardry.api.spell.SpellRing;
+import net.minecraft.world.World;
+
 /**
  * Interface for event modules. <br/>
  * 
- * <b>Usage</b>: Override {@link IRunnableModule#run()} and return <code>true</code> iff following elements from a spell chain must be executed.
+ * <b>Usage</b>: Override {@link IRunnableModule#run(World, ModuleInstance, SpellData, SpellRing)} and return <code>true</code> iff following elements from a spell chain must be executed.
  * 
  * @author Avatair
  */

src/main/java/com/teamwizardry/wizardry/client/core/renderer/HudRenderer.java

@@ -1,7 +1,6 @@
 package com.teamwizardry.wizardry.client.core.renderer;
 
 import com.teamwizardry.librarianlib.core.client.ClientTickHandler;
-import com.teamwizardry.librarianlib.features.sprite.ISprite;
 import com.teamwizardry.librarianlib.features.sprite.Sprite;
 import com.teamwizardry.librarianlib.features.sprite.Texture;
 import com.teamwizardry.wizardry.Wizardry;

src/main/java/com/teamwizardry/wizardry/client/gui/worktable/ComponentModifiers.java

@@ -17,7 +17,6 @@
 import com.teamwizardry.wizardry.api.spell.attribute.AttributeRegistry;
 import com.teamwizardry.wizardry.api.spell.module.ModuleInstance;
 import com.teamwizardry.wizardry.api.spell.module.ModuleInstanceModifier;
-import com.teamwizardry.wizardry.api.spell.module.ModuleInstanceShape;
 import com.teamwizardry.wizardry.api.util.RandUtil;
 import com.teamwizardry.wizardry.init.ModSounds;
 import net.minecraft.client.Minecraft;

src/main/java/com/teamwizardry/wizardry/common/block/BlockUnderworldTeleporter.java

@@ -1,25 +1,13 @@
 package com.teamwizardry.wizardry.common.block;
 
-import com.teamwizardry.librarianlib.features.base.block.BlockMod;
 import com.teamwizardry.librarianlib.features.base.block.tile.BlockModContainer;
-import com.teamwizardry.wizardry.Wizardry;
 import com.teamwizardry.wizardry.api.ConfigValues;
 import com.teamwizardry.wizardry.common.tile.TileUnderworldPortal;
-import net.minecraft.block.BlockEndPortal;
-import net.minecraft.block.BlockLadder;
-import net.minecraft.block.ITileEntityProvider;
-import net.minecraft.block.material.MapColor;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.tileentity.TileEntityEndPortal;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
-import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

src/main/java/com/teamwizardry/wizardry/common/block/wisdomwood/BlockWisdomSapling.java

@@ -1,7 +1,6 @@
 package com.teamwizardry.wizardry.common.block.wisdomwood;
 
 import com.teamwizardry.librarianlib.features.base.block.BlockModSapling;
-import com.teamwizardry.wizardry.common.world.WorldGeneratorWisdomTree;
 import com.teamwizardry.wizardry.init.ModBlocks;
 
 import net.minecraft.block.state.IBlockState;

src/main/java/com/teamwizardry/wizardry/common/command/CommandTeleportTorikki.java

@@ -1,7 +1,5 @@
 package com.teamwizardry.wizardry.common.command;
 
-import com.teamwizardry.wizardry.Wizardry;
-import com.teamwizardry.wizardry.api.util.TeleportUtil;
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.entity.Entity;

src/main/java/com/teamwizardry/wizardry/common/entity/EntityFairy.java

@@ -4,7 +4,6 @@
 import com.google.common.collect.Lists;
 import com.teamwizardry.librarianlib.features.helpers.NBTHelper;
 import com.teamwizardry.librarianlib.features.network.PacketHandler;
-import com.teamwizardry.wizardry.api.NBTConstants.NBT;
 import com.teamwizardry.wizardry.api.entity.fairy.FairyData;
 import com.teamwizardry.wizardry.api.entity.fairy.fairytasks.FairyTaskController;
 import com.teamwizardry.wizardry.api.entity.fairy.fairytasks.FairyTaskRegistry;

src/main/java/com/teamwizardry/wizardry/common/item/ItemFairyImbuedApple.java

@@ -8,7 +8,6 @@
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.MobEffects;
 import net.minecraft.item.EnumRarity;
-import net.minecraft.item.ItemAppleGold;
 import net.minecraft.item.ItemStack;
 import net.minecraft.potion.PotionEffect;
 import net.minecraft.world.World;

src/main/java/com/teamwizardry/wizardry/common/item/ItemMagicWand.java

@@ -3,10 +3,8 @@
 import com.teamwizardry.librarianlib.features.base.item.IGlowingItem;
 import com.teamwizardry.librarianlib.features.base.item.ItemMod;
 import com.teamwizardry.librarianlib.features.helpers.NBTHelper;
-import com.teamwizardry.wizardry.common.entity.EntityFairy;
 import com.teamwizardry.wizardry.init.ModItems;
 import net.minecraft.client.renderer.block.model.IBakedModel;
-import net.minecraft.enchantment.Enchantment;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemStack;

src/main/java/com/teamwizardry/wizardry/common/item/ItemStaff.java

@@ -18,7 +18,6 @@
 import com.teamwizardry.wizardry.common.module.defaults.IModuleOverrides;
 import com.teamwizardry.wizardry.common.potion.PotionTimeSlow;
 import com.teamwizardry.wizardry.init.ModItems;
-import com.teamwizardry.wizardry.init.ModPotions;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.util.ITooltipFlag;
 import net.minecraft.creativetab.CreativeTabs;
@@ -31,7 +30,6 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTUtil;
-import net.minecraft.potion.PotionEffect;
 import net.minecraft.util.*;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.RayTraceResult;

src/main/java/com/teamwizardry/wizardry/common/item/halos/ItemFakeHaloBauble.java

@@ -21,7 +21,6 @@
 import org.jetbrains.annotations.Nullable;
 
 import javax.annotation.Nonnull;
-import java.util.ArrayList;
 import java.util.List;
 
 /**

src/main/java/com/teamwizardry/wizardry/common/module/effects/ModuleEffectBackup.java

@@ -1,6 +1,5 @@
 package com.teamwizardry.wizardry.common.module.effects;
 
-import com.teamwizardry.librarianlib.features.helpers.NBTHelper;
 import com.teamwizardry.librarianlib.features.math.interpolate.StaticInterp;
 import com.teamwizardry.librarianlib.features.math.interpolate.numeric.InterpFloatInOut;
 import com.teamwizardry.librarianlib.features.particle.ParticleBuilder;
@@ -9,9 +8,6 @@
 import com.teamwizardry.wizardry.Wizardry;
 import com.teamwizardry.wizardry.api.ConfigValues;
 import com.teamwizardry.wizardry.api.NBTConstants;
-import com.teamwizardry.wizardry.api.capability.player.mana.ManaManager;
-import com.teamwizardry.wizardry.api.capability.player.miscdata.IMiscCapability;
-import com.teamwizardry.wizardry.api.capability.player.miscdata.MiscCapabilityProvider;
 import com.teamwizardry.wizardry.api.capability.world.WizardryWorld;
 import com.teamwizardry.wizardry.api.capability.world.WizardryWorldCapability;
 import com.teamwizardry.wizardry.api.spell.SpellData;
@@ -25,13 +21,8 @@
 import com.teamwizardry.wizardry.common.entity.EntityBackupZombie;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
@@ -44,8 +35,6 @@
 
 import javax.annotation.Nonnull;
 
-import java.util.HashMap;
-import java.util.Queue;
 import java.util.UUID;
 
 import static com.teamwizardry.wizardry.api.spell.SpellData.DefaultKeys.FACE_HIT;

src/main/java/com/teamwizardry/wizardry/common/module/effects/ModuleEffectFrost.java

@@ -62,8 +62,8 @@ public boolean onRunZone(World world, SpellData data, SpellRing ring, @ContextRi
 
 		if (targetPos == null) return false;
 
-		Vec3d min = targetPos.subtract(aoe, range, aoe);
-		Vec3d max = targetPos.add(aoe, range, aoe);
+		BlockPos min = new BlockPos(targetPos.subtract(aoe, range, aoe));
+		BlockPos max = new BlockPos(targetPos.add(aoe, range, aoe));
 
 		List<Entity> entities = world.getEntitiesWithinAABBExcludingEntity(null, new AxisAlignedBB(min, max));
 		for (Entity entity : entities) {

src/main/java/com/teamwizardry/wizardry/common/module/effects/ModuleEffectLowGravity.java

@@ -55,8 +55,8 @@ public boolean onRunZone(World world, SpellData data, SpellRing ring, @ContextRi
 
 		if (targetPos == null) return false;
 
-		Vec3d min = targetPos.subtract(aoe, range, aoe);
-		Vec3d max = targetPos.add(aoe, range, aoe);
+		BlockPos min = new BlockPos(targetPos.subtract(aoe, range, aoe));
+		BlockPos max = new BlockPos(targetPos.add(aoe, range, aoe));
 
 		List<Entity> entities = world.getEntitiesWithinAABBExcludingEntity(null, new AxisAlignedBB(min, max));
 		for (Entity entity : entities) {

src/main/java/com/teamwizardry/wizardry/common/module/effects/ModuleEffectThrive.java

@@ -1,11 +1,6 @@
 package com.teamwizardry.wizardry.common.module.effects;
 
-import com.teamwizardry.librarianlib.core.LibrarianLib;
 import com.teamwizardry.librarianlib.features.network.PacketHandler;
-import com.teamwizardry.librarianlib.features.particle.ParticleBuilder;
-import com.teamwizardry.librarianlib.features.particle.ParticleSpawner;
-import com.teamwizardry.wizardry.Wizardry;
-import com.teamwizardry.wizardry.api.ConfigValues;
 import com.teamwizardry.wizardry.api.spell.SpellData;
 import com.teamwizardry.wizardry.api.spell.SpellRing;
 import com.teamwizardry.wizardry.api.spell.annotation.RegisterModule;
@@ -14,24 +9,19 @@
 import com.teamwizardry.wizardry.api.spell.module.ModuleInstanceEffect;
 import com.teamwizardry.wizardry.api.util.BlockUtils;
 import com.teamwizardry.wizardry.api.util.RandUtil;
-import com.teamwizardry.wizardry.client.core.renderer.StructureErrorRenderer;
 import com.teamwizardry.wizardry.client.fx.LibParticles;
-import com.teamwizardry.wizardry.common.block.BlockCraftingPlate;
 import com.teamwizardry.wizardry.common.network.PacketThriveBlock;
 import com.teamwizardry.wizardry.init.ModSounds;
 import net.minecraft.block.Block;
-import net.minecraft.block.BlockFarmland;
 import net.minecraft.block.IGrowable;
 import net.minecraft.block.state.IBlockState;
-import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemDye;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumParticleTypes;
 import net.minecraft.util.SoundCategory;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;

src/main/java/com/teamwizardry/wizardry/common/module/effects/ModuleEffectTimeLock.java

@@ -1,35 +1,5 @@
 package com.teamwizardry.wizardry.common.module.effects;
 
-import com.google.common.collect.HashMultimap;
-import com.teamwizardry.wizardry.api.spell.IDelayedModule;
-import com.teamwizardry.wizardry.api.spell.SpellData;
-import com.teamwizardry.wizardry.api.spell.SpellRing;
-import com.teamwizardry.wizardry.api.spell.annotation.RegisterModule;
-import com.teamwizardry.wizardry.api.spell.attribute.AttributeRegistry;
-import com.teamwizardry.wizardry.api.spell.module.IModuleEffect;
-import com.teamwizardry.wizardry.api.spell.module.ModuleInstanceEffect;
-import com.teamwizardry.wizardry.api.util.RandUtil;
-import com.teamwizardry.wizardry.client.fx.LibParticles;
-import com.teamwizardry.wizardry.common.core.WizardryNemezManager;
-import com.teamwizardry.wizardry.common.core.nemez.NemezEventHandler;
-import com.teamwizardry.wizardry.common.core.nemez.NemezTracker;
-import com.teamwizardry.wizardry.init.ModPotions;
-import com.teamwizardry.wizardry.init.ModSounds;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.potion.PotionEffect;
-import net.minecraft.util.SoundCategory;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.Vec3d;
-import net.minecraft.world.World;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-import org.jetbrains.annotations.NotNull;
-
-import javax.annotation.Nonnull;
-import java.awt.*;
-import java.util.UUID;
-
 /**
  * Created by Demoniaque.
  */

src/main/java/com/teamwizardry/wizardry/common/module/effects/ModuleEffectTimeSlow.java

@@ -83,8 +83,8 @@ public boolean onRunZone(World world, SpellData data, SpellRing ring, @ContextRi
 
 		if (targetPos == null) return false;
 
-		Vec3d min = targetPos.subtract(aoe, range, aoe);
-		Vec3d max = targetPos.add(aoe, range, aoe);
+		BlockPos min = new BlockPos(targetPos.subtract(aoe, range, aoe));
+		BlockPos max = new BlockPos(targetPos.add(aoe, range, aoe));
 
 		List<Entity> entities = world.getEntitiesWithinAABBExcludingEntity(null, new AxisAlignedBB(min, max));
 		for (Entity entity : entities) {

src/main/java/com/teamwizardry/wizardry/common/module/effects/vanish/ModuleEffectVanish.java

@@ -18,6 +18,7 @@
 import net.minecraft.potion.PotionEffect;
 import net.minecraft.util.SoundCategory;
 import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
@@ -47,8 +48,8 @@ public boolean onRunZone(World world, SpellData data, SpellRing ring, @ContextRi
 
 		if (targetPos == null) return false;
 
-		Vec3d min = targetPos.subtract(aoe, range, aoe);
-		Vec3d max = targetPos.add(aoe, range, aoe);
+		BlockPos min = new BlockPos(targetPos.subtract(aoe, range, aoe));
+		BlockPos max = new BlockPos(targetPos.add(aoe, range, aoe));
 
 		List<Entity> entities = world.getEntitiesWithinAABBExcludingEntity(null, new AxisAlignedBB(min, max));
 		for (Entity entity : entities) {

src/main/java/com/teamwizardry/wizardry/common/network/PacketClearCraftingPlate.java

@@ -4,7 +4,6 @@
 import com.teamwizardry.librarianlib.features.autoregister.PacketRegister;
 import com.teamwizardry.librarianlib.features.network.PacketBase;
 import com.teamwizardry.librarianlib.features.saving.Save;
-import com.teamwizardry.wizardry.Wizardry;
 import com.teamwizardry.wizardry.client.render.block.TileCraftingPlateRenderer;
 import com.teamwizardry.wizardry.common.tile.TileCraftingPlate;
 import net.minecraft.item.ItemStack;

src/main/java/com/teamwizardry/wizardry/common/potion/PotionTimeLock.java

@@ -1,21 +1,7 @@
 package com.teamwizardry.wizardry.common.potion;
 
-import com.teamwizardry.wizardry.common.core.WizardryNemezManager;
-import com.teamwizardry.wizardry.common.core.nemez.NemezTracker;
 // import com.teamwizardry.wizardry.common.module.effects.ModuleEffectTimeLock;
-import com.teamwizardry.wizardry.init.ModPotions;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.ai.attributes.AbstractAttributeMap;
-import net.minecraftforge.event.entity.item.ItemTossEvent;
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-import net.minecraftforge.fml.common.gameevent.PlayerEvent;
-import net.minecraftforge.fml.common.gameevent.TickEvent;
-import net.minecraftforge.fml.relauncher.Side;
 
-import javax.annotation.Nonnull;
-import java.util.List;
-import java.util.UUID;
 
 /**
  * Created by Demoniaque.

src/main/java/com/teamwizardry/wizardry/common/potion/PotionTimeSlow.java

@@ -16,11 +16,8 @@
 import net.minecraft.entity.boss.dragon.phase.IPhase;
 import net.minecraft.entity.boss.dragon.phase.PhaseList;
 import net.minecraft.entity.monster.EntityCreeper;
-import net.minecraft.item.ItemEnderEye;
 import net.minecraft.potion.PotionEffect;
 import net.minecraft.util.SoundCategory;
-import net.minecraft.world.World;
-import net.minecraftforge.client.event.MouseEvent;
 import net.minecraftforge.event.entity.living.LivingEntityUseItemEvent;
 import net.minecraftforge.event.entity.living.LivingEvent;
 import net.minecraftforge.event.entity.living.LivingFallEvent;
@@ -32,7 +29,6 @@
 import net.minecraftforge.fml.common.gameevent.PlayerEvent;
 
 import javax.annotation.Nonnull;
-import java.util.logging.Logger;
 
 /**
  * Created by Demoniaque.

src/main/java/com/teamwizardry/wizardry/common/tile/TileUnderworldPortal.java

@@ -1,7 +1,6 @@
 package com.teamwizardry.wizardry.common.tile;
 
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.tileentity.TileEntityEndPortal;
 import net.minecraft.util.EnumFacing;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;

src/main/java/com/teamwizardry/wizardry/common/world/biome/BiomeUnderWorld.java

@@ -15,7 +15,6 @@
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLiving.SpawnPlacementType;
 import net.minecraft.init.Blocks;
-import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.BlockPos.MutableBlockPos;
@@ -24,7 +23,6 @@
 import net.minecraft.world.biome.Biome;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.gameevent.TickEvent;
-import net.minecraftforge.fml.common.registry.EntityRegistry;
 
 /**
  * Created by Demoniaque44