diff --git a/src/main/java/WayofTime/bloodmagic/BloodMagic.java b/src/main/java/WayofTime/bloodmagic/BloodMagic.java index d82450bd..884529d4 100644 --- a/src/main/java/WayofTime/bloodmagic/BloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/BloodMagic.java @@ -2,6 +2,7 @@ package WayofTime.bloodmagic; import java.io.File; +import WayofTime.bloodmagic.client.gui.GuiHandler; import lombok.Getter; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -11,11 +12,8 @@ import net.minecraftforge.fml.common.SidedProxy; import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import net.minecraftforge.oredict.RecipeSorter; -import net.minecraftforge.oredict.RecipeSorter.Category; +import net.minecraftforge.fml.common.network.NetworkRegistry; import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.recipe.ShapedBloodOrbRecipe; -import WayofTime.bloodmagic.api.recipe.ShapelessBloodOrbRecipe; import WayofTime.bloodmagic.api.util.helper.LogHelper; import WayofTime.bloodmagic.network.BloodMagicPacketHandler; import WayofTime.bloodmagic.proxy.CommonProxy; @@ -28,11 +26,10 @@ import WayofTime.bloodmagic.registry.ModRecipes; import WayofTime.bloodmagic.registry.ModRituals; import WayofTime.bloodmagic.util.handler.EventHandler; -@Mod(modid = Constants.Mod.MODID, name = Constants.Mod.NAME, version = Constants.Mod.VERSION, dependencies = Constants.Mod.DEPEND, acceptedMinecraftVersions = "[1.8.8,1.8.9]", guiFactory = "WayofTime.bloodmagic.client.gui.ConfigGuiFactory") +@Mod(modid = Constants.Mod.MODID, name = Constants.Mod.NAME, version = Constants.Mod.VERSION, dependencies = Constants.Mod.DEPEND, acceptedMinecraftVersions = "[1.8.8,1.8.9]", guiFactory = "WayofTime.bloodmagic.client.gui.config.ConfigGuiFactory") @Getter public class BloodMagic { - @SidedProxy(serverSide = "WayofTime.bloodmagic.proxy.CommonProxy", clientSide = "WayofTime.bloodmagic.proxy.ClientProxy") public static CommonProxy proxy; @@ -77,6 +74,7 @@ public class BloodMagic ModRituals.initImperfectRituals(); ModCompatibility.registerModCompat(); ConfigHandler.checkRituals(); + NetworkRegistry.INSTANCE.registerGuiHandler(BloodMagic.instance, new GuiHandler()); proxy.init(); } diff --git a/src/main/java/WayofTime/bloodmagic/ConfigHandler.java b/src/main/java/WayofTime/bloodmagic/ConfigHandler.java index e36c9397..90c396a6 100644 --- a/src/main/java/WayofTime/bloodmagic/ConfigHandler.java +++ b/src/main/java/WayofTime/bloodmagic/ConfigHandler.java @@ -20,7 +20,6 @@ import java.util.List; public class ConfigHandler { - @Getter @Setter private static Configuration config; diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBinding.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBinding.java index 83624024..6ff8cec4 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBinding.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBinding.java @@ -13,7 +13,6 @@ import WayofTime.bloodmagic.client.render.alchemyArray.BindingAlchemyCircleRende public class AlchemyArrayEffectBinding extends AlchemyArrayEffect { - @Getter public final ItemStack outputStack; diff --git a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java index 24d09027..bfc2ca92 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java @@ -33,7 +33,6 @@ import com.google.common.base.Strings; public class BloodAltar { - private TileAltar tileAltar; private int internalCounter = 0; diff --git a/src/main/java/WayofTime/bloodmagic/api/BlockStack.java b/src/main/java/WayofTime/bloodmagic/api/BlockStack.java index 6f5e72f2..c363fea3 100644 --- a/src/main/java/WayofTime/bloodmagic/api/BlockStack.java +++ b/src/main/java/WayofTime/bloodmagic/api/BlockStack.java @@ -9,7 +9,6 @@ import net.minecraftforge.fml.common.registry.GameData; @EqualsAndHashCode public class BlockStack { - private final Block block; private final int meta; diff --git a/src/main/java/WayofTime/bloodmagic/api/BloodMagicAPI.java b/src/main/java/WayofTime/bloodmagic/api/BloodMagicAPI.java index fea96086..ca23383c 100644 --- a/src/main/java/WayofTime/bloodmagic/api/BloodMagicAPI.java +++ b/src/main/java/WayofTime/bloodmagic/api/BloodMagicAPI.java @@ -10,7 +10,6 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class BloodMagicAPI { - public static final String ORB = "ItemBloodOrb"; public static final String SCRIBE = "ItemInscriptionTool"; diff --git a/src/main/java/WayofTime/bloodmagic/api/Constants.java b/src/main/java/WayofTime/bloodmagic/api/Constants.java index 4cebbbf7..6b5791f3 100644 --- a/src/main/java/WayofTime/bloodmagic/api/Constants.java +++ b/src/main/java/WayofTime/bloodmagic/api/Constants.java @@ -6,10 +6,8 @@ import java.util.Locale; public class Constants { - public static class NBT { - public static final String OWNER_UUID = "ownerUUID"; public static final String USES = "uses"; public static final String UNUSABLE = "unusable"; @@ -62,11 +60,12 @@ public class Constants public static final String TICKS_REMAINING = "ticksRemaining"; public static final String CONTAINED_BLOCK_NAME = "containedBlockName"; public static final String CONTAINED_BLOCK_META = "containedBlockMeta"; + + public static final String PREVIOUS_INPUT = "previousInput"; } public static class Mod { - public static final String MODID = "BloodMagic"; public static final String DOMAIN = MODID.toLowerCase(Locale.ENGLISH) + ":"; public static final String NAME = "Blood Magic: Alchemical Wizardry"; @@ -74,6 +73,11 @@ public class Constants public static final String DEPEND = ""; } + public static final class Gui + { + public static final int TELEPOSER_GUI = 0; + } + public static class Compat { public static final String JEI_CATEGORY_ALTAR = Mod.MODID + ":altar"; diff --git a/src/main/java/WayofTime/bloodmagic/api/DamageSourceBloodMagic.java b/src/main/java/WayofTime/bloodmagic/api/DamageSourceBloodMagic.java index a7468a9f..f72984a2 100644 --- a/src/main/java/WayofTime/bloodmagic/api/DamageSourceBloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/api/DamageSourceBloodMagic.java @@ -8,7 +8,6 @@ import net.minecraft.util.IChatComponent; public class DamageSourceBloodMagic extends DamageSource { - public DamageSourceBloodMagic() { super("bloodMagic"); diff --git a/src/main/java/WayofTime/bloodmagic/api/ItemStackWrapper.java b/src/main/java/WayofTime/bloodmagic/api/ItemStackWrapper.java index efad9c32..f85e7fc4 100644 --- a/src/main/java/WayofTime/bloodmagic/api/ItemStackWrapper.java +++ b/src/main/java/WayofTime/bloodmagic/api/ItemStackWrapper.java @@ -12,7 +12,6 @@ import net.minecraft.nbt.NBTTagCompound; @EqualsAndHashCode public class ItemStackWrapper { - public final Item item; public final int stackSize; public final int meta; diff --git a/src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyArrayEffect.java b/src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyArrayEffect.java index a5e32df0..b1506b6e 100644 --- a/src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyArrayEffect.java +++ b/src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyArrayEffect.java @@ -4,7 +4,5 @@ import net.minecraft.tileentity.TileEntity; public abstract class AlchemyArrayEffect { - public abstract boolean update(TileEntity tile, int ticksActive); - } diff --git a/src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyArrayEffectCrafting.java b/src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyArrayEffectCrafting.java index 70205b58..7cf348ed 100644 --- a/src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyArrayEffectCrafting.java +++ b/src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyArrayEffectCrafting.java @@ -8,7 +8,6 @@ import net.minecraft.util.BlockPos; public class AlchemyArrayEffectCrafting extends AlchemyArrayEffect { - @Getter public final ItemStack outputStack; public int tickLimit; diff --git a/src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyCircleRenderer.java index afb0d3b2..d415814b 100644 --- a/src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyCircleRenderer.java @@ -11,7 +11,6 @@ import net.minecraft.util.ResourceLocation; public class AlchemyCircleRenderer { - public float offsetFromFace = -0.9f; public final ResourceLocation arrayResource; diff --git a/src/main/java/WayofTime/bloodmagic/api/altar/AltarComponent.java b/src/main/java/WayofTime/bloodmagic/api/altar/AltarComponent.java index b5f3f8b7..fdbcc8d3 100644 --- a/src/main/java/WayofTime/bloodmagic/api/altar/AltarComponent.java +++ b/src/main/java/WayofTime/bloodmagic/api/altar/AltarComponent.java @@ -9,7 +9,6 @@ import net.minecraft.util.BlockPos; @Getter public class AltarComponent { - private BlockPos offset; private boolean upgradeSlot; diff --git a/src/main/java/WayofTime/bloodmagic/api/altar/AltarUpgrade.java b/src/main/java/WayofTime/bloodmagic/api/altar/AltarUpgrade.java index 13e5c775..f93c953b 100644 --- a/src/main/java/WayofTime/bloodmagic/api/altar/AltarUpgrade.java +++ b/src/main/java/WayofTime/bloodmagic/api/altar/AltarUpgrade.java @@ -9,7 +9,6 @@ import lombok.NoArgsConstructor; @AllArgsConstructor public class AltarUpgrade { - private int speedCount; private int efficiencyCount; private int sacrificeCount; diff --git a/src/main/java/WayofTime/bloodmagic/api/altar/EnumAltarComponent.java b/src/main/java/WayofTime/bloodmagic/api/altar/EnumAltarComponent.java index 3102d87d..ebcd6cbb 100644 --- a/src/main/java/WayofTime/bloodmagic/api/altar/EnumAltarComponent.java +++ b/src/main/java/WayofTime/bloodmagic/api/altar/EnumAltarComponent.java @@ -2,6 +2,5 @@ package WayofTime.bloodmagic.api.altar; public enum EnumAltarComponent { - GLOWSTONE, BLOODSTONE, BEACON, BLOODRUNE, CRYSTAL, NOTAIR } diff --git a/src/main/java/WayofTime/bloodmagic/api/altar/IAltarComponent.java b/src/main/java/WayofTime/bloodmagic/api/altar/IAltarComponent.java index 7c26635c..1079292f 100644 --- a/src/main/java/WayofTime/bloodmagic/api/altar/IAltarComponent.java +++ b/src/main/java/WayofTime/bloodmagic/api/altar/IAltarComponent.java @@ -2,6 +2,5 @@ package WayofTime.bloodmagic.api.altar; public interface IAltarComponent { - EnumAltarComponent getType(int meta); } diff --git a/src/main/java/WayofTime/bloodmagic/api/altar/IBloodAltar.java b/src/main/java/WayofTime/bloodmagic/api/altar/IBloodAltar.java index eeff591e..07e69029 100644 --- a/src/main/java/WayofTime/bloodmagic/api/altar/IBloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/api/altar/IBloodAltar.java @@ -2,7 +2,6 @@ package WayofTime.bloodmagic.api.altar; public interface IBloodAltar { - int getCapacity(); int getCurrentBlood(); diff --git a/src/main/java/WayofTime/bloodmagic/api/compress/CompressionHandler.java b/src/main/java/WayofTime/bloodmagic/api/compress/CompressionHandler.java index 0b5e7792..2bf4f1f1 100644 --- a/src/main/java/WayofTime/bloodmagic/api/compress/CompressionHandler.java +++ b/src/main/java/WayofTime/bloodmagic/api/compress/CompressionHandler.java @@ -5,7 +5,6 @@ import net.minecraft.world.World; public abstract class CompressionHandler { - /** * Called to look at the inventory and syphons the required stack. Returns * resultant stack if successful, and null if not. diff --git a/src/main/java/WayofTime/bloodmagic/api/compress/CompressionRegistry.java b/src/main/java/WayofTime/bloodmagic/api/compress/CompressionRegistry.java index 44707126..0fa1f01e 100644 --- a/src/main/java/WayofTime/bloodmagic/api/compress/CompressionRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/api/compress/CompressionRegistry.java @@ -14,7 +14,6 @@ import java.util.Map; */ public class CompressionRegistry { - public static List compressionRegistry = new ArrayList(); public static Map thresholdMap = new HashMap(); diff --git a/src/main/java/WayofTime/bloodmagic/api/event/AddToNetworkEvent.java b/src/main/java/WayofTime/bloodmagic/api/event/AddToNetworkEvent.java index e58c54ca..55c6a054 100644 --- a/src/main/java/WayofTime/bloodmagic/api/event/AddToNetworkEvent.java +++ b/src/main/java/WayofTime/bloodmagic/api/event/AddToNetworkEvent.java @@ -4,7 +4,6 @@ import net.minecraftforge.fml.common.eventhandler.Event; public class AddToNetworkEvent extends Event { - public String ownerNetwork; public int addedAmount; public int maximum; diff --git a/src/main/java/WayofTime/bloodmagic/api/event/BoundToolEvent.java b/src/main/java/WayofTime/bloodmagic/api/event/BoundToolEvent.java index 2ac08665..78eb7add 100644 --- a/src/main/java/WayofTime/bloodmagic/api/event/BoundToolEvent.java +++ b/src/main/java/WayofTime/bloodmagic/api/event/BoundToolEvent.java @@ -7,7 +7,6 @@ import net.minecraftforge.fml.common.eventhandler.Event; public class BoundToolEvent extends Event { - public EntityPlayer player; public BoundToolEvent(EntityPlayer player) diff --git a/src/main/java/WayofTime/bloodmagic/api/event/ItemBindEvent.java b/src/main/java/WayofTime/bloodmagic/api/event/ItemBindEvent.java index 16ef1981..11fc960b 100644 --- a/src/main/java/WayofTime/bloodmagic/api/event/ItemBindEvent.java +++ b/src/main/java/WayofTime/bloodmagic/api/event/ItemBindEvent.java @@ -8,7 +8,6 @@ import net.minecraftforge.fml.common.eventhandler.Event; @Cancelable public class ItemBindEvent extends Event { - public final EntityPlayer player; public String key; public ItemStack itemStack; diff --git a/src/main/java/WayofTime/bloodmagic/api/event/RitualEvent.java b/src/main/java/WayofTime/bloodmagic/api/event/RitualEvent.java index 2039437d..51ec11dd 100644 --- a/src/main/java/WayofTime/bloodmagic/api/event/RitualEvent.java +++ b/src/main/java/WayofTime/bloodmagic/api/event/RitualEvent.java @@ -14,7 +14,6 @@ import net.minecraftforge.fml.common.eventhandler.Event; public class RitualEvent extends Event { - public final IMasterRitualStone mrs; public final String ownerName; public final Ritual ritual; diff --git a/src/main/java/WayofTime/bloodmagic/api/event/SoulNetworkEvent.java b/src/main/java/WayofTime/bloodmagic/api/event/SoulNetworkEvent.java index ed83ccf2..63a08886 100644 --- a/src/main/java/WayofTime/bloodmagic/api/event/SoulNetworkEvent.java +++ b/src/main/java/WayofTime/bloodmagic/api/event/SoulNetworkEvent.java @@ -7,7 +7,6 @@ import net.minecraftforge.fml.common.eventhandler.Event; public class SoulNetworkEvent extends Event { - public final String ownerName; public int syphon; diff --git a/src/main/java/WayofTime/bloodmagic/api/event/TeleposeEvent.java b/src/main/java/WayofTime/bloodmagic/api/event/TeleposeEvent.java new file mode 100644 index 00000000..8c09078d --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/api/event/TeleposeEvent.java @@ -0,0 +1,49 @@ +package WayofTime.bloodmagic.api.event; + +import net.minecraft.block.Block; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; +import net.minecraft.world.World; +import net.minecraftforge.fml.common.eventhandler.Cancelable; +import net.minecraftforge.fml.common.eventhandler.Event; + +/** Fired when a teleposer attempts to transpose two blocks. Use this to perform special cleanup or compensation, + or cancel it entirely to prevent the transposition. */ +@Cancelable +public class TeleposeEvent extends Event +{ + public final World initalWorld; + public final BlockPos initialBlockPos; + + public final Block initialBlock; + public final int initialMetadata; + + public final World finalWorld; + public final BlockPos finalBlockPos; + + public final Block finalBlock; + public final int finalMetadata; + + public TeleposeEvent(World initialWorld, BlockPos initialBlockPos, Block initialBlock, int initialMetadata, World finalWorld, BlockPos finalBlockPos, Block finalBlock, int finalMetadata) + { + this.initalWorld = initialWorld; + this.initialBlockPos = initialBlockPos; + this.initialBlock = initialBlock; + this.initialMetadata = initialMetadata; + + this.finalWorld = finalWorld; + this.finalBlockPos = finalBlockPos; + this.finalBlock = finalBlock; + this.finalMetadata = finalMetadata; + } + + public TileEntity getInitialTile() + { + return initalWorld.getTileEntity(initialBlockPos); + } + + public TileEntity getFinalTile() + { + return finalWorld.getTileEntity(finalBlockPos); + } +} diff --git a/src/main/java/WayofTime/bloodmagic/api/iface/IBindable.java b/src/main/java/WayofTime/bloodmagic/api/iface/IBindable.java index 55f45d0f..6cb71016 100644 --- a/src/main/java/WayofTime/bloodmagic/api/iface/IBindable.java +++ b/src/main/java/WayofTime/bloodmagic/api/iface/IBindable.java @@ -8,7 +8,6 @@ import net.minecraft.item.ItemStack; */ public interface IBindable { - /** * Called when the player attempts to bind the item. * diff --git a/src/main/java/WayofTime/bloodmagic/api/livingArmour/LivingArmourUpgrade.java b/src/main/java/WayofTime/bloodmagic/api/livingArmour/LivingArmourUpgrade.java index 91d7b23c..64d4ad9e 100644 --- a/src/main/java/WayofTime/bloodmagic/api/livingArmour/LivingArmourUpgrade.java +++ b/src/main/java/WayofTime/bloodmagic/api/livingArmour/LivingArmourUpgrade.java @@ -11,7 +11,6 @@ import com.google.common.collect.Multimap; public abstract class LivingArmourUpgrade { - /** * Upgrade level 0 is the first upgrade. Upgrade goes from 0 to getMaxTier() * - 1. diff --git a/src/main/java/WayofTime/bloodmagic/api/livingArmour/StatTracker.java b/src/main/java/WayofTime/bloodmagic/api/livingArmour/StatTracker.java index ebc3f916..ecd7836f 100644 --- a/src/main/java/WayofTime/bloodmagic/api/livingArmour/StatTracker.java +++ b/src/main/java/WayofTime/bloodmagic/api/livingArmour/StatTracker.java @@ -7,7 +7,6 @@ import WayofTime.bloodmagic.livingArmour.LivingArmour; public abstract class StatTracker { - private boolean isDirty = false; public abstract String getUniqueIdentifier(); diff --git a/src/main/java/WayofTime/bloodmagic/api/orb/BloodOrb.java b/src/main/java/WayofTime/bloodmagic/api/orb/BloodOrb.java index fd1f083b..4d93d19d 100644 --- a/src/main/java/WayofTime/bloodmagic/api/orb/BloodOrb.java +++ b/src/main/java/WayofTime/bloodmagic/api/orb/BloodOrb.java @@ -13,7 +13,6 @@ import WayofTime.bloodmagic.api.registry.OrbRegistry; */ public class BloodOrb { - private String name; private int tier; private int capacity; diff --git a/src/main/java/WayofTime/bloodmagic/api/orb/IBloodOrb.java b/src/main/java/WayofTime/bloodmagic/api/orb/IBloodOrb.java index 37ae034e..998a0205 100644 --- a/src/main/java/WayofTime/bloodmagic/api/orb/IBloodOrb.java +++ b/src/main/java/WayofTime/bloodmagic/api/orb/IBloodOrb.java @@ -2,7 +2,6 @@ package WayofTime.bloodmagic.api.orb; public interface IBloodOrb { - BloodOrb getOrb(int meta); int getMaxEssence(int meta); diff --git a/src/main/java/WayofTime/bloodmagic/api/registry/AlchemyArrayRecipeRegistry.java b/src/main/java/WayofTime/bloodmagic/api/registry/AlchemyArrayRecipeRegistry.java index 02e7f583..95c5345c 100644 --- a/src/main/java/WayofTime/bloodmagic/api/registry/AlchemyArrayRecipeRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/api/registry/AlchemyArrayRecipeRegistry.java @@ -19,7 +19,6 @@ import com.google.common.collect.HashBiMap; public class AlchemyArrayRecipeRegistry { - public static final AlchemyCircleRenderer defaultRenderer = new AlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SightSigil.png")); @Getter diff --git a/src/main/java/WayofTime/bloodmagic/api/registry/ImperfectRitualRegistry.java b/src/main/java/WayofTime/bloodmagic/api/registry/ImperfectRitualRegistry.java index 80b14e37..c17fa1dd 100644 --- a/src/main/java/WayofTime/bloodmagic/api/registry/ImperfectRitualRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/api/registry/ImperfectRitualRegistry.java @@ -12,7 +12,6 @@ import java.util.Map; public class ImperfectRitualRegistry { - public static final Map enabledRituals = new HashMap(); private static final BiMap registry = HashBiMap.create(); diff --git a/src/main/java/WayofTime/bloodmagic/api/registry/OrbRegistry.java b/src/main/java/WayofTime/bloodmagic/api/registry/OrbRegistry.java index b693177c..f652022a 100644 --- a/src/main/java/WayofTime/bloodmagic/api/registry/OrbRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/api/registry/OrbRegistry.java @@ -19,7 +19,6 @@ import java.util.List; */ public class OrbRegistry { - @Getter private static List orbs = new ArrayList(); diff --git a/src/main/java/WayofTime/bloodmagic/api/registry/RitualRegistry.java b/src/main/java/WayofTime/bloodmagic/api/registry/RitualRegistry.java index 674fde90..f2feb8b3 100644 --- a/src/main/java/WayofTime/bloodmagic/api/registry/RitualRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/api/registry/RitualRegistry.java @@ -12,7 +12,6 @@ import com.google.common.collect.HashBiMap; public class RitualRegistry { - public static final Map enabledRituals = new HashMap(); private static final BiMap registry = HashBiMap.create(); /** diff --git a/src/main/java/WayofTime/bloodmagic/api/ritual/EnumRuneType.java b/src/main/java/WayofTime/bloodmagic/api/ritual/EnumRuneType.java index f0287375..c8f3f19d 100644 --- a/src/main/java/WayofTime/bloodmagic/api/ritual/EnumRuneType.java +++ b/src/main/java/WayofTime/bloodmagic/api/ritual/EnumRuneType.java @@ -8,7 +8,6 @@ import java.util.Locale; public enum EnumRuneType implements IStringSerializable { - BLANK, WATER, FIRE, EARTH, AIR, DUSK, DAWN; public static EnumRuneType byMetadata(int meta) diff --git a/src/main/java/WayofTime/bloodmagic/api/ritual/IMasterRitualStone.java b/src/main/java/WayofTime/bloodmagic/api/ritual/IMasterRitualStone.java index a595d795..46883ff6 100644 --- a/src/main/java/WayofTime/bloodmagic/api/ritual/IMasterRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/api/ritual/IMasterRitualStone.java @@ -13,7 +13,6 @@ import net.minecraft.world.World; */ public interface IMasterRitualStone { - String getOwner(); boolean activateRitual(ItemStack activationCrystal, EntityPlayer activator, Ritual ritual); diff --git a/src/main/java/WayofTime/bloodmagic/api/ritual/IRitualStone.java b/src/main/java/WayofTime/bloodmagic/api/ritual/IRitualStone.java index 73ed662e..e00886ac 100644 --- a/src/main/java/WayofTime/bloodmagic/api/ritual/IRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/api/ritual/IRitualStone.java @@ -10,7 +10,6 @@ import net.minecraft.world.World; */ public interface IRitualStone { - boolean isRuneType(World world, BlockPos pos, EnumRuneType runeType); interface Tile diff --git a/src/main/java/WayofTime/bloodmagic/api/ritual/Ritual.java b/src/main/java/WayofTime/bloodmagic/api/ritual/Ritual.java index e80f0b18..19a31401 100644 --- a/src/main/java/WayofTime/bloodmagic/api/ritual/Ritual.java +++ b/src/main/java/WayofTime/bloodmagic/api/ritual/Ritual.java @@ -23,7 +23,6 @@ import net.minecraft.world.World; @ToString public abstract class Ritual { - public final ArrayList ritualComponents = new ArrayList(); private final String name; private final int crystalLevel; diff --git a/src/main/java/WayofTime/bloodmagic/api/ritual/RitualComponent.java b/src/main/java/WayofTime/bloodmagic/api/ritual/RitualComponent.java index 51a96f8c..c53c87dd 100644 --- a/src/main/java/WayofTime/bloodmagic/api/ritual/RitualComponent.java +++ b/src/main/java/WayofTime/bloodmagic/api/ritual/RitualComponent.java @@ -13,7 +13,6 @@ import net.minecraft.util.EnumFacing; @RequiredArgsConstructor public class RitualComponent { - private final BlockPos offset; private final EnumRuneType runeType; diff --git a/src/main/java/WayofTime/bloodmagic/api/ritual/RitualRenderer.java b/src/main/java/WayofTime/bloodmagic/api/ritual/RitualRenderer.java index 4ce6a752..5c50dc52 100644 --- a/src/main/java/WayofTime/bloodmagic/api/ritual/RitualRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/api/ritual/RitualRenderer.java @@ -5,7 +5,6 @@ import net.minecraft.util.ResourceLocation; public abstract class RitualRenderer { - public abstract void renderAt(IMasterRitualStone masterRitualStone, double x, double y, double z); protected void bindTexture(ResourceLocation resourceLocation) diff --git a/src/main/java/WayofTime/bloodmagic/api/util/helper/BindableHelper.java b/src/main/java/WayofTime/bloodmagic/api/util/helper/BindableHelper.java index b7716244..ba86e240 100644 --- a/src/main/java/WayofTime/bloodmagic/api/util/helper/BindableHelper.java +++ b/src/main/java/WayofTime/bloodmagic/api/util/helper/BindableHelper.java @@ -12,7 +12,6 @@ import java.util.UUID; public class BindableHelper { - /** * Bind an item to a player. Handles checking if the player was an * instanceof {@link net.minecraftforge.common.util.FakePlayer} or other diff --git a/src/main/java/WayofTime/bloodmagic/api/util/helper/IncenseHelper.java b/src/main/java/WayofTime/bloodmagic/api/util/helper/IncenseHelper.java index 74f9930c..69d2cf69 100644 --- a/src/main/java/WayofTime/bloodmagic/api/util/helper/IncenseHelper.java +++ b/src/main/java/WayofTime/bloodmagic/api/util/helper/IncenseHelper.java @@ -6,7 +6,6 @@ import net.minecraft.nbt.NBTTagCompound; public class IncenseHelper { - public static float getCurrentIncense(EntityPlayer player) { NBTTagCompound data = player.getEntityData(); diff --git a/src/main/java/WayofTime/bloodmagic/api/util/helper/LogHelper.java b/src/main/java/WayofTime/bloodmagic/api/util/helper/LogHelper.java index 70cd0c80..c18c715a 100644 --- a/src/main/java/WayofTime/bloodmagic/api/util/helper/LogHelper.java +++ b/src/main/java/WayofTime/bloodmagic/api/util/helper/LogHelper.java @@ -6,7 +6,6 @@ import org.apache.logging.log4j.Logger; public class LogHelper { - private Logger logger; public LogHelper(String logger) diff --git a/src/main/java/WayofTime/bloodmagic/api/util/helper/NBTHelper.java b/src/main/java/WayofTime/bloodmagic/api/util/helper/NBTHelper.java index b4a85470..f189483b 100644 --- a/src/main/java/WayofTime/bloodmagic/api/util/helper/NBTHelper.java +++ b/src/main/java/WayofTime/bloodmagic/api/util/helper/NBTHelper.java @@ -5,7 +5,6 @@ import net.minecraft.nbt.NBTTagCompound; public class NBTHelper { - public static ItemStack checkNBT(ItemStack stack) { if (stack.getTagCompound() == null) diff --git a/src/main/java/WayofTime/bloodmagic/api/util/helper/NetworkHelper.java b/src/main/java/WayofTime/bloodmagic/api/util/helper/NetworkHelper.java index d68eeb6c..eac0a692 100644 --- a/src/main/java/WayofTime/bloodmagic/api/util/helper/NetworkHelper.java +++ b/src/main/java/WayofTime/bloodmagic/api/util/helper/NetworkHelper.java @@ -20,7 +20,6 @@ import java.util.UUID; public class NetworkHelper { - // Get /** diff --git a/src/main/java/WayofTime/bloodmagic/api/util/helper/PlayerHelper.java b/src/main/java/WayofTime/bloodmagic/api/util/helper/PlayerHelper.java index 40041196..b9d2eeeb 100644 --- a/src/main/java/WayofTime/bloodmagic/api/util/helper/PlayerHelper.java +++ b/src/main/java/WayofTime/bloodmagic/api/util/helper/PlayerHelper.java @@ -15,7 +15,6 @@ import java.util.regex.Pattern; public class PlayerHelper { - private static final Pattern FAKE_PLAYER_PATTERN = Pattern.compile("^(?:\\[.*\\])|(?:ComputerCraft)$"); public static String getUsernameFromPlayer(EntityPlayer player) diff --git a/src/main/java/WayofTime/bloodmagic/api/util/helper/RitualHelper.java b/src/main/java/WayofTime/bloodmagic/api/util/helper/RitualHelper.java index 38befb63..1683ecec 100644 --- a/src/main/java/WayofTime/bloodmagic/api/util/helper/RitualHelper.java +++ b/src/main/java/WayofTime/bloodmagic/api/util/helper/RitualHelper.java @@ -21,7 +21,6 @@ import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual; public class RitualHelper { - public static boolean canCrystalActivate(Ritual ritual, int crystalLevel) { return ritual.getCrystalLevel() <= crystalLevel && RitualRegistry.ritualEnabled(ritual); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyArray.java index bdeee3e0..e1632f40 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyArray.java @@ -22,7 +22,6 @@ import WayofTime.bloodmagic.util.Utils; public class BlockAlchemyArray extends BlockContainer { - public BlockAlchemyArray() { super(Material.cloth); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java b/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java index 6f5cb732..5ac98c89 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java @@ -18,7 +18,6 @@ import net.minecraft.world.World; public class BlockAltar extends BlockContainer { - public BlockAltar() { super(Material.rock); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockBloodStoneBrick.java b/src/main/java/WayofTime/bloodmagic/block/BlockBloodStoneBrick.java index b880aaa7..611fb6a6 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockBloodStoneBrick.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockBloodStoneBrick.java @@ -7,7 +7,6 @@ import net.minecraft.block.material.Material; public class BlockBloodStoneBrick extends BlockString { - public static final String[] names = { "normal", "large" }; public BlockBloodStoneBrick() diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java b/src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java index 0c5ddad8..31adcbaf 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java @@ -17,7 +17,6 @@ import java.awt.*; public class BlockLifeEssence extends BlockFluidClassic { - @Getter private static Fluid lifeEssence = new FluidLifeEssence(); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockPedestal.java b/src/main/java/WayofTime/bloodmagic/block/BlockPedestal.java index ad7b1e32..04544b7e 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockPedestal.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockPedestal.java @@ -16,7 +16,6 @@ import net.minecraft.world.World; public class BlockPedestal extends BlockStringContainer { - public static String[] names = { "pedestal", "plinth" }; public BlockPedestal() diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java b/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java index 9620d23f..e8199203 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java @@ -19,7 +19,6 @@ import java.util.Random; public class BlockPhantom extends BlockContainer { - public BlockPhantom() { super(Material.cloth); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java b/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java index f559088a..297c9c07 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java @@ -22,7 +22,6 @@ import WayofTime.bloodmagic.tile.TileMasterRitualStone; public class BlockRitualController extends BlockStringContainer { - public static final String[] names = { "master", "imperfect" }; public BlockRitualController() diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java b/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java index 89c44364..3c96ab80 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java @@ -11,7 +11,6 @@ import net.minecraft.world.World; public class BlockRitualStone extends BlockString implements IRitualStone { - public static final String[] names = { "blank", "water", "fire", "earth", "air", "dusk", "dawn" }; public BlockRitualStone() diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java b/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java index 018e11cd..412b8396 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java @@ -12,7 +12,6 @@ import net.minecraft.world.World; public class BlockSoulForge extends Block { - public BlockSoulForge() { super(Material.iron); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java b/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java index 58150841..e7c78180 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java @@ -20,7 +20,6 @@ import java.util.Random; public class BlockSpectral extends BlockContainer { - public BlockSpectral() { super(Material.cloth); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java b/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java index 26d68796..2e32e024 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java @@ -4,10 +4,12 @@ import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.util.helper.BindableHelper; import WayofTime.bloodmagic.item.ItemTelepositionFocus; +import WayofTime.bloodmagic.tile.TileTeleposer; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.InventoryHelper; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; @@ -16,7 +18,6 @@ import net.minecraft.world.World; public class BlockTeleposer extends BlockContainer { - public BlockTeleposer() { super(Material.rock); @@ -41,19 +42,30 @@ public class BlockTeleposer extends BlockContainer if (playerItem != null && playerItem.getItem() instanceof ItemTelepositionFocus) { BindableHelper.checkAndSetItemOwner(playerItem, player); - ((ItemTelepositionFocus) playerItem.getItem()).setBlockPos(playerItem, world, pos); - return true; + } + else if (world.getTileEntity(pos) instanceof TileTeleposer) + { + player.openGui(BloodMagic.instance, Constants.Gui.TELEPOSER_GUI, world, pos.getX(), pos.getY(), pos.getZ()); } - // player.openGui(AlchemicalWizardry.instance, 1, world, pos.getX(), - // pos.getY(), pos.getZ()); return true; } + @Override + public void breakBlock(World worldIn, BlockPos pos, IBlockState state) + { + if (worldIn.getTileEntity(pos) != null && worldIn.getTileEntity(pos) instanceof TileTeleposer) + { + InventoryHelper.dropInventoryItems(worldIn, pos, (TileTeleposer) worldIn.getTileEntity(pos)); + } + + super.breakBlock(worldIn, pos, state); + } + @Override public TileEntity createNewTileEntity(World worldIn, int meta) { - return null; + return new TileTeleposer(); } } diff --git a/src/main/java/WayofTime/bloodmagic/block/base/BlockInteger.java b/src/main/java/WayofTime/bloodmagic/block/base/BlockInteger.java index 59415936..666e493d 100644 --- a/src/main/java/WayofTime/bloodmagic/block/base/BlockInteger.java +++ b/src/main/java/WayofTime/bloodmagic/block/base/BlockInteger.java @@ -35,7 +35,6 @@ import java.util.List; @Getter public class BlockInteger extends Block { - private final int maxMeta; private final PropertyInteger metaProp; private final IUnlistedProperty unlistedMetaProp; diff --git a/src/main/java/WayofTime/bloodmagic/block/base/BlockIntegerContainer.java b/src/main/java/WayofTime/bloodmagic/block/base/BlockIntegerContainer.java index c1f46a76..973ac11a 100644 --- a/src/main/java/WayofTime/bloodmagic/block/base/BlockIntegerContainer.java +++ b/src/main/java/WayofTime/bloodmagic/block/base/BlockIntegerContainer.java @@ -9,7 +9,6 @@ import net.minecraft.world.World; public abstract class BlockIntegerContainer extends BlockInteger implements ITileEntityProvider { - public BlockIntegerContainer(Material material, int maxMeta, String propName) { super(material, maxMeta, propName); diff --git a/src/main/java/WayofTime/bloodmagic/block/base/BlockString.java b/src/main/java/WayofTime/bloodmagic/block/base/BlockString.java index 2f0efca7..414ea610 100644 --- a/src/main/java/WayofTime/bloodmagic/block/base/BlockString.java +++ b/src/main/java/WayofTime/bloodmagic/block/base/BlockString.java @@ -38,7 +38,6 @@ import java.util.List; @Getter public class BlockString extends Block { - private final int maxMeta; private final List values; private final PropertyString stringProp; diff --git a/src/main/java/WayofTime/bloodmagic/block/base/BlockStringContainer.java b/src/main/java/WayofTime/bloodmagic/block/base/BlockStringContainer.java index 85db927a..d99b2d0a 100644 --- a/src/main/java/WayofTime/bloodmagic/block/base/BlockStringContainer.java +++ b/src/main/java/WayofTime/bloodmagic/block/base/BlockStringContainer.java @@ -9,7 +9,6 @@ import net.minecraft.world.World; public abstract class BlockStringContainer extends BlockString implements ITileEntityProvider { - public BlockStringContainer(Material material, String[] values, String propName) { super(material, values, propName); diff --git a/src/main/java/WayofTime/bloodmagic/block/property/PropertyString.java b/src/main/java/WayofTime/bloodmagic/block/property/PropertyString.java index c3e5817d..22e121ee 100644 --- a/src/main/java/WayofTime/bloodmagic/block/property/PropertyString.java +++ b/src/main/java/WayofTime/bloodmagic/block/property/PropertyString.java @@ -10,7 +10,6 @@ import java.util.HashSet; public class PropertyString extends PropertyHelper { - private final ImmutableSet allowedValues; protected PropertyString(String name, String[] values) diff --git a/src/main/java/WayofTime/bloodmagic/block/property/UnlistedPropertyInteger.java b/src/main/java/WayofTime/bloodmagic/block/property/UnlistedPropertyInteger.java index b988b8fa..177f0067 100644 --- a/src/main/java/WayofTime/bloodmagic/block/property/UnlistedPropertyInteger.java +++ b/src/main/java/WayofTime/bloodmagic/block/property/UnlistedPropertyInteger.java @@ -4,7 +4,6 @@ import net.minecraftforge.common.property.IUnlistedProperty; public class UnlistedPropertyInteger implements IUnlistedProperty { - private int maxMeta; private String propName; diff --git a/src/main/java/WayofTime/bloodmagic/block/property/UnlistedPropertyString.java b/src/main/java/WayofTime/bloodmagic/block/property/UnlistedPropertyString.java index 77e555c9..01f20774 100644 --- a/src/main/java/WayofTime/bloodmagic/block/property/UnlistedPropertyString.java +++ b/src/main/java/WayofTime/bloodmagic/block/property/UnlistedPropertyString.java @@ -7,7 +7,6 @@ import java.util.List; public class UnlistedPropertyString implements IUnlistedProperty { - private List values; private String propName; diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiHandler.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiHandler.java new file mode 100644 index 00000000..b4e825ec --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/client/gui/GuiHandler.java @@ -0,0 +1,44 @@ +package WayofTime.bloodmagic.client.gui; + +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.tile.TileTeleposer; +import WayofTime.bloodmagic.tile.container.ContainerTeleposer; +import net.minecraft.client.multiplayer.WorldClient; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.BlockPos; +import net.minecraft.world.World; +import net.minecraftforge.fml.common.network.IGuiHandler; + +public class GuiHandler implements IGuiHandler +{ + @Override + public Object getServerGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) + { + BlockPos pos = new BlockPos(x, y, z); + + switch (id) + { + case Constants.Gui.TELEPOSER_GUI: + return new ContainerTeleposer(player.inventory, (TileTeleposer) world.getTileEntity(pos)); + } + + return null; + } + + @Override + public Object getClientGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) + { + if (world instanceof WorldClient) + { + BlockPos pos = new BlockPos(x, y, z); + + switch (id) + { + case Constants.Gui.TELEPOSER_GUI: + return new GuiTeleposer(player.inventory, (TileTeleposer) world.getTileEntity(pos)); + } + } + + return null; + } +} diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiTeleposer.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiTeleposer.java new file mode 100644 index 00000000..f9ecbb5a --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/client/gui/GuiTeleposer.java @@ -0,0 +1,40 @@ +package WayofTime.bloodmagic.client.gui; + +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.tile.container.ContainerTeleposer; +import WayofTime.bloodmagic.util.helper.TextHelper; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class GuiTeleposer extends GuiContainer +{ + public GuiTeleposer(InventoryPlayer playerInventory, IInventory tileTeleposer) + { + super(new ContainerTeleposer(playerInventory, tileTeleposer)); + } + + @Override + protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) + { + this.fontRendererObj.drawString(TextHelper.localize("tile.BloodMagic.teleposer.name"), 64, 23, 4210752); + this.fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), 8, 47, 4210752); + } + + @Override + protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY) + { + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); + ResourceLocation teleposerGuiTextures = new ResourceLocation(Constants.Mod.MODID + ":textures/gui/teleposer.png"); + this.mc.getTextureManager().bindTexture(teleposerGuiTextures); + int i = (this.width - this.xSize) / 2; + int j = (this.height - this.ySize) / 2; + this.drawTexturedModalRect(i, j + 18, 0, 0, this.xSize, this.ySize); + } +} diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/ConfigGui.java b/src/main/java/WayofTime/bloodmagic/client/gui/config/ConfigGui.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/client/gui/ConfigGui.java rename to src/main/java/WayofTime/bloodmagic/client/gui/config/ConfigGui.java index e1826dfd..29a5d81f 100644 --- a/src/main/java/WayofTime/bloodmagic/client/gui/ConfigGui.java +++ b/src/main/java/WayofTime/bloodmagic/client/gui/config/ConfigGui.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.client.gui; +package WayofTime.bloodmagic.client.gui.config; import WayofTime.bloodmagic.ConfigHandler; import WayofTime.bloodmagic.api.Constants; diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/ConfigGuiFactory.java b/src/main/java/WayofTime/bloodmagic/client/gui/config/ConfigGuiFactory.java similarity index 93% rename from src/main/java/WayofTime/bloodmagic/client/gui/ConfigGuiFactory.java rename to src/main/java/WayofTime/bloodmagic/client/gui/config/ConfigGuiFactory.java index daf1d422..05c72094 100644 --- a/src/main/java/WayofTime/bloodmagic/client/gui/ConfigGuiFactory.java +++ b/src/main/java/WayofTime/bloodmagic/client/gui/config/ConfigGuiFactory.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.client.gui; +package WayofTime.bloodmagic.client.gui.config; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java index db9b89e4..8a259f6d 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java @@ -12,7 +12,6 @@ import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyCircleRenderer; public class BindingAlchemyCircleRenderer extends AlchemyCircleRenderer { - public float offsetFromFace = -0.9f; public final ResourceLocation arrayResource; public final ResourceLocation[] arraysResources; diff --git a/src/main/java/WayofTime/bloodmagic/render/RenderEntityBloodLight.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityBloodLight.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/render/RenderEntityBloodLight.java rename to src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityBloodLight.java index a48dbd08..df6fb388 100644 --- a/src/main/java/WayofTime/bloodmagic/render/RenderEntityBloodLight.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityBloodLight.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.render; +package WayofTime.bloodmagic.client.render.entity; import WayofTime.bloodmagic.entity.projectile.EntityBloodLight; import net.minecraft.client.renderer.GlStateManager; @@ -7,12 +7,10 @@ import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; public class RenderEntityBloodLight extends Render { - public RenderEntityBloodLight(RenderManager renderManager) { super(renderManager); diff --git a/src/main/java/WayofTime/bloodmagic/compat/ICompatibility.java b/src/main/java/WayofTime/bloodmagic/compat/ICompatibility.java index 0faf4d9a..3461b981 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/ICompatibility.java +++ b/src/main/java/WayofTime/bloodmagic/compat/ICompatibility.java @@ -5,7 +5,6 @@ package WayofTime.bloodmagic.compat; */ public interface ICompatibility { - /** * Called after the given {@code modid} has been verified as loaded. */ diff --git a/src/main/java/WayofTime/bloodmagic/compress/AdvancedCompressionHandler.java b/src/main/java/WayofTime/bloodmagic/compress/AdvancedCompressionHandler.java index 9d90d576..5a04209c 100644 --- a/src/main/java/WayofTime/bloodmagic/compress/AdvancedCompressionHandler.java +++ b/src/main/java/WayofTime/bloodmagic/compress/AdvancedCompressionHandler.java @@ -10,7 +10,6 @@ import net.minecraft.world.World; public class AdvancedCompressionHandler extends CompressionHandler { - @Override public ItemStack compressInventory(ItemStack[] inv, World world) { diff --git a/src/main/java/WayofTime/bloodmagic/compress/BaseCompressionHandler.java b/src/main/java/WayofTime/bloodmagic/compress/BaseCompressionHandler.java index fa8720a8..7eba6bb3 100644 --- a/src/main/java/WayofTime/bloodmagic/compress/BaseCompressionHandler.java +++ b/src/main/java/WayofTime/bloodmagic/compress/BaseCompressionHandler.java @@ -6,7 +6,6 @@ import net.minecraft.world.World; public class BaseCompressionHandler extends CompressionHandler { - private final ItemStack required; private final ItemStack result; private final int leftover; diff --git a/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java b/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java index 4a6fb748..21b6357b 100644 --- a/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java +++ b/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java @@ -15,7 +15,6 @@ import java.util.List; public class StorageBlockCraftingManager { - private static final StorageBlockCraftingManager instance = new StorageBlockCraftingManager(); private List recipes = new LinkedList(); diff --git a/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingRecipeAssimilator.java b/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingRecipeAssimilator.java index 42f82a03..0b0067f5 100644 --- a/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingRecipeAssimilator.java +++ b/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingRecipeAssimilator.java @@ -18,7 +18,6 @@ import java.util.*; public class StorageBlockCraftingRecipeAssimilator { - public List getPackingRecipes() { // grab all recipes potentially suitable for packing or unpacking diff --git a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityBloodLight.java b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityBloodLight.java index 11226e43..a27bfc89 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityBloodLight.java +++ b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityBloodLight.java @@ -15,7 +15,6 @@ import net.minecraftforge.fml.common.registry.IThrowableEntity; public class EntityBloodLight extends EntityThrowable implements IThrowableEntity, IEntityAdditionalSpawnData { - public EntityLivingBase shootingEntity; protected int ticksInAir = 0; protected int maxTicksInAir = 600; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java index d127d2b5..90c3a454 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java @@ -13,7 +13,6 @@ import java.util.List; public class ItemActivationCrystal extends ItemBindable { - public static String[] names = { "weak", "awakened", "creative" }; public ItemActivationCrystal() diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java b/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java index ca94ca1a..6cbe1682 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java @@ -21,7 +21,6 @@ import java.util.List; public class ItemBloodOrb extends ItemBindable implements IBloodOrb, IBindable { - public ItemBloodOrb() { setUnlocalizedName(Constants.Mod.MODID + ".orb."); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBloodShard.java b/src/main/java/WayofTime/bloodmagic/item/ItemBloodShard.java index 8e6a4b1f..72770965 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBloodShard.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBloodShard.java @@ -12,7 +12,6 @@ import java.util.List; public class ItemBloodShard extends Item { - public String[] names = { "weak", "demon" }; public ItemBloodShard() diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java index b2c06f52..1596f879 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java @@ -21,7 +21,6 @@ import java.util.Set; public class ItemBoundAxe extends ItemBoundTool { - private static final Set EFFECTIVE_ON = Sets.newHashSet(Blocks.planks, Blocks.bookshelf, Blocks.log, Blocks.log2, Blocks.chest, Blocks.pumpkin, Blocks.lit_pumpkin, Blocks.melon_block, Blocks.ladder); public ItemBoundAxe() diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java index 94797b60..816dc640 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java @@ -22,7 +22,6 @@ import java.util.Set; public class ItemBoundPickaxe extends ItemBoundTool { - private static final Set EFFECTIVE_ON = Sets.newHashSet(Blocks.activator_rail, Blocks.coal_ore, Blocks.cobblestone, Blocks.detector_rail, Blocks.diamond_block, Blocks.diamond_ore, Blocks.double_stone_slab, Blocks.golden_rail, Blocks.gold_block, Blocks.gold_ore, Blocks.ice, Blocks.iron_block, Blocks.iron_ore, Blocks.lapis_block, Blocks.lapis_ore, Blocks.lit_redstone_ore, Blocks.mossy_cobblestone, Blocks.netherrack, Blocks.packed_ice, Blocks.rail, Blocks.redstone_ore, Blocks.sandstone, Blocks.red_sandstone, Blocks.stone, Blocks.stone_slab); public ItemBoundPickaxe() diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java index dd6d77c2..1aa87d5a 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java @@ -19,7 +19,6 @@ import java.util.Set; public class ItemBoundShovel extends ItemBoundTool { - private static final Set EFFECTIVE_ON = Sets.newHashSet(Blocks.clay, Blocks.dirt, Blocks.farmland, Blocks.grass, Blocks.gravel, Blocks.mycelium, Blocks.sand, Blocks.snow, Blocks.snow_layer, Blocks.soul_sand); public ItemBoundShovel() diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBucketEssence.java b/src/main/java/WayofTime/bloodmagic/item/ItemBucketEssence.java index 435429ce..53585ff2 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBucketEssence.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBucketEssence.java @@ -8,7 +8,6 @@ import net.minecraft.item.ItemBucket; public class ItemBucketEssence extends ItemBucket { - public ItemBucketEssence() { super(ModBlocks.lifeEssence); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java b/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java index afd4d835..03c12455 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java @@ -15,7 +15,6 @@ import WayofTime.bloodmagic.api.Constants; public class ItemComponent extends Item { - @Getter private static ArrayList names = new ArrayList(); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java b/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java index 0828789d..9f496ca8 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java @@ -20,7 +20,6 @@ import net.minecraft.world.World; public class ItemDaggerOfSacrifice extends Item { - public ItemDaggerOfSacrifice() { super(); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java b/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java index 97bcf219..1e505ca4 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java @@ -21,7 +21,6 @@ import java.util.List; // TODO - NBT based damage public class ItemInscriptionTool extends ItemBindable { - public ItemInscriptionTool() { super(); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemSlate.java b/src/main/java/WayofTime/bloodmagic/item/ItemSlate.java index 281dab6e..0e1c49cb 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemSlate.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemSlate.java @@ -15,7 +15,6 @@ import java.util.List; public class ItemSlate extends Item { - public String[] names = { "blank", "reinforced", "imbued", "demonic", "ethereal" }; public ItemSlate() diff --git a/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java b/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java index 80ebfbb9..4ffe0342 100644 --- a/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java +++ b/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java @@ -9,7 +9,6 @@ import net.minecraft.item.ItemStack; public class ItemLivingArmour extends ItemArmor { - public static String[] names = { "helmet", "chest", "legs", "boots" }; public ItemLivingArmour(int armorType) diff --git a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockBloodRune.java b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockBloodRune.java index acc3e786..4af5c8d9 100644 --- a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockBloodRune.java +++ b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockBloodRune.java @@ -7,7 +7,6 @@ import net.minecraft.item.ItemStack; public class ItemBlockBloodRune extends ItemBlock { - public ItemBlockBloodRune(Block block) { super(block); diff --git a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockBloodStoneBrick.java b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockBloodStoneBrick.java index 1110f22c..549c01e2 100644 --- a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockBloodStoneBrick.java +++ b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockBloodStoneBrick.java @@ -7,7 +7,6 @@ import net.minecraft.item.ItemStack; public class ItemBlockBloodStoneBrick extends ItemBlock { - public ItemBlockBloodStoneBrick(Block block) { super(block); diff --git a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockCrystal.java b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockCrystal.java index 9c551f62..c037b3b8 100644 --- a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockCrystal.java @@ -7,7 +7,6 @@ import net.minecraft.item.ItemStack; public class ItemBlockCrystal extends ItemBlock { - public ItemBlockCrystal(Block block) { super(block); diff --git a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockPedestal.java b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockPedestal.java index 9ec43862..033173c9 100644 --- a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockPedestal.java +++ b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockPedestal.java @@ -7,7 +7,6 @@ import net.minecraft.item.ItemStack; public class ItemBlockPedestal extends ItemBlock { - public ItemBlockPedestal(Block block) { super(block); diff --git a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockRitualController.java b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockRitualController.java index 6e3661a3..e57d9616 100644 --- a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockRitualController.java +++ b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockRitualController.java @@ -7,7 +7,6 @@ import net.minecraft.item.ItemStack; public class ItemBlockRitualController extends ItemBlock { - public ItemBlockRitualController(Block block) { super(block); diff --git a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockRitualStone.java b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockRitualStone.java index e1894f33..6162250b 100644 --- a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockRitualStone.java @@ -7,7 +7,6 @@ import net.minecraft.item.ItemStack; public class ItemBlockRitualStone extends ItemBlock { - public ItemBlockRitualStone(Block block) { super(block); diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilAir.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilAir.java index c47ea926..0324343a 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilAir.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilAir.java @@ -7,7 +7,6 @@ import net.minecraft.world.World; public class ItemSigilAir extends ItemSigilBase { - public ItemSigilAir() { super("air", 50); diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java index 8d50e4eb..a2a0c98e 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java @@ -20,7 +20,6 @@ import java.util.List; @Getter public class ItemSigilBase extends ItemBindable implements ISigil { - protected final String tooltipBase; private final String name; private boolean toggleable; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java index 6a753914..13077377 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java @@ -12,7 +12,6 @@ import net.minecraft.world.World; public class ItemSigilBloodLight extends ItemSigilBase { - public ItemSigilBloodLight() { super("bloodLight", 10); diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilCompression.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilCompression.java index db5ea0bf..2664a553 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilCompression.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilCompression.java @@ -8,7 +8,6 @@ import net.minecraft.world.World; public class ItemSigilCompression extends ItemSigilToggleable { - public ItemSigilCompression() { super("compression", 200); diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java index 61d02456..c6b4c675 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java @@ -16,7 +16,6 @@ import WayofTime.bloodmagic.util.helper.TextHelper; public class ItemSigilDivination extends ItemSigilBase implements IAltarReader { - public ItemSigilDivination() { super("divination"); diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilElementalAffinity.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilElementalAffinity.java index 7a8ed872..51321e57 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilElementalAffinity.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilElementalAffinity.java @@ -8,7 +8,6 @@ import net.minecraft.world.World; public class ItemSigilElementalAffinity extends ItemSigilToggleable { - public ItemSigilElementalAffinity() { super("elementalAffinity", 200); diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilEnderSeverance.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilEnderSeverance.java index 1bc55b72..867fe797 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilEnderSeverance.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilEnderSeverance.java @@ -13,7 +13,6 @@ import java.util.List; public class ItemSigilEnderSeverance extends ItemSigilToggleable { - public ItemSigilEnderSeverance() { super("enderSeverance", 200); diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java index e2f3d968..4cb7ae50 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java @@ -8,7 +8,6 @@ import net.minecraft.world.World; public class ItemSigilFastMiner extends ItemSigilToggleable { - public ItemSigilFastMiner() { super("fastMiner", 100); diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilGreenGrove.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilGreenGrove.java index b8d682d1..c6bad7d9 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilGreenGrove.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilGreenGrove.java @@ -12,7 +12,6 @@ import net.minecraftforge.common.IPlantable; public class ItemSigilGreenGrove extends ItemSigilToggleable { - public ItemSigilGreenGrove() { super("greenGrove", 150); diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHaste.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHaste.java index e98531be..81f303c5 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHaste.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHaste.java @@ -8,7 +8,6 @@ import net.minecraft.world.World; public class ItemSigilHaste extends ItemSigilToggleable { - public ItemSigilHaste() { super("haste", 250); diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java index 8110a26f..266f816e 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java @@ -16,7 +16,6 @@ import net.minecraftforge.fluids.IFluidHandler; public class ItemSigilLava extends ItemSigilBase { - public ItemSigilLava() { super("lava", 1000); diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilMagnetism.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilMagnetism.java index 2f0271b9..e274eeec 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilMagnetism.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilMagnetism.java @@ -11,7 +11,6 @@ import java.util.List; public class ItemSigilMagnetism extends ItemSigilToggleable { - public ItemSigilMagnetism() { super("magnetism", 50); diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilPhantomBridge.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilPhantomBridge.java index e785badf..214eb75c 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilPhantomBridge.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilPhantomBridge.java @@ -11,7 +11,6 @@ import net.minecraft.world.World; public class ItemSigilPhantomBridge extends ItemSigilToggleable { - public ItemSigilPhantomBridge() { super("phantomBridge", 100); diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSeer.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSeer.java index 64e131a0..06d3b93f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSeer.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSeer.java @@ -17,7 +17,6 @@ import WayofTime.bloodmagic.util.helper.TextHelper; public class ItemSigilSeer extends ItemSigilBase implements IAltarReader { - public ItemSigilSeer() { super("seer"); diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSuppression.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSuppression.java index e03929af..3e4b8c50 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSuppression.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSuppression.java @@ -11,7 +11,6 @@ import net.minecraftforge.fluids.IFluidBlock; public class ItemSigilSuppression extends ItemSigilToggleable { - public ItemSigilSuppression() { super("suppression", 400); diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleable.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleable.java index 240cba2a..af57e736 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleable.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleable.java @@ -17,7 +17,6 @@ import java.util.List; public class ItemSigilToggleable extends ItemSigilBase { - public ItemSigilToggleable(String name, int lpUsed) { super(name, lpUsed); diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWhirlwind.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWhirlwind.java index e7ed3de1..4ce008fa 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWhirlwind.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWhirlwind.java @@ -8,7 +8,6 @@ import net.minecraft.world.World; public class ItemSigilWhirlwind extends ItemSigilToggleable { - public ItemSigilWhirlwind() { super("whirlwind", 250); diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java b/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java index 84c348f1..536742eb 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java @@ -14,7 +14,6 @@ import WayofTime.bloodmagic.api.livingArmour.StatTracker; public class LivingArmour { - public HashMap trackerMap = new HashMap(); public HashMap upgradeMap = new HashMap(); diff --git a/src/main/java/WayofTime/bloodmagic/network/BloodMagicPacketHandler.java b/src/main/java/WayofTime/bloodmagic/network/BloodMagicPacketHandler.java index 085152bf..3108aacf 100644 --- a/src/main/java/WayofTime/bloodmagic/network/BloodMagicPacketHandler.java +++ b/src/main/java/WayofTime/bloodmagic/network/BloodMagicPacketHandler.java @@ -11,7 +11,6 @@ import net.minecraftforge.fml.relauncher.Side; public class BloodMagicPacketHandler { - public static final SimpleNetworkWrapper INSTANCE = new SimpleNetworkWrapper(Constants.Mod.MODID); public static void init() diff --git a/src/main/java/WayofTime/bloodmagic/potion/PotionBloodMagic.java b/src/main/java/WayofTime/bloodmagic/potion/PotionBloodMagic.java index 87e07d66..58466968 100644 --- a/src/main/java/WayofTime/bloodmagic/potion/PotionBloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/potion/PotionBloodMagic.java @@ -5,7 +5,6 @@ import net.minecraft.util.ResourceLocation; public class PotionBloodMagic extends Potion { - public PotionBloodMagic(String name, ResourceLocation texture, boolean badEffect, int potionColor, int iconIndexX, int iconIndexY) { super(texture, badEffect, potionColor); diff --git a/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java b/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java index a2d1d63f..a8174191 100644 --- a/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java +++ b/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java @@ -20,7 +20,6 @@ import java.util.List; public class PotionEventHandlers { - public PotionEventHandlers() { MinecraftForge.EVENT_BUS.register(this); diff --git a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java index 3282ba4b..0f2a2d4e 100644 --- a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java +++ b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java @@ -1,25 +1,20 @@ package WayofTime.bloodmagic.proxy; -import net.minecraft.client.Minecraft; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.client.model.obj.OBJLoader; import net.minecraftforge.fml.client.registry.ClientRegistry; -import net.minecraftforge.fml.client.registry.RenderingRegistry; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.client.render.RenderAlchemyArray; import WayofTime.bloodmagic.client.render.RenderAltar; -import WayofTime.bloodmagic.entity.projectile.EntityBloodLight; import WayofTime.bloodmagic.registry.ModBlocks; import WayofTime.bloodmagic.registry.ModItems; -import WayofTime.bloodmagic.render.RenderEntityBloodLight; import WayofTime.bloodmagic.tile.TileAlchemyArray; import WayofTime.bloodmagic.tile.TileAltar; import WayofTime.bloodmagic.util.helper.InventoryRenderHelper; public class ClientProxy extends CommonProxy { - private InventoryRenderHelper renderHelper; @Override @@ -31,7 +26,6 @@ public class ClientProxy extends CommonProxy @Override public void preInit() { - renderHelper = new InventoryRenderHelper(Constants.Mod.DOMAIN); ModBlocks.initRenders(); @@ -46,7 +40,7 @@ public class ClientProxy extends CommonProxy @Override public void init() { - RenderingRegistry.registerEntityRenderingHandler(EntityBloodLight.class, new RenderEntityBloodLight(Minecraft.getMinecraft().getRenderManager())); +// RenderingRegistry.registerEntityRenderingHandler(EntityBloodLight.class, new RenderEntityBloodLight(Minecraft.getMinecraft().getRenderManager())); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java b/src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java index 2ca6a1e4..1e7012e3 100644 --- a/src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java +++ b/src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java @@ -4,7 +4,6 @@ import WayofTime.bloodmagic.util.helper.InventoryRenderHelper; public class CommonProxy { - public InventoryRenderHelper getRenderHelper() { return null; diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java b/src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java index c55e8044..b7bcbec1 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java @@ -62,6 +62,7 @@ public class ModBlocks GameRegistry.registerTileEntity(TileAlchemyArray.class, Constants.Mod.MODID + ":" + TileAlchemyArray.class.getSimpleName()); GameRegistry.registerTileEntity(TileSpectralBlock.class, Constants.Mod.MODID + ":" + TileSpectralBlock.class.getSimpleName()); GameRegistry.registerTileEntity(TilePhantomBlock.class, Constants.Mod.MODID + ":" + TilePhantomBlock.class.getSimpleName()); + GameRegistry.registerTileEntity(TileTeleposer.class, Constants.Mod.MODID + ":" + TileTeleposer.class.getSimpleName()); } public static void initRenders() diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModCompatibility.java b/src/main/java/WayofTime/bloodmagic/registry/ModCompatibility.java index 1860aad9..3bd4ddbc 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModCompatibility.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModCompatibility.java @@ -8,7 +8,6 @@ import java.util.ArrayList; public class ModCompatibility { - private static ArrayList compatibilities = new ArrayList(); public static void registerModCompat() diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModEntities.java b/src/main/java/WayofTime/bloodmagic/registry/ModEntities.java index 44056f17..72fa6bea 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModEntities.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModEntities.java @@ -6,7 +6,6 @@ import net.minecraftforge.fml.common.registry.EntityRegistry; public class ModEntities { - public static void init() { int id = 0; diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModPotions.java b/src/main/java/WayofTime/bloodmagic/registry/ModPotions.java index a263005b..292a8d52 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModPotions.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModPotions.java @@ -10,7 +10,6 @@ import WayofTime.bloodmagic.potion.PotionEventHandlers; public class ModPotions { - public static Potion drowning; public static Potion boost; public static Potion heavyHeart; diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java b/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java index 69d441aa..6e53c061 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java @@ -5,10 +5,7 @@ import WayofTime.bloodmagic.api.registry.RitualRegistry; import WayofTime.bloodmagic.api.ritual.Ritual; import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual; import WayofTime.bloodmagic.ritual.*; -import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitualNight; -import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitualRain; -import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitualResistance; -import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitualZombie; +import WayofTime.bloodmagic.ritual.imperfect.*; public class ModRituals { @@ -20,6 +17,7 @@ public class ModRituals public static Ritual sufferingRitual; public static Ritual featheredKnifeRitual; + public static ImperfectRitual imperfectDay; public static ImperfectRitual imperfectNight; public static ImperfectRitual imperfectRain; public static ImperfectRitual imperfectResistance; @@ -46,6 +44,8 @@ public class ModRituals public static void initImperfectRituals() { + imperfectDay = new ImperfectRitualDay(); + ImperfectRitualRegistry.registerRitual(imperfectDay); imperfectNight = new ImperfectRitualNight(); ImperfectRitualRegistry.registerRitual(imperfectNight); imperfectRain = new ImperfectRitualRain(); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualTest.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualTest.java index d6694c32..4f41b0bf 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualTest.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualTest.java @@ -11,7 +11,6 @@ import java.util.ArrayList; public class RitualTest extends Ritual { - public RitualTest() { super("ritualTest", 0, 1000, "ritual." + Constants.Mod.MODID + ".testRitual"); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualDay.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualDay.java index 4258775f..1cdbe477 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualDay.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualDay.java @@ -8,7 +8,6 @@ import net.minecraft.init.Blocks; public class ImperfectRitualDay extends ImperfectRitual { - public ImperfectRitualDay() { super("day", new BlockStack(Blocks.gold_block), 5000, true); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualNight.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualNight.java index cde50d2b..901bca0c 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualNight.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualNight.java @@ -8,7 +8,6 @@ import net.minecraft.init.Blocks; public class ImperfectRitualNight extends ImperfectRitual { - public ImperfectRitualNight() { super("night", new BlockStack(Blocks.lapis_block), 100, true); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualRain.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualRain.java index d6ba3fae..f6226864 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualRain.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualRain.java @@ -8,7 +8,6 @@ import net.minecraft.init.Blocks; public class ImperfectRitualRain extends ImperfectRitual { - public ImperfectRitualRain() { super("rain", new BlockStack(Blocks.water), 5000, true); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualResistance.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualResistance.java index a0999490..8654366c 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualResistance.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualResistance.java @@ -10,7 +10,6 @@ import net.minecraft.potion.PotionEffect; public class ImperfectRitualResistance extends ImperfectRitual { - public ImperfectRitualResistance() { super("resistance", new BlockStack(Blocks.bedrock), 5000); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualZombie.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualZombie.java index 74b74078..e796b6ee 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualZombie.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualZombie.java @@ -11,7 +11,6 @@ import net.minecraft.potion.PotionEffect; public class ImperfectRitualZombie extends ImperfectRitual { - public ImperfectRitualZombie() { super("zombie", new BlockStack(Blocks.coal_block), 5000); diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java index a7e3ff65..63106a53 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java @@ -10,7 +10,6 @@ import WayofTime.bloodmagic.api.registry.AlchemyArrayRecipeRegistry; public class TileAlchemyArray extends TileInventory implements ITickable { - public boolean isActive = false; public int activeCounter = 0; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileAltar.java b/src/main/java/WayofTime/bloodmagic/tile/TileAltar.java index 339a1cfa..dddefaab 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileAltar.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileAltar.java @@ -15,7 +15,6 @@ import WayofTime.bloodmagic.api.altar.IBloodAltar; public class TileAltar extends TileInventory implements IBloodAltar, ITickable, IFluidTank, IFluidHandler { - private BloodAltar bloodAltar; public TileAltar() diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java b/src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java index be20fbf8..cc0fd123 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java @@ -14,7 +14,6 @@ import net.minecraft.world.World; @NoArgsConstructor public class TileImperfectRitualStone extends TileEntity implements IImperfectRitualStone { - // IImperfectRitualStone @Override diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileInventory.java b/src/main/java/WayofTime/bloodmagic/tile/TileInventory.java index 42a4bc0f..43685915 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileInventory.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileInventory.java @@ -19,7 +19,6 @@ import net.minecraft.world.World; public class TileInventory extends TileEntity implements IInventory { - protected int[] syncedSlots = new int[0]; private ItemStack[] inventory; private int size; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java index 87cae95f..ee1bcb70 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java @@ -31,7 +31,6 @@ import net.minecraftforge.fml.common.eventhandler.Event; @NoArgsConstructor public class TileMasterRitualStone extends TileEntity implements IMasterRitualStone, ITickable { - public static final int UPDATE_TIME = 20; private String owner; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java b/src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java index 9a28fdfb..561b78d2 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java @@ -7,7 +7,6 @@ import net.minecraft.util.ITickable; public class TilePhantomBlock extends TileEntity implements ITickable { - private int ticksRemaining; public TilePhantomBlock() diff --git a/src/main/java/WayofTime/bloodmagic/tile/TilePlinth.java b/src/main/java/WayofTime/bloodmagic/tile/TilePlinth.java index 634878e7..bb824969 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TilePlinth.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TilePlinth.java @@ -2,7 +2,6 @@ package WayofTime.bloodmagic.tile; public class TilePlinth extends TileInventory { - public TilePlinth() { super(1, "plinth"); diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileSpectralBlock.java b/src/main/java/WayofTime/bloodmagic/tile/TileSpectralBlock.java index cd4eb3b7..c6f135aa 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileSpectralBlock.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileSpectralBlock.java @@ -13,7 +13,6 @@ import net.minecraft.world.World; public class TileSpectralBlock extends TileEntity implements ITickable { - private int ticksRemaining; private String containedBlockName; private int containedBlockMeta; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java b/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java index 7cd7ae5a..6916f8a9 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java @@ -1,5 +1,326 @@ package WayofTime.bloodmagic.tile; -public class TileTeleposer +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.event.TeleposeEvent; +import WayofTime.bloodmagic.api.util.helper.NetworkHelper; +import WayofTime.bloodmagic.block.BlockTeleposer; +import WayofTime.bloodmagic.item.ItemBindable; +import WayofTime.bloodmagic.item.ItemTelepositionFocus; +import com.google.common.base.Strings; +import net.minecraft.block.Block; +import net.minecraft.block.BlockMobSpawner; +import net.minecraft.block.BlockPortal; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityList; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.init.Blocks; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.NetworkManager; +import net.minecraft.network.Packet; +import net.minecraft.network.play.server.S07PacketRespawn; +import net.minecraft.network.play.server.S1DPacketEntityEffect; +import net.minecraft.network.play.server.S1FPacketSetExperience; +import net.minecraft.network.play.server.S35PacketUpdateTileEntity; +import net.minecraft.potion.PotionEffect; +import net.minecraft.server.MinecraftServer; +import net.minecraft.server.management.ServerConfigurationManager; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; +import net.minecraft.util.ITickable; +import net.minecraft.world.World; +import net.minecraft.world.WorldServer; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.common.FMLCommonHandler; + +import java.util.Iterator; +import java.util.List; + +public class TileTeleposer extends TileInventory implements ITickable { + //TODO FUTURE: Make AreaDescriptor for Teleposer perhaps? + public static final String TELEPOSER_RANGE = "teleposerRange"; + + private int previousInput; + + public TileTeleposer() + { + super(1, "teleposer"); + } + + @Override + public void readFromNBT(NBTTagCompound tagCompound) + { + super.readFromNBT(tagCompound); + previousInput = tagCompound.getInteger(Constants.NBT.PREVIOUS_INPUT); + } + + @Override + public void writeToNBT(NBTTagCompound tagCompound) + { + super.writeToNBT(tagCompound); + tagCompound.setInteger(Constants.NBT.PREVIOUS_INPUT, previousInput); + } + + @Override + public void update() + { + if (!worldObj.isRemote) + { + int currentInput = worldObj.getStrongPower(pos); + + if (previousInput == 0 && currentInput != 0) + { + initiateTeleport(); + } + + previousInput = currentInput; + } + } + + public void initiateTeleport() + { + if (!worldObj.isRemote && worldObj.getTileEntity(pos) != null && worldObj.getTileEntity(pos) instanceof TileTeleposer && canInitiateTeleport((TileTeleposer) worldObj.getTileEntity(pos)) && worldObj.getBlockState(pos).getBlock() instanceof BlockTeleposer) + { + TileTeleposer teleposer = (TileTeleposer) worldObj.getTileEntity(pos); + ItemTelepositionFocus focus = (ItemTelepositionFocus) teleposer.getStackInSlot(0).getItem(); + BlockPos focusPos = focus.getBlockPos(teleposer.getStackInSlot(0)); + World focusWorld = focus.getWorld(teleposer.getStackInSlot(0)); + + if (focusWorld != null && focusWorld.getTileEntity(focusPos) instanceof TileTeleposer && !focusWorld.getTileEntity(focusPos).equals(this)) + { + final int focusLevel = (teleposer.getStackInSlot(0).getItemDamage() + 1); + final int lpToBeDrained = (int) (0.5F * Math.sqrt((pos.getX() - focusPos.getX()) * (pos.getX() - focusPos.getX()) + (pos.getY() - focusPos.getY() + 1) * (pos.getY() - focusPos.getY() + 1) + (pos.getZ() - focusPos.getZ()) * (pos.getZ() - focusPos.getZ()))); + int entityCount = 0; + + //TODO MAKE THIS SYPHON LP BETTER + if (ItemBindable.syphonNetwork(teleposer.getStackInSlot(0), lpToBeDrained * (focusLevel * 2 - 1) * (focusLevel * 2 - 1) * (focusLevel * 2 - 1) + lpToBeDrained * entityCount)) + { + List entityList1 = null; + List entityList2 = null; + + if (focusWorld.equals(worldObj)) + { + { + AxisAlignedBB area51 = AxisAlignedBB.fromBounds(pos.getX() - 0.5, pos.getY() + focusLevel, pos.getZ() - 0.5, pos.getX() + 0.5, Math.min(focusWorld.getHeight(), pos.getY() + 2 + focusLevel + focusLevel), pos.getZ() + 0.5).expand(focusLevel, focusLevel, focusLevel); + entityList1 = worldObj.getEntitiesWithinAABB(EntityLivingBase.class, area51); + for (EntityLivingBase entity : entityList1) + entityCount++; + } + + { + AxisAlignedBB area52 = AxisAlignedBB.fromBounds(focusPos.getX() - 0.5, focusPos.getY() + focusLevel, focusPos.getZ() - 0.5, focusPos.getX() + 0.5, focusPos.getY() + 1.5 + focusLevel, focusPos.getZ() + 0.5).expand(focusLevel, focusLevel, focusLevel); + entityList2 = focusWorld.getEntitiesWithinAABB(EntityLivingBase.class, area52); + for (EntityLivingBase entity : entityList2) + entityCount++; + } + } + + int blocksTransported = 0; + + for (int i = -(focusLevel - 1); i <= (focusLevel - 1); i++) + { + for (int j = 0; j <= (focusLevel * 2 - 2); j++) + { + for (int k = 0; k <= (focusLevel - 1); k++) + { + if (teleportBlocks(this, worldObj, pos.add(i, 1 + j, k), focusWorld, focusPos.add(i, 1 + j, k))) + { + blocksTransported++; + } + } + } + } + + NetworkHelper.syphonFromContainer(teleposer.getStackInSlot(0), lpToBeDrained * blocksTransported + lpToBeDrained * entityCount); + + if (focusWorld.equals(worldObj)) + { + if (entityList1 != null && !entityList1.isEmpty()) + { + for (EntityLivingBase entity : entityList1) + { + entity.worldObj = focusWorld; + entity.setPositionAndUpdate(entity.posX - pos.getX() + focusPos.getX(), entity.posY - pos.getY() + focusPos.getY(), entity.posZ - pos.getZ() + focusPos.getZ()); + } + } + + if (entityList2 != null && !entityList2.isEmpty()) + { + for (EntityLivingBase entity : entityList2) + { + entity.worldObj = focusWorld; + entity.setPositionAndUpdate(entity.posX - pos.getX() + focusPos.getX(), entity.posY - pos.getY() + focusPos.getY(), entity.posZ - pos.getZ() + focusPos.getZ()); + } + } + } + else + { + if (entityList1 != null && !entityList1.isEmpty()) + { + for (EntityLivingBase entity : entityList1) + { + entity.worldObj = focusWorld; + teleportEntityToDim(worldObj, focusWorld.provider.getDimensionId(), entity.posX - pos.getX() + focusPos.getX(), entity.posY - pos.getY() + focusPos.getY(), entity.posZ - pos.getZ() + focusPos.getZ(), entity); + } + } + + if (entityList2 != null && !entityList2.isEmpty()) + { + for (EntityLivingBase entity : entityList2) + { + entity.worldObj = focusWorld; + teleportEntityToDim(focusWorld, worldObj.provider.getDimensionId(), entity.posX - pos.getX() + focusPos.getX(), entity.posY - pos.getY() + focusPos.getY(), entity.posZ - pos.getZ() + focusPos.getZ(), entity); + } + } + } + } + } + } + } + + private boolean canInitiateTeleport(TileTeleposer teleposer) + { + return teleposer.getStackInSlot(0) != null && teleposer.getStackInSlot(0).getItem() instanceof ItemTelepositionFocus && !Strings.isNullOrEmpty(((ItemTelepositionFocus) teleposer.getStackInSlot(0).getItem()).getBindableOwner(teleposer.getStackInSlot(0))); + } + + public static boolean teleportBlocks(Object caller, World initialWorld, BlockPos initialPos, World finalWorld, BlockPos finalPos) + { + TileEntity initialTile = initialWorld.getTileEntity(initialPos); + TileEntity finalTile = finalWorld.getTileEntity(finalPos); + NBTTagCompound initialTag = new NBTTagCompound(); + NBTTagCompound finalTag = new NBTTagCompound(); + if (initialTile != null) initialTile.writeToNBT(initialTag); + if (finalTile != null) finalTile.writeToNBT(finalTag); + + Block initialBlock = initialWorld.getBlockState(initialPos).getBlock(); + Block finalBlock = finalWorld.getBlockState(finalPos).getBlock(); + + if ((initialBlock.equals(Blocks.air) && finalBlock.equals(Blocks.air)) || (initialBlock instanceof BlockMobSpawner || finalBlock instanceof BlockMobSpawner || +// caller instanceof TEDemonPortal ? false : + initialBlock instanceof BlockPortal || finalBlock instanceof BlockPortal)) + { + return false; + } + + int initialMeta = initialBlock.getMetaFromState(initialWorld.getBlockState(initialPos)); + int finalMeta = finalBlock.getMetaFromState(finalWorld.getBlockState(finalPos)); + + TeleposeEvent event = new TeleposeEvent(initialWorld, initialPos, initialBlock, initialMeta, finalWorld, finalPos, finalBlock, finalMeta); + if (MinecraftForge.EVENT_BUS.post(event)) return false; + + initialWorld.playSoundEffect(initialPos.getX(), initialPos.getY(), initialPos.getZ(), "mob.endermen.portal", 1.0F, 1.0F); + finalWorld.playSoundEffect(finalPos.getX(), finalPos.getY(), finalPos.getZ(), "mob.endermen.portal", 1.0F, 1.0F); + + //Finally, we get to do something! (CLEARING TILES) + if (finalBlock != null) + finalWorld.setTileEntity(finalPos, finalBlock.createTileEntity(finalWorld, finalWorld.getBlockState(finalPos))); + if (initialBlock != null) + initialWorld.setTileEntity(initialPos, initialBlock.createTileEntity(initialWorld, initialWorld.getBlockState(initialPos))); + + //TILES CLEARED + IBlockState initialBlockState = initialWorld.getBlockState(initialPos); + IBlockState finalBlockState = finalWorld.getBlockState(finalPos); + finalWorld.setBlockState(finalPos, initialBlockState, 3); + + if (initialTile != null) + { + TileEntity newTileInitial = TileEntity.createAndLoadEntity(initialTag); + + //TODO FUTURE FMP STUFF HERE + + finalWorld.setTileEntity(finalPos, newTileInitial); + newTileInitial.setPos(finalPos); + } + + initialWorld.setBlockState(initialPos, finalBlockState, 3); + + if (finalTile != null) + { + TileEntity newTileFinal = TileEntity.createAndLoadEntity(finalTag); + + //TODO FUTURE FMP STUFF HERE + + initialWorld.setTileEntity(initialPos, newTileFinal); + newTileFinal.setPos(initialPos); + } + + initialWorld.notifyNeighborsOfStateChange(initialPos, finalBlock); + finalWorld.notifyNeighborsOfStateChange(finalPos, initialBlock); + + return true; + } + + public static Entity teleportEntityToDim(World prevWorld, int newWorldID, double d, double e, double f, Entity entity) + { + if (entity != null) + { + if (entity.timeUntilPortal <= 0) + { + WorldServer oldWorldServer = MinecraftServer.getServer().worldServerForDimension(entity.dimension); + WorldServer newWorldServer = MinecraftServer.getServer().worldServerForDimension(newWorldID); + if (entity instanceof EntityPlayer) + { + EntityPlayerMP player = (EntityPlayerMP) entity; + if (!player.worldObj.isRemote) + { + player.worldObj.theProfiler.startSection("portal"); + player.worldObj.theProfiler.startSection("changeDimension"); + ServerConfigurationManager config = player.mcServer.getConfigurationManager(); + prevWorld.playSoundEffect(player.posX, player.posY, player.posZ, "mob.endermen.portal", 1.0F, 1.0F); + player.closeScreen(); + player.dimension = newWorldServer.provider.getDimensionId(); + player.playerNetServerHandler.sendPacket(new S07PacketRespawn(player.dimension, player.worldObj.getDifficulty(), newWorldServer.getWorldInfo().getTerrainType(), player.theItemInWorldManager.getGameType())); + oldWorldServer.removeEntity(player); + player.isDead = false; + player.setLocationAndAngles(d, e, f, player.rotationYaw, player.rotationPitch); + newWorldServer.spawnEntityInWorld(player); + player.setWorld(newWorldServer); + config.preparePlayer(player, oldWorldServer); + player.playerNetServerHandler.setPlayerLocation(d, e, f, entity.rotationYaw, entity.rotationPitch); + player.theItemInWorldManager.setWorld(newWorldServer); + config.updateTimeAndWeatherForPlayer(player, newWorldServer); + config.syncPlayerInventory(player); + player.worldObj.theProfiler.endSection(); + oldWorldServer.resetUpdateEntityTick(); + newWorldServer.resetUpdateEntityTick(); + player.worldObj.theProfiler.endSection(); + for (Iterator potion = player.getActivePotionEffects().iterator(); potion.hasNext(); ) + { + player.playerNetServerHandler.sendPacket(new S1DPacketEntityEffect(player.getEntityId(), potion.next())); + } + player.playerNetServerHandler.sendPacket(new S1FPacketSetExperience(player.experience, player.experienceTotal, player.experienceLevel)); + FMLCommonHandler.instance().firePlayerChangedDimensionEvent(player, oldWorldServer.provider.getDimensionId(), player.dimension); + player.timeUntilPortal = 150; + } + player.worldObj.theProfiler.endSection(); + newWorldServer.playSoundEffect(d, e, f, "mob.endermen.portal", 1.0F, 1.0F); + return player; + } else + { + NBTTagCompound tag = new NBTTagCompound(); + entity.writeToNBTOptional(tag); + entity.setDead(); + prevWorld.playSoundEffect(entity.posX, entity.posY, entity.posZ, "mob.endermen.portal", 1.0F, 1.0F); + Entity teleportedEntity = EntityList.createEntityFromNBT(tag, newWorldServer); + if (teleportedEntity != null) + { + teleportedEntity.setLocationAndAngles(d, e, f, entity.rotationYaw, entity.rotationPitch); + teleportedEntity.forceSpawn = true; + newWorldServer.spawnEntityInWorld(teleportedEntity); + teleportedEntity.setWorld(newWorldServer); + teleportedEntity.timeUntilPortal = 150; + } + oldWorldServer.resetUpdateEntityTick(); + newWorldServer.resetUpdateEntityTick(); + newWorldServer.playSoundEffect(d, e, f, "mob.endermen.portal", 1.0F, 1.0F); + return teleportedEntity; + } + } + } + return null; + } } diff --git a/src/main/java/WayofTime/bloodmagic/tile/container/ContainerTeleposer.java b/src/main/java/WayofTime/bloodmagic/tile/container/ContainerTeleposer.java new file mode 100644 index 00000000..53f5fcc3 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/tile/container/ContainerTeleposer.java @@ -0,0 +1,99 @@ +package WayofTime.bloodmagic.tile.container; + +import WayofTime.bloodmagic.item.ItemTelepositionFocus; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; + +public class ContainerTeleposer extends Container +{ + private final IInventory tileTeleposer; + + public ContainerTeleposer(InventoryPlayer inventoryPlayer, IInventory tileTeleposer) + { + this.tileTeleposer = tileTeleposer; + this.addSlotToContainer(new SlotTeleposer(tileTeleposer, 0, 80, 33)); + + for (int i = 0; i < 3; i++) + { + for (int j = 0; j < 9; j++) + { + addSlotToContainer(new Slot(inventoryPlayer, j + i * 9 + 9, 8 + j * 18, 57 + i * 18)); + } + } + + for (int i = 0; i < 9; i++) + { + addSlotToContainer(new Slot(inventoryPlayer, i, 8 + i * 18, 115)); + } + } + + @Override + public ItemStack transferStackInSlot(EntityPlayer player, int slot) + { + ItemStack stack = null; + Slot slotObject = inventorySlots.get(slot); + int slots = inventorySlots.size(); + + if (slotObject != null && slotObject.getHasStack()) + { + ItemStack stackInSlot = slotObject.getStack(); + stack = stackInSlot.copy(); + + if (stack.getItem() instanceof ItemTelepositionFocus) + { + if (slot <= slots) + { + if (!this.mergeItemStack(stackInSlot, 0, slots, false)) + { + return null; + } + } + else if (!this.mergeItemStack(stackInSlot, slots, 36 + slots, false)) + { + return null; + } + } + + if (stackInSlot.stackSize == 0) + { + slotObject.putStack(null); + } else + { + slotObject.onSlotChanged(); + } + + if (stackInSlot.stackSize == stack.stackSize) + { + return null; + } + + slotObject.onPickupFromSlot(player, stackInSlot); + } + + return stack; + } + + @Override + public boolean canInteractWith(EntityPlayer playerIn) + { + return this.tileTeleposer.isUseableByPlayer(playerIn); + } + + private class SlotTeleposer extends Slot + { + public SlotTeleposer(IInventory inventory, int slotIndex, int x, int y) + { + super(inventory, slotIndex, x, y); + } + + @Override + public boolean isItemValid(ItemStack itemStack) + { + return itemStack.getItem() instanceof ItemTelepositionFocus; + } + } +} diff --git a/src/main/java/WayofTime/bloodmagic/util/ChatUtil.java b/src/main/java/WayofTime/bloodmagic/util/ChatUtil.java index 0b13fc20..ba855313 100644 --- a/src/main/java/WayofTime/bloodmagic/util/ChatUtil.java +++ b/src/main/java/WayofTime/bloodmagic/util/ChatUtil.java @@ -17,7 +17,6 @@ import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; public class ChatUtil { - private static final int DELETION_ID = 2525277; private static int lastAdded; diff --git a/src/main/java/WayofTime/bloodmagic/util/Utils.java b/src/main/java/WayofTime/bloodmagic/util/Utils.java index e74550a9..fae0d25e 100644 --- a/src/main/java/WayofTime/bloodmagic/util/Utils.java +++ b/src/main/java/WayofTime/bloodmagic/util/Utils.java @@ -11,7 +11,6 @@ import WayofTime.bloodmagic.tile.TileInventory; public class Utils { - public static boolean isInteger(String integer) { try diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/InventoryRenderHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/InventoryRenderHelper.java index 399653cb..8f27f04f 100644 --- a/src/main/java/WayofTime/bloodmagic/util/helper/InventoryRenderHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/InventoryRenderHelper.java @@ -26,7 +26,6 @@ import net.minecraftforge.client.model.ModelLoader; */ public class InventoryRenderHelper { - /** * This is the base string for your resources. It will usually be your modid * in all lowercase with a colon at the end. diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/TextHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/TextHelper.java index 99231402..13cf651a 100644 --- a/src/main/java/WayofTime/bloodmagic/util/helper/TextHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/TextHelper.java @@ -8,7 +8,6 @@ import java.util.List; public class TextHelper { - public static String getFormattedText(String string) { return string.replaceAll("&", "\u00A7"); diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index 9e7e7f60..082f25e6 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -140,6 +140,8 @@ tile.BloodMagic.bloodLight.name=Blood Light tile.BloodMagic.spectralBlock.name=Spectral Block tile.BloodMagic.phantomBlock.name=Phantom Block +tile.BloodMagic.teleposer.name=Teleposer + # Tooltips tooltip.BloodMagic.orb.desc=Stores raw Life Essence tooltip.BloodMagic.orb.owner=Added by: %s diff --git a/src/main/resources/assets/bloodmagic/textures/gui/teleposer.png b/src/main/resources/assets/bloodmagic/textures/gui/teleposer.png new file mode 100644 index 00000000..7de227b3 Binary files /dev/null and b/src/main/resources/assets/bloodmagic/textures/gui/teleposer.png differ