diff --git a/build.gradle b/build.gradle index b66d6c7b..6a717c83 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { maven { url "https://oss.sonatype.org/content/repositories/snapshots/" } } dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT' + classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT' classpath 'org.ajoberstar:gradle-git:0.10.1' } } diff --git a/gradle.properties b/gradle.properties index 9e743540..0ad7bf48 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,13 +1,13 @@ mod_name=BloodMagic package_group=com.wayoftime.bloodmagic mod_version=2.0.0 -mc_version=1.9 -forge_version=12.16.0.1865-1.9 +mc_version=1.9.4 +forge_version=12.17.0.1909-1.9.4 curse_id=224791 -mappings_version=snapshot_20160424 +mappings_version=snapshot_20160518 -jei_version=3.3.2.196 +jei_version=3.4.0.204 waila_version=1.7.0-B2 thaumcraft_version=5.1.5 baubles_version=1.1.3.0 diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/package-info.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/package-info.java new file mode 100644 index 00000000..26146be9 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.alchemyArray; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java index c1180afc..9c39d13d 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java @@ -339,7 +339,7 @@ public class BloodAltar implements IFluidHandler { BlockPos newPos = pos.offset(facing); IBlockState block = world.getBlockState(newPos); - block.getBlock().onNeighborBlockChange(world, newPos, block, block.getBlock()); + block.getBlock().neighborChanged(block, world, newPos, block.getBlock()); } } if (internalCounter % (Math.max(20 - this.accelerationUpgrades, 1)) == 0) diff --git a/src/main/java/WayofTime/bloodmagic/altar/package-info.java b/src/main/java/WayofTime/bloodmagic/altar/package-info.java new file mode 100644 index 00000000..09fb9ffc --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/altar/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.altar; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/package-info.java b/src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/package-info.java new file mode 100644 index 00000000..4d8e0bce --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.api.alchemyCrafting; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/api/altar/package-info.java b/src/main/java/WayofTime/bloodmagic/api/altar/package-info.java new file mode 100644 index 00000000..2da60236 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/api/altar/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.api.altar; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/api/compress/package-info.java b/src/main/java/WayofTime/bloodmagic/api/compress/package-info.java new file mode 100644 index 00000000..d630cf23 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/api/compress/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.api.compress; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/api/event/package-info.java b/src/main/java/WayofTime/bloodmagic/api/event/package-info.java new file mode 100644 index 00000000..311179bc --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/api/event/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.api.event; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/api/iface/package-info.java b/src/main/java/WayofTime/bloodmagic/api/iface/package-info.java new file mode 100644 index 00000000..d1022e5d --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/api/iface/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.api.iface; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/package-info.java b/src/main/java/WayofTime/bloodmagic/api/impl/package-info.java new file mode 100644 index 00000000..79e9503c --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/api/impl/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.api.impl; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/api/incense/package-info.java b/src/main/java/WayofTime/bloodmagic/api/incense/package-info.java new file mode 100644 index 00000000..a1f33e28 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/api/incense/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.api.incense; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/api/livingArmour/package-info.java b/src/main/java/WayofTime/bloodmagic/api/livingArmour/package-info.java new file mode 100644 index 00000000..0c4b0d82 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/api/livingArmour/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.api.livingArmour; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/api/network/SoulNetwork.java b/src/main/java/WayofTime/bloodmagic/api/network/SoulNetwork.java index 2811ef10..976f1aaf 100644 --- a/src/main/java/WayofTime/bloodmagic/api/network/SoulNetwork.java +++ b/src/main/java/WayofTime/bloodmagic/api/network/SoulNetwork.java @@ -48,10 +48,11 @@ public class SoulNetwork extends WorldSavedData } @Override - public void writeToNBT(NBTTagCompound nbttagcompound) + public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { nbttagcompound.setInteger(Constants.NBT.CURRENT_ESSENCE, currentEssence); nbttagcompound.setInteger(Constants.NBT.ORB_TIER, orbTier); + return nbttagcompound; } public int addLifeEssence(int toAdd, int maximum) diff --git a/src/main/java/WayofTime/bloodmagic/api/network/package-info.java b/src/main/java/WayofTime/bloodmagic/api/network/package-info.java new file mode 100644 index 00000000..6661a13d --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/api/network/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.api.network; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/api/orb/package-info.java b/src/main/java/WayofTime/bloodmagic/api/orb/package-info.java new file mode 100644 index 00000000..12df1f09 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/api/orb/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.api.orb; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/api/package-info.java b/src/main/java/WayofTime/bloodmagic/api/package-info.java index c40a7361..f516a3de 100644 --- a/src/main/java/WayofTime/bloodmagic/api/package-info.java +++ b/src/main/java/WayofTime/bloodmagic/api/package-info.java @@ -1,5 +1,10 @@ @API(owner = "BloodMagic", provides = "BloodMagic|API", apiVersion = "@VERSION@") +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault package WayofTime.bloodmagic.api; +import mcp.MethodsReturnNonnullByDefault; import net.minecraftforge.fml.common.API; +import javax.annotation.ParametersAreNonnullByDefault; + diff --git a/src/main/java/WayofTime/bloodmagic/api/recipe/package-info.java b/src/main/java/WayofTime/bloodmagic/api/recipe/package-info.java new file mode 100644 index 00000000..0df6d474 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/api/recipe/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.api.recipe; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/api/registry/package-info.java b/src/main/java/WayofTime/bloodmagic/api/registry/package-info.java new file mode 100644 index 00000000..3f16ccd3 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/api/registry/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.api.registry; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/api/ritual/imperfect/package-info.java b/src/main/java/WayofTime/bloodmagic/api/ritual/imperfect/package-info.java new file mode 100644 index 00000000..5740241a --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/api/ritual/imperfect/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.api.ritual.imperfect; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/api/ritual/package-info.java b/src/main/java/WayofTime/bloodmagic/api/ritual/package-info.java new file mode 100644 index 00000000..b0c44863 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/api/ritual/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.api.ritual; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/api/soul/package-info.java b/src/main/java/WayofTime/bloodmagic/api/soul/package-info.java new file mode 100644 index 00000000..d248248c --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/api/soul/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.api.soul; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/api/teleport/package-info.java b/src/main/java/WayofTime/bloodmagic/api/teleport/package-info.java new file mode 100644 index 00000000..64276d1a --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/api/teleport/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.api.teleport; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file 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 da525baa..53d08d8a 100644 --- a/src/main/java/WayofTime/bloodmagic/api/util/helper/NetworkHelper.java +++ b/src/main/java/WayofTime/bloodmagic/api/util/helper/NetworkHelper.java @@ -38,7 +38,7 @@ public class NetworkHelper return new SoulNetwork(uuid); } - SoulNetwork network = (SoulNetwork) world.getMapStorage().loadData(SoulNetwork.class, uuid); + SoulNetwork network = (SoulNetwork) world.getMapStorage().getOrLoadData(SoulNetwork.class, uuid); if (network == null) { diff --git a/src/main/java/WayofTime/bloodmagic/api/util/helper/package-info.java b/src/main/java/WayofTime/bloodmagic/api/util/helper/package-info.java new file mode 100644 index 00000000..6e2b5bcb --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/api/util/helper/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.api.util.helper; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyTable.java index c884e558..2674b21b 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyTable.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyTable.java @@ -152,7 +152,7 @@ public class BlockAlchemyTable extends BlockContainer } @Override - public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block neighborBlock) + public void neighborChanged(IBlockState state, World world, BlockPos pos, Block neighborBlock) { TileAlchemyTable tile = (TileAlchemyTable) world.getTileEntity(pos); if (tile != null) diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java b/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java index f042d229..614158e8 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java @@ -8,6 +8,7 @@ import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityPlayerSP; +import net.minecraft.client.particle.ParticleManager; import net.minecraft.entity.Entity; import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumParticleTypes; @@ -76,12 +77,12 @@ public class BlockBloodLight extends Block @Override @SideOnly(Side.CLIENT) - public boolean addDestroyEffects(World world, BlockPos pos, net.minecraft.client.particle.EffectRenderer effectRenderer) + public boolean addDestroyEffects(World world, BlockPos pos, ParticleManager particleManager) { if (world.getBlockState(pos).getBlock() == this) { Random random = new Random(); - effectRenderer.spawnEffectParticle(EnumParticleTypes.REDSTONE.getParticleID(), pos.getX() + 0.5D + random.nextGaussian() / 8, pos.getY() + 0.5D, pos.getZ() + 0.5D + random.nextGaussian() / 8, 0, 0, 0); + particleManager.spawnEffectParticle(EnumParticleTypes.REDSTONE.getParticleID(), pos.getX() + 0.5D + random.nextGaussian() / 8, pos.getY() + 0.5D, pos.getZ() + 0.5D + random.nextGaussian() / 8, 0, 0, 0); } return true; } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java index 0d0fd184..44aaea2b 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java @@ -60,7 +60,7 @@ public class BlockDemonCrystal extends BlockContainer } @Override - public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block neighborBlock) + public void neighborChanged(IBlockState state, World world, BlockPos pos, Block neighborBlock) { TileDemonCrystal tile = (TileDemonCrystal) world.getTileEntity(pos); EnumFacing placement = tile.getPlacement(); diff --git a/src/main/java/WayofTime/bloodmagic/block/base/BlockIntegerContainer.java b/src/main/java/WayofTime/bloodmagic/block/base/BlockIntegerContainer.java index ee6650b1..4873a082 100644 --- a/src/main/java/WayofTime/bloodmagic/block/base/BlockIntegerContainer.java +++ b/src/main/java/WayofTime/bloodmagic/block/base/BlockIntegerContainer.java @@ -29,9 +29,9 @@ public abstract class BlockIntegerContainer extends BlockInteger implements ITil } @Override - public boolean onBlockEventReceived(World worldIn, BlockPos pos, IBlockState state, int eventID, int eventParam) + public boolean eventReceived(IBlockState state, World worldIn, BlockPos pos, int eventID, int eventParam) { - super.onBlockEventReceived(worldIn, pos, state, eventID, eventParam); + super.eventReceived(state, worldIn, pos, eventID, eventParam); TileEntity tileentity = worldIn.getTileEntity(pos); return tileentity != null && tileentity.receiveClientEvent(eventID, eventParam); } diff --git a/src/main/java/WayofTime/bloodmagic/block/base/BlockStringContainer.java b/src/main/java/WayofTime/bloodmagic/block/base/BlockStringContainer.java index 4ab06cc9..a397e96b 100644 --- a/src/main/java/WayofTime/bloodmagic/block/base/BlockStringContainer.java +++ b/src/main/java/WayofTime/bloodmagic/block/base/BlockStringContainer.java @@ -29,9 +29,9 @@ public abstract class BlockStringContainer extends BlockString implements ITileE } @Override - public boolean onBlockEventReceived(World worldIn, BlockPos pos, IBlockState state, int eventID, int eventParam) + public boolean eventReceived(IBlockState state, World worldIn, BlockPos pos, int eventID, int eventParam) { - super.onBlockEventReceived(worldIn, pos, state, eventID, eventParam); + super.eventReceived(state, worldIn, pos, eventID, eventParam); TileEntity tileentity = worldIn.getTileEntity(pos); return tileentity != null && tileentity.receiveClientEvent(eventID, eventParam); } diff --git a/src/main/java/WayofTime/bloodmagic/block/base/package-info.java b/src/main/java/WayofTime/bloodmagic/block/base/package-info.java new file mode 100644 index 00000000..21c18a65 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/block/base/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.block.base; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/block/package-info.java b/src/main/java/WayofTime/bloodmagic/block/package-info.java new file mode 100644 index 00000000..1043d727 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/block/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.block; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/block/property/package-info.java b/src/main/java/WayofTime/bloodmagic/block/property/package-info.java new file mode 100644 index 00000000..ace8db97 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/block/property/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.block.property; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/config/package-info.java b/src/main/java/WayofTime/bloodmagic/client/gui/config/package-info.java new file mode 100644 index 00000000..31a6c581 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/client/gui/config/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.client.gui.config; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/package-info.java b/src/main/java/WayofTime/bloodmagic/client/gui/package-info.java new file mode 100644 index 00000000..7ba8bbd0 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/client/gui/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.client.gui; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/client/helper/package-info.java b/src/main/java/WayofTime/bloodmagic/client/helper/package-info.java new file mode 100644 index 00000000..798e55d3 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/client/helper/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.client.helper; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/client/mesh/package-info.java b/src/main/java/WayofTime/bloodmagic/client/mesh/package-info.java new file mode 100644 index 00000000..8e65a180 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/client/mesh/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.client.mesh; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/client/package-info.java b/src/main/java/WayofTime/bloodmagic/client/package-info.java new file mode 100644 index 00000000..eb0fbfaa --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/client/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.client; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/package-info.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/package-info.java new file mode 100644 index 00000000..39585689 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.client.render.alchemyArray; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/package-info.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/package-info.java new file mode 100644 index 00000000..fdf48817 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.client.render.entity; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/client/render/package-info.java b/src/main/java/WayofTime/bloodmagic/client/render/package-info.java new file mode 100644 index 00000000..e465b881 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/client/render/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.client.render; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/command/package-info.java b/src/main/java/WayofTime/bloodmagic/command/package-info.java new file mode 100644 index 00000000..bdfb59bd --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/command/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.command; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/command/sub/package-info.java b/src/main/java/WayofTime/bloodmagic/command/sub/package-info.java new file mode 100644 index 00000000..04788ab8 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/command/sub/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.command.sub; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/compat/direwolf/CompatibilityDirewolf.java b/src/main/java/WayofTime/bloodmagic/compat/direwolf/CompatibilityDirewolf.java new file mode 100644 index 00000000..5cbb1b51 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/compat/direwolf/CompatibilityDirewolf.java @@ -0,0 +1,59 @@ +package WayofTime.bloodmagic.compat.direwolf; + +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.altar.EnumAltarTier; +import WayofTime.bloodmagic.api.event.AltarCraftedEvent; +import WayofTime.bloodmagic.api.registry.AltarRecipeRegistry; +import WayofTime.bloodmagic.compat.ICompatibility; +import WayofTime.bloodmagic.util.helper.TextHelper; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.player.ItemTooltipEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; + +public class CompatibilityDirewolf implements ICompatibility +{ + @Override + public void loadCompatibility(InitializationPhase phase) + { + if (phase == InitializationPhase.POST_INIT) + { + AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Items.BREAD), new ItemStack(Items.BREAD), EnumAltarTier.ONE, 10, 1, 0)); + MinecraftForge.EVENT_BUS.register(this); + } + } + + @Override + public String getModId() + { + return Constants.Mod.MODID; + } + + @Override + public boolean enableCompat() + { + return true; + } + + @SubscribeEvent + public void onAltarCrafted(AltarCraftedEvent event) + { + if (event.getOutput().getItem() == Items.BREAD) + { + event.getOutput().setTagCompound(new NBTTagCompound()); + event.getOutput().setStackDisplayName(TextHelper.localizeEffect("secret.BloodMagic.bread.bloody")); + event.getOutput().getTagCompound().setBoolean("bloody", true); + } + } + + @SubscribeEvent + public void onTooltip(ItemTooltipEvent event) + { + if (event.getItemStack().getItem() == Items.BREAD) + if (event.getItemStack().hasTagCompound()) + if (event.getItemStack().getTagCompound().hasKey("bloody")) + event.getToolTip().add(TextHelper.localizeEffect("secret.BloodMagic.bread.bloody.desc")); + } +} diff --git a/src/main/java/WayofTime/bloodmagic/compat/direwolf/package-info.java b/src/main/java/WayofTime/bloodmagic/compat/direwolf/package-info.java new file mode 100644 index 00000000..86162678 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/compat/direwolf/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.compat.direwolf; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/CompatibilityGuideAPI.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/CompatibilityGuideAPI.java new file mode 100644 index 00000000..e403a49b --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/CompatibilityGuideAPI.java @@ -0,0 +1,41 @@ +//package WayofTime.bloodmagic.compat.guideapi; +// +//import WayofTime.bloodmagic.api.altar.EnumAltarTier; +//import WayofTime.bloodmagic.api.registry.AltarRecipeRegistry; +//import WayofTime.bloodmagic.compat.ICompatibility; +//import amerifrance.guideapi.api.GuideAPI; +//import net.minecraft.init.Items; +//import net.minecraft.item.ItemStack; +//import net.minecraftforge.fml.common.registry.GameRegistry; +// +//public class CompatibilityGuideAPI implements ICompatibility { +// +// @Override +// public void loadCompatibility(InitializationPhase phase) { +// switch (phase) { +// case PRE_INIT: { +// GuideBloodMagic.initBook(); +// AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Items.BOOK), GuideAPI.getStackFromBook(GuideBloodMagic.guideBook), EnumAltarTier.ONE, 500, 2, 0)); +// break; +// } +// case INIT: { +// break; +// } +// case POST_INIT: { +// GuideBloodMagic.initCategories(); +// GameRegistry.register(GuideBloodMagic.guideBook); +// break; +// } +// } +// } +// +// @Override +// public String getModId() { +// return "guideapi"; +// } +// +// @Override +// public boolean enableCompat() { +// return true; +// } +//} diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/GuideBloodMagic.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/GuideBloodMagic.java new file mode 100644 index 00000000..ac6bd0a5 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/GuideBloodMagic.java @@ -0,0 +1,56 @@ +//package WayofTime.bloodmagic.compat.guideapi; +// +//import WayofTime.bloodmagic.compat.guideapi.book.*; +//import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin; +//import WayofTime.bloodmagic.registry.ModBlocks; +//import WayofTime.bloodmagic.registry.ModItems; +//import amerifrance.guideapi.api.GuideAPI; +//import amerifrance.guideapi.api.impl.Book; +//import amerifrance.guideapi.api.util.NBTBookTags; +//import amerifrance.guideapi.category.CategoryItemStack; +//import net.minecraft.item.ItemStack; +//import net.minecraftforge.fml.common.FMLCommonHandler; +//import net.minecraftforge.fml.common.Loader; +//import net.minecraftforge.fml.relauncher.Side; +// +//import java.awt.Color; +// +//public class GuideBloodMagic { +// +// public static Book guideBook; +// +// public static void initBook() { +// guideBook = new Book(); +// guideBook.setTitle("guide.BloodMagic.title"); +// guideBook.setDisplayName("guide.BloodMagic.display"); +// guideBook.setWelcomeMessage("guide.BloodMagic.welcome"); +// guideBook.setAuthor("guide.BloodMagic.author"); +// guideBook.setRegistryName("BloodMagic"); +// guideBook.setColor(Color.RED); +// +// if (FMLCommonHandler.instance().getSide() == Side.CLIENT) +// GuideAPI.setModel(guideBook); +// } +// +// public static void initCategories() { +// guideBook.addCategory(new CategoryItemStack(CategoryAlchemy.buildCategory(), "guide.BloodMagic.category.alchemy", new ItemStack(ModItems.arcaneAshes))); +// guideBook.addCategory(new CategoryItemStack(CategoryArchitect.buildCategory(), "guide.BloodMagic.category.architect", new ItemStack(ModItems.sigilDivination))); +// guideBook.addCategory(new CategoryItemStack(CategoryDemon.buildCategory(), "guide.BloodMagic.category.demon", new ItemStack(ModItems.bloodShard))); +// guideBook.addCategory(new CategoryItemStack(CategoryRitual.buildCategory(), "guide.BloodMagic.category.ritual", new ItemStack(ModBlocks.ritualController))); +// guideBook.addCategory(new CategoryItemStack(CategorySpell.buildCategory(), "guide.BloodMagic.category.spell", new ItemStack(ModItems.ritualDiviner))); +// } +// +// public static void initJEIBlacklist() { +// if (Loader.isModLoaded("JEI")) +// BloodMagicPlugin.jeiHelper.getNbtIgnoreList().ignoreNbtTagNames( +// GuideAPI.guideBook, +// NBTBookTags.BOOK_TAG, +// NBTBookTags.CATEGORY_PAGE_TAG, +// NBTBookTags.CATEGORY_TAG, +// NBTBookTags.ENTRY_PAGE_TAG, +// NBTBookTags.ENTRY_TAG, +// NBTBookTags.KEY_TAG, +// NBTBookTags.PAGE_TAG +// ); +// } +//} diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java new file mode 100644 index 00000000..937227df --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java @@ -0,0 +1,20 @@ +//package WayofTime.bloodmagic.compat.guideapi.book; +// +//import WayofTime.bloodmagic.api.Constants; +//import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; +//import net.minecraft.util.ResourceLocation; +// +//import java.util.HashMap; +//import java.util.Map; +// +//public class CategoryAlchemy { +// +// public static Map buildCategory() { +// Map entries = new HashMap(); +// String keyBase = Constants.Mod.DOMAIN + "alchemy_"; +// +// +// +// return entries; +// } +//} diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java new file mode 100644 index 00000000..29fe089d --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java @@ -0,0 +1,20 @@ +//package WayofTime.bloodmagic.compat.guideapi.book; +// +//import WayofTime.bloodmagic.api.Constants; +//import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; +//import net.minecraft.util.ResourceLocation; +// +//import java.util.HashMap; +//import java.util.Map; +// +//public class CategoryArchitect { +// +// public static Map buildCategory() { +// Map entries = new HashMap(); +// String keyBase = Constants.Mod.DOMAIN + "architect_"; +// +// +// +// return entries; +// } +//} diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryDemon.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryDemon.java new file mode 100644 index 00000000..0216889c --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryDemon.java @@ -0,0 +1,20 @@ +//package WayofTime.bloodmagic.compat.guideapi.book; +// +//import WayofTime.bloodmagic.api.Constants; +//import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; +//import net.minecraft.util.ResourceLocation; +// +//import java.util.HashMap; +//import java.util.Map; +// +//public class CategoryDemon { +// +// public static Map buildCategory() { +// Map entries = new HashMap(); +// String keyBase = Constants.Mod.DOMAIN + "demon_"; +// +// +// +// return entries; +// } +//} diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java new file mode 100644 index 00000000..286d5b72 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java @@ -0,0 +1,34 @@ +//package WayofTime.bloodmagic.compat.guideapi.book; +// +//import WayofTime.bloodmagic.api.Constants; +//import WayofTime.bloodmagic.api.registry.RitualRegistry; +//import WayofTime.bloodmagic.api.ritual.Ritual; +//import WayofTime.bloodmagic.compat.guideapi.entry.EntryText; +//import WayofTime.bloodmagic.util.helper.TextHelper; +//import amerifrance.guideapi.api.IPage; +//import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; +//import amerifrance.guideapi.api.util.PageHelper; +//import amerifrance.guideapi.page.PageImage; +//import net.minecraft.util.ResourceLocation; +// +//import java.util.ArrayList; +//import java.util.HashMap; +//import java.util.List; +//import java.util.Map; +// +//public class CategoryRitual { +// +// public static Map buildCategory() { +// Map entries = new HashMap(); +// String keyBase = Constants.Mod.DOMAIN + "ritual_"; +// +// for (Ritual ritual : RitualRegistry.getRituals()) { +// List ritualPages = new ArrayList(); +// ritualPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(ritual.getUnlocalizedName() + ".desc"))); +// ritualPages.add(new PageImage(new ResourceLocation("bloodmagicguide", "textures/guide/" + ritual.getName() + ".png"))); +// entries.put(new ResourceLocation(keyBase + ritual.getName()), new EntryText(ritualPages, TextHelper.localize(ritual.getUnlocalizedName()), true)); +// } +// +// return entries; +// } +//} diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategorySpell.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategorySpell.java new file mode 100644 index 00000000..0909afc1 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategorySpell.java @@ -0,0 +1,20 @@ +//package WayofTime.bloodmagic.compat.guideapi.book; +// +//import WayofTime.bloodmagic.api.Constants; +//import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; +//import net.minecraft.util.ResourceLocation; +// +//import java.util.HashMap; +//import java.util.Map; +// +//public class CategorySpell { +// +// public static Map buildCategory() { +// Map entries = new HashMap(); +// String keyBase = Constants.Mod.DOMAIN + "spell_"; +// +// +// +// return entries; +// } +//} diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/package-info.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/package-info.java new file mode 100644 index 00000000..45901a67 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.compat.guideapi.book; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/entry/EntryText.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/entry/EntryText.java new file mode 100644 index 00000000..4a731f4d --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/entry/EntryText.java @@ -0,0 +1,34 @@ +//package WayofTime.bloodmagic.compat.guideapi.entry; +// +//import amerifrance.guideapi.api.IPage; +//import amerifrance.guideapi.api.impl.Book; +//import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; +//import amerifrance.guideapi.api.util.GuiHelper; +//import amerifrance.guideapi.entry.EntryResourceLocation; +//import amerifrance.guideapi.gui.GuiBase; +//import net.minecraft.client.Minecraft; +//import net.minecraft.client.gui.FontRenderer; +//import net.minecraft.client.renderer.GlStateManager; +//import net.minecraft.util.ResourceLocation; +//import net.minecraftforge.fml.relauncher.Side; +//import net.minecraftforge.fml.relauncher.SideOnly; +// +//import java.util.List; +// +//public class EntryText extends EntryResourceLocation { +// +// public EntryText(List pageList, String unlocEntryName, boolean unicode) { +// super(pageList, unlocEntryName, new ResourceLocation("bloodmagicguide", "textures/gui/bullet_point.png"), unicode); +// } +// +// public EntryText(List pageList, String unlocEntryName) { +// this(pageList, unlocEntryName, false); +// } +// +// @Override +// @SideOnly(Side.CLIENT) +// public void drawExtras(Book book, CategoryAbstract category, int entryX, int entryY, int entryWidth, int entryHeight, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRendererObj) { +// Minecraft.getMinecraft().getTextureManager().bindTexture(image); +// GuiHelper.drawSizedIconWithoutColor(entryX + 4, entryY + 2, 8, 8, 1F); +// } +//} diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/entry/package-info.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/entry/package-info.java new file mode 100644 index 00000000..6e1727c4 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/entry/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.compat.guideapi.entry; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/package-info.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/package-info.java new file mode 100644 index 00000000..bce3b3b8 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/package-info.java @@ -0,0 +1,7 @@ +//@ParametersAreNonnullByDefault +//@MethodsReturnNonnullByDefault +//package WayofTime.bloodmagic.compat.guideapi; +// +//import mcp.MethodsReturnNonnullByDefault; +// +//import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAltarRecipe.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAltarRecipe.java new file mode 100644 index 00000000..5447749e --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAltarRecipe.java @@ -0,0 +1,70 @@ +//package WayofTime.bloodmagic.compat.guideapi.page; +// +//import WayofTime.bloodmagic.api.registry.AltarRecipeRegistry; +//import WayofTime.bloodmagic.util.helper.TextHelper; +//import amerifrance.guideapi.api.impl.Book; +//import amerifrance.guideapi.api.impl.Page; +//import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; +//import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; +//import amerifrance.guideapi.api.util.GuiHelper; +//import amerifrance.guideapi.gui.GuiBase; +//import net.minecraft.client.Minecraft; +//import net.minecraft.client.gui.FontRenderer; +//import net.minecraft.init.Blocks; +//import net.minecraft.item.Item; +//import net.minecraft.item.ItemStack; +//import net.minecraft.util.ResourceLocation; +//import net.minecraftforge.fml.relauncher.Side; +//import net.minecraftforge.fml.relauncher.SideOnly; +// +//import java.util.List; +// +//public class PageAltarRecipe extends Page { +// +// public List input; +// public ItemStack output; +// public int tier; +// public int bloodRequired; +// +// public PageAltarRecipe(AltarRecipeRegistry.AltarRecipe recipe) { +// this.input = recipe.getInput(); +// this.output = recipe.getOutput(); +// this.tier = recipe.getMinTier().toInt(); +// this.bloodRequired = recipe.getSyphon(); +// } +// +// @Override +// @SideOnly(Side.CLIENT) +// public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRenderer) { +// +// Minecraft.getMinecraft().getTextureManager().bindTexture(new ResourceLocation("alchemicalwizardry" + ":textures/gui/guide/altar.png")); +// guiBase.drawTexturedModalRect(guiLeft + 42, guiTop + 53, 0, 87, 146, 104); +// +// guiBase.drawCenteredString(fontRenderer, TextHelper.localize("text.recipe.altar"), guiLeft + guiBase.xSize / 2, guiTop + 12, 0); +// +// int inputX = (1 + 1) * 20 + (guiLeft + guiBase.xSize / 7) + 1; +// int inputY = (20) + (guiTop + guiBase.ySize / 5) - 1; //1 * 20 +// GuiHelper.drawItemStack(input.get(0), inputX, inputY); +// if (GuiHelper.isMouseBetween(mouseX, mouseY, inputX, inputY, 15, 15)) { +// guiBase.renderToolTip(input.get(0), mouseX, mouseY); +// } +// +// if (output == null) { +// output = new ItemStack(Blocks.BARRIER); +// } +// int outputX = (5 * 20) + (guiLeft + guiBase.xSize / 7) + 1; +// int outputY = (20) + (guiTop + guiBase.xSize / 5) - 1; // 1 * 20 +// GuiHelper.drawItemStack(output, outputX, outputY); +// if (GuiHelper.isMouseBetween(mouseX, mouseY, outputX, outputY, 15, 15)) { +// guiBase.renderToolTip(output, outputX, outputY); +// } +// +// if (output.getItem() == Item.getItemFromBlock(Blocks.BARRIER)) { +// guiBase.drawCenteredString(fontRenderer, TextHelper.localize("text.furnace.error"), guiLeft + guiBase.xSize / 2, guiTop + 4 * guiBase.ySize / 6, 0xED073D); +// guiBase.drawCenteredString(fontRenderer, TextHelper.localize("bm.string.tier") + ": " + String.valueOf(tier), guiLeft + guiBase.xSize / 2, guiTop + 4 * guiBase.ySize / 6 + 15, 0); +// guiBase.drawCenteredString(fontRenderer, "LP: " + String.valueOf(bloodRequired), guiLeft + guiBase.xSize / 2, guiTop + 4 * guiBase.ySize / 6 + 30, 0); +// } +// guiBase.drawCenteredString(fontRenderer, TextHelper.localize("text.recipe.altar.tier", String.valueOf(tier)), guiLeft + guiBase.xSize / 2, guiTop + 4 * guiBase.ySize / 6, 0); +// guiBase.drawCenteredString(fontRenderer, TextHelper.localize("text.recipe.altar.bloodRequired", String.valueOf(bloodRequired)), guiLeft + guiBase.xSize / 2, guiTop + 4 * guiBase.ySize / 6 + 15, 0); +// } +//} diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/package-info.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/package-info.java new file mode 100644 index 00000000..01727b53 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.compat.guideapi.page; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/recipeRenderer/OrbRecipeRenderer.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/recipeRenderer/OrbRecipeRenderer.java new file mode 100644 index 00000000..882ad750 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/recipeRenderer/OrbRecipeRenderer.java @@ -0,0 +1,128 @@ +//package WayofTime.bloodmagic.compat.guideapi.page.recipeRenderer; +// +//import WayofTime.bloodmagic.api.recipe.ShapedBloodOrbRecipe; +//import WayofTime.bloodmagic.api.recipe.ShapelessBloodOrbRecipe; +//import WayofTime.bloodmagic.api.registry.OrbRegistry; +//import WayofTime.bloodmagic.util.helper.TextHelper; +//import amerifrance.guideapi.GuideMod; +//import amerifrance.guideapi.api.IRecipeRenderer; +//import amerifrance.guideapi.api.impl.Book; +//import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; +//import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; +//import amerifrance.guideapi.api.util.GuiHelper; +//import amerifrance.guideapi.gui.GuiBase; +//import net.minecraft.client.Minecraft; +//import net.minecraft.client.gui.FontRenderer; +//import net.minecraft.item.ItemStack; +//import net.minecraft.item.crafting.IRecipe; +//import net.minecraft.util.ResourceLocation; +//import net.minecraftforge.fml.relauncher.ReflectionHelper; +// +//import java.util.ArrayList; +//import java.util.List; +// +//public class OrbRecipeRenderer implements IRecipeRenderer +//{ +// public IRecipe recipe; +// +// public OrbRecipeRenderer(IRecipe recipe) +// { +// this.recipe = recipe; +// } +// +// @Override +// public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRenderer) { +// Minecraft.getMinecraft().getTextureManager().bindTexture(new ResourceLocation(GuideMod.GUITEXLOC + "recipe_elements.png")); +// guiBase.drawTexturedModalRect(guiLeft + 42, guiTop + 53, 0, 0, 105, 65); +// +// guiBase.drawCenteredString(fontRenderer, TextHelper.localize("text.recipe.shapedOrb"), guiLeft + guiBase.xSize / 2, guiTop + 12, 0); +// if(recipe instanceof ShapelessBloodOrbRecipe) +// { +// ShapelessBloodOrbRecipe shapelessBloodOrbRecipe = (ShapelessBloodOrbRecipe) recipe; +// List list = shapelessBloodOrbRecipe.getInput(); +// +// int width = 3; +// int height = 3; +// for (int y = 0; y < height; y++) { +// for (int x = 0; x < width; x++) { +// if(list.size() - 1 < y * width + x) +// { +// continue; +// } +// +// int stackX = (x + 1) * 18 + (guiLeft + guiBase.xSize / 7); +// int stackY = (y + 1) * 18 + (guiTop + guiBase.ySize / 5); +// +// Object component = list.get(y * width + x); +// if (component != null) { +// if (component instanceof ItemStack) { +// GuiHelper.drawItemStack((ItemStack) component, stackX, stackY); +// if (GuiHelper.isMouseBetween(mouseX, mouseY, stackX, stackY, 15, 15)) { +// guiBase.renderToolTip((ItemStack) component, stackX, stackY); +// } +// } else if (component instanceof Integer) { +// GuiHelper.drawItemStack(OrbRegistry.getOrbsForTier((Integer) component).get(0), stackX, stackY); +// if (GuiHelper.isMouseBetween(mouseX, mouseY, stackX, stackY, 15, 15)) { +// guiBase.renderToolTip(OrbRegistry.getOrbsForTier((Integer) component).get(0), stackX, stackY); +// } +// } else { +// if (((ArrayList) component).isEmpty()) return; +// GuiHelper.drawItemStack(((ArrayList) component).get(0), stackX, stackY); +// if (GuiHelper.isMouseBetween(mouseX, mouseY, stackX, stackY, 15, 15)) { +// guiBase.renderToolTip(((ArrayList) component).get(0), stackX, stackY); +// } +// } +// } +// } +// } +// int outputX = (5 * 18) + (guiLeft + guiBase.xSize / 7); +// int outputY = (2 * 18) + (guiTop + guiBase.xSize / 5); +// GuiHelper.drawItemStack(shapelessBloodOrbRecipe.getRecipeOutput(), outputX, outputY); +// if (GuiHelper.isMouseBetween(mouseX, mouseY, outputX, outputY, 15, 15)) { +// guiBase.renderToolTip(shapelessBloodOrbRecipe.getRecipeOutput(), outputX, outputY); +// } +// }else if (recipe instanceof ShapedBloodOrbRecipe) +// { +// ShapedBloodOrbRecipe shapedBloodOrbRecipe = (ShapedBloodOrbRecipe) recipe; +// int width = ReflectionHelper.getPrivateValue(ShapedBloodOrbRecipe.class, shapedBloodOrbRecipe, 4); +// int height = ReflectionHelper.getPrivateValue(ShapedBloodOrbRecipe.class, shapedBloodOrbRecipe, 5); +// for (int y = 0; y < height; y++) { +// for (int x = 0; x < width; x++) { +// int stackX = (x + 1) * 18 + (guiLeft + guiBase.xSize / 7); +// int stackY = (y + 1) * 18 + (guiTop + guiBase.ySize / 5); +// Object component = shapedBloodOrbRecipe.getInput()[y * width + x]; +// if (component != null) { +// if (component instanceof ItemStack) { +// GuiHelper.drawItemStack((ItemStack) component, stackX, stackY); +// if (GuiHelper.isMouseBetween(mouseX, mouseY, stackX, stackY, 15, 15)) { +// guiBase.renderToolTip((ItemStack) component, stackX, stackY); +// } +// } else if (component instanceof Integer) { +// GuiHelper.drawItemStack(OrbRegistry.getOrbsForTier((Integer) component).get(0), stackX, stackY); +// if (GuiHelper.isMouseBetween(mouseX, mouseY, stackX, stackY, 15, 15)) { +// guiBase.renderToolTip(OrbRegistry.getOrbsForTier((Integer) component).get(0), stackX, stackY); +// } +// } else { +// if (((ArrayList) component).isEmpty()) return; +// GuiHelper.drawItemStack(((ArrayList) component).get(0), stackX, stackY); +// if (GuiHelper.isMouseBetween(mouseX, mouseY, stackX, stackY, 15, 15)) { +// guiBase.renderToolTip(((ArrayList) component).get(0), stackX, stackY); +// } +// } +// } +// } +// } +// int outputX = (5 * 18) + (guiLeft + guiBase.xSize / 7); +// int outputY = (2 * 18) + (guiTop + guiBase.xSize / 5); +// GuiHelper.drawItemStack(shapedBloodOrbRecipe.getRecipeOutput(), outputX, outputY); +// if (GuiHelper.isMouseBetween(mouseX, mouseY, outputX, outputY, 15, 15)) { +// guiBase.renderToolTip(shapedBloodOrbRecipe.getRecipeOutput(), outputX, outputY); +// } +// } +// } +// +// @Override +// public void drawExtras(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRenderer) { +// +// } +//} diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/recipeRenderer/package-info.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/recipeRenderer/package-info.java new file mode 100644 index 00000000..e108a88f --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/recipeRenderer/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.compat.guideapi.page.recipeRenderer; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java index 6ebbb298..3f31292d 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java @@ -9,6 +9,7 @@ import mezz.jei.api.IJeiHelpers; import mezz.jei.api.IModRegistry; import mezz.jei.api.JEIPlugin; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.common.Loader; import net.minecraftforge.oredict.OreDictionary; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.livingArmour.LivingArmourHandler; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/package-info.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/package-info.java new file mode 100644 index 00000000..b9a88570 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.compat.jei.alchemyArray; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/package-info.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/package-info.java new file mode 100644 index 00000000..c7a5c86b --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.compat.jei.alchemyTable; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/package-info.java b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/package-info.java new file mode 100644 index 00000000..4fb6eef6 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.compat.jei.altar; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/package-info.java b/src/main/java/WayofTime/bloodmagic/compat/jei/binding/package-info.java new file mode 100644 index 00000000..b63096ff --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/binding/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.compat.jei.binding; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/package-info.java b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/package-info.java new file mode 100644 index 00000000..cc0c044a --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.compat.jei.forge; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/orb/package-info.java b/src/main/java/WayofTime/bloodmagic/compat/jei/orb/package-info.java new file mode 100644 index 00000000..a9b8d95a --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/orb/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.compat.jei.orb; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/package-info.java b/src/main/java/WayofTime/bloodmagic/compat/jei/package-info.java new file mode 100644 index 00000000..7ce52522 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.compat.jei; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/compat/package-info.java b/src/main/java/WayofTime/bloodmagic/compat/package-info.java new file mode 100644 index 00000000..302c3ae6 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/compat/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.compat; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/package-info.java b/src/main/java/WayofTime/bloodmagic/compat/waila/package-info.java new file mode 100644 index 00000000..f2879261 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.compat.waila; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/package-info.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/package-info.java new file mode 100644 index 00000000..6e1d3506 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.compat.waila.provider; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/compress/package-info.java b/src/main/java/WayofTime/bloodmagic/compress/package-info.java new file mode 100644 index 00000000..d8b253d4 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/compress/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.compress; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/demonAura/package-info.java b/src/main/java/WayofTime/bloodmagic/demonAura/package-info.java new file mode 100644 index 00000000..807bd734 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/demonAura/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.demonAura; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/entity/projectile/package-info.java b/src/main/java/WayofTime/bloodmagic/entity/projectile/package-info.java new file mode 100644 index 00000000..7f6a0496 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/entity/projectile/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.entity.projectile; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/fuel/package-info.java b/src/main/java/WayofTime/bloodmagic/fuel/package-info.java new file mode 100644 index 00000000..54f2718e --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/fuel/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.fuel; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/incense/package-info.java b/src/main/java/WayofTime/bloodmagic/incense/package-info.java new file mode 100644 index 00000000..ebb51c99 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/incense/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.incense; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/item/alchemy/package-info.java b/src/main/java/WayofTime/bloodmagic/item/alchemy/package-info.java new file mode 100644 index 00000000..a96a3d45 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/item/alchemy/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.item.alchemy; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/item/armour/package-info.java b/src/main/java/WayofTime/bloodmagic/item/armour/package-info.java new file mode 100644 index 00000000..d6803eed --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/item/armour/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.item.armour; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/item/block/package-info.java b/src/main/java/WayofTime/bloodmagic/item/block/package-info.java new file mode 100644 index 00000000..67b9b28e --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/item/block/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.item.block; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/item/gear/package-info.java b/src/main/java/WayofTime/bloodmagic/item/gear/package-info.java new file mode 100644 index 00000000..8cfd7cd2 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/item/gear/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.item.gear; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/item/inventory/package-info.java b/src/main/java/WayofTime/bloodmagic/item/inventory/package-info.java new file mode 100644 index 00000000..3b114989 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/item/inventory/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.item.inventory; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/item/package-info.java b/src/main/java/WayofTime/bloodmagic/item/package-info.java new file mode 100644 index 00000000..71e26b95 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/item/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.item; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/item/routing/package-info.java b/src/main/java/WayofTime/bloodmagic/item/routing/package-info.java new file mode 100644 index 00000000..02b38ed2 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/item/routing/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.item.routing; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilGreenGrove.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilGreenGrove.java index d372c3c4..3c2a8439 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilGreenGrove.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilGreenGrove.java @@ -24,7 +24,7 @@ public class ItemSigilGreenGrove extends ItemSigilToggleableBase { if (applyBonemeal(stack, world, blockPos)) { - world.playAuxSFX(2005, blockPos, 0); + world.destroyBlock(blockPos, false); return true; } @@ -59,7 +59,7 @@ public class ItemSigilGreenGrove extends ItemSigilToggleableBase block.updateTick(worldIn, blockPos, worldIn.getBlockState(blockPos), worldIn.rand); if (!worldIn.getBlockState(blockPos).equals(preBlockState)) - worldIn.playAuxSFX(2005, blockPos, 0); + worldIn.destroyBlock(blockPos, false); } } } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/package-info.java b/src/main/java/WayofTime/bloodmagic/item/sigil/package-info.java new file mode 100644 index 00000000..8ec040b9 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.item.sigil; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/package-info.java b/src/main/java/WayofTime/bloodmagic/item/soul/package-info.java new file mode 100644 index 00000000..1be2245d --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/item/soul/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.item.soul; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/package-info.java b/src/main/java/WayofTime/bloodmagic/livingArmour/package-info.java new file mode 100644 index 00000000..4b5564f8 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.livingArmour; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/package-info.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/package-info.java new file mode 100644 index 00000000..317f24d4 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.livingArmour.tracker; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/package-info.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/package-info.java new file mode 100644 index 00000000..7d4f11a7 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.livingArmour.upgrade; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/network/package-info.java b/src/main/java/WayofTime/bloodmagic/network/package-info.java new file mode 100644 index 00000000..c62e2432 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/network/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.network; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/package-info.java b/src/main/java/WayofTime/bloodmagic/package-info.java new file mode 100644 index 00000000..96b3c820 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/package-info.java @@ -0,0 +1,6 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic; + +import mcp.MethodsReturnNonnullByDefault; +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/potion/package-info.java b/src/main/java/WayofTime/bloodmagic/potion/package-info.java new file mode 100644 index 00000000..683d1cac --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/potion/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.potion; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java index 068ec595..5b6919fd 100644 --- a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java +++ b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java @@ -24,8 +24,12 @@ import WayofTime.bloodmagic.util.handler.ClientEventHandler; import WayofTime.bloodmagic.util.helper.InventoryRenderHelper; import WayofTime.bloodmagic.util.helper.InventoryRenderHelperV2; import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.client.renderer.color.IItemColor; +import net.minecraft.init.Items; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.client.model.obj.OBJLoader; @@ -34,6 +38,8 @@ import net.minecraftforge.fml.client.registry.ClientRegistry; import net.minecraftforge.fml.client.registry.RenderingRegistry; import org.apache.commons.lang3.tuple.Pair; +import java.awt.*; + public class ClientProxy extends CommonProxy { private InventoryRenderHelper renderHelper; @@ -84,7 +90,14 @@ public class ClientProxy extends CommonProxy @Override public void init() { -// RenderingRegistry.registerEntityRenderingHandler(EntityBloodLight.class, new RenderEntityBloodLight(Minecraft.getMinecraft().getRenderManager())); + Minecraft.getMinecraft().getItemColors().registerItemColorHandler(new IItemColor() + { + @Override + public int getColorFromItemstack(ItemStack stack, int tintIndex) + { + return stack.hasTagCompound() && stack.getTagCompound().hasKey("bloody") ? new Color(0x8B191B).getRGB() : 16777215; + } + }, Items.BREAD); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/proxy/package-info.java b/src/main/java/WayofTime/bloodmagic/proxy/package-info.java new file mode 100644 index 00000000..f4ee72c8 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/proxy/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.proxy; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/registry/package-info.java b/src/main/java/WayofTime/bloodmagic/registry/package-info.java new file mode 100644 index 00000000..3a0366cc --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/registry/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.registry; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java index 3cae0d45..5e882e1c 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java @@ -64,7 +64,7 @@ public class HarvestHandlerPlantable implements IHarvestHandler if (foundSeed) { world.setBlockState(pos, blockStack.getBlock().getDefaultState()); - world.playAuxSFX(2001, pos, Block.getIdFromBlock(blockStack.getBlock()) + (blockStack.getMeta() << 12)); + world.destroyBlock(pos, false); for (ItemStack stack : drops) { if (!world.isRemote) diff --git a/src/main/java/WayofTime/bloodmagic/ritual/harvest/package-info.java b/src/main/java/WayofTime/bloodmagic/ritual/harvest/package-info.java new file mode 100644 index 00000000..f6c9453d --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/ritual/harvest/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.ritual.harvest; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/package-info.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/package-info.java new file mode 100644 index 00000000..9b848792 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.ritual.imperfect; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/ritual/package-info.java b/src/main/java/WayofTime/bloodmagic/ritual/package-info.java new file mode 100644 index 00000000..9305015f --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/ritual/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.ritual; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java b/src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java index f860c330..65b2a6de 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java @@ -61,7 +61,7 @@ public class Teleports player.setPositionAndUpdate(x + 0.5, y + 0.5, z + 0.5); player.worldObj.updateEntityWithOptionalForce(player, false); - player.playerNetServerHandler.sendPacket(new SPacketUpdateHealth(player.getHealth(), player.getFoodStats().getFoodLevel(), player.getFoodStats().getSaturationLevel())); + player.connection.sendPacket(new SPacketUpdateHealth(player.getHealth(), player.getFoodStats().getFoodLevel(), player.getFoodStats().getSaturationLevel())); player.timeUntilPortal = 150; player.worldObj.playSound(x, y, z, SoundEvents.ENTITY_ENDERMEN_TELEPORT, SoundCategory.AMBIENT, 1.0F, 1.0F, false); @@ -148,7 +148,7 @@ public class Teleports // server.getConfigurationManager().transferPlayerToDimension(player, newWorldID, new TeleporterBloodMagic(newWorldServer)); player.setPositionAndUpdate(x + 0.5, y + 0.5, z + 0.5); player.worldObj.updateEntityWithOptionalForce(player, false); - player.playerNetServerHandler.sendPacket(new SPacketUpdateHealth(player.getHealth(), player.getFoodStats().getFoodLevel(), player.getFoodStats().getSaturationLevel())); + player.connection.sendPacket(new SPacketUpdateHealth(player.getHealth(), player.getFoodStats().getFoodLevel(), player.getFoodStats().getSaturationLevel())); MinecraftForge.EVENT_BUS.post(new TeleposeEvent.Ent.Post(entity, entity.worldObj, entity.getPosition(), newWorldServer, new BlockPos(x, y, z))); } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/portal/package-info.java b/src/main/java/WayofTime/bloodmagic/ritual/portal/package-info.java new file mode 100644 index 00000000..f64d991e --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/ritual/portal/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.ritual.portal; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/routing/package-info.java b/src/main/java/WayofTime/bloodmagic/routing/package-info.java new file mode 100644 index 00000000..0271d921 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/routing/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.routing; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java index 06dc3d69..d60fccb5 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java @@ -27,11 +27,12 @@ public class TileAlchemyArray extends TileInventory implements ITickable } @Override - public void writeToNBT(NBTTagCompound tagCompound) + public NBTTagCompound writeToNBT(NBTTagCompound tagCompound) { super.writeToNBT(tagCompound); tagCompound.setBoolean("isActive", isActive); tagCompound.setInteger("activeCounter", activeCounter); + return tagCompound; } @Override @@ -74,7 +75,7 @@ public class TileAlchemyArray extends TileInventory implements ITickable } @Override - public Packet getDescriptionPacket() + public SPacketUpdateTileEntity getUpdatePacket() { NBTTagCompound nbttagcompound = new NBTTagCompound(); writeToNBT(nbttagcompound); diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java index 4b7a11bc..cf6cba38 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java @@ -105,7 +105,7 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, } @Override - public void writeToNBT(NBTTagCompound tag) + public NBTTagCompound writeToNBT(NBTTagCompound tag) { super.writeToNBT(tag); @@ -125,6 +125,7 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, } tag.setIntArray("blockedSlots", blockedSlotArray); + return tag; } @SuppressWarnings("unchecked") diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileAltar.java b/src/main/java/WayofTime/bloodmagic/tile/TileAltar.java index 64137723..7dbd3b8c 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileAltar.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileAltar.java @@ -33,7 +33,7 @@ public class TileAltar extends TileInventory implements IBloodAltar, ITickable, } @Override - public void writeToNBT(NBTTagCompound tagCompound) + public NBTTagCompound writeToNBT(NBTTagCompound tagCompound) { super.writeToNBT(tagCompound); @@ -41,6 +41,7 @@ public class TileAltar extends TileInventory implements IBloodAltar, ITickable, this.bloodAltar.writeToNBT(altarTag); tagCompound.setTag("bloodAltar", altarTag); + return tagCompound; } @Override diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileBloodTank.java b/src/main/java/WayofTime/bloodmagic/tile/TileBloodTank.java index 21dd4248..652aa00b 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileBloodTank.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileBloodTank.java @@ -61,11 +61,12 @@ public class TileBloodTank extends TileEntity implements IFluidHandler } @Override - public void writeToNBT(NBTTagCompound tagCompound) + public NBTTagCompound writeToNBT(NBTTagCompound tagCompound) { super.writeToNBT(tagCompound); if (tank.getFluidAmount() != 0) tagCompound.setTag("tank", tank.writeToNBT(new NBTTagCompound())); tagCompound.setInteger("capacity", capacity); + return tagCompound; } } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrucible.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrucible.java index 0e4ce5ca..0c7f0931 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrucible.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrucible.java @@ -128,7 +128,7 @@ public class TileDemonCrucible extends TileInventory implements ITickable, IDemo } @Override - public void writeToNBT(NBTTagCompound tag) + public NBTTagCompound writeToNBT(NBTTagCompound tag) { super.writeToNBT(tag); @@ -136,6 +136,7 @@ public class TileDemonCrucible extends TileInventory implements ITickable, IDemo { tag.setDouble("EnumWill" + entry.getKey().getName(), entry.getValue()); } + return tag; } // IDemonWillConduit diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java index cc2c829c..d5e9e41e 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java @@ -186,7 +186,7 @@ public class TileDemonCrystal extends TileEntity implements ITickable } @Override - public void writeToNBT(NBTTagCompound tag) + public NBTTagCompound writeToNBT(NBTTagCompound tag) { super.writeToNBT(tag); @@ -194,6 +194,7 @@ public class TileDemonCrystal extends TileEntity implements ITickable tag.setInteger("crystalCount", crystalCount); tag.setInteger("placement", placement.getIndex()); tag.setDouble("progress", progressToNextCrystal); + return tag; } @Override @@ -203,7 +204,7 @@ public class TileDemonCrystal extends TileEntity implements ITickable } @Override - public Packet getDescriptionPacket() + public SPacketUpdateTileEntity getUpdatePacket() { NBTTagCompound nbt = new NBTTagCompound(); writeToNBT(nbt); diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java index 4d6a1bfc..543f4b3a 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java @@ -96,12 +96,13 @@ public class TileDemonCrystallizer extends TileEntity implements ITickable, IDem } @Override - public void writeToNBT(NBTTagCompound tag) + public NBTTagCompound writeToNBT(NBTTagCompound tag) { super.writeToNBT(tag); holder.writeToNBT(tag, "Will"); tag.setDouble("internalCounter", internalCounter); + return tag; } // IDemonWillConduit diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonPylon.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonPylon.java index e6dc0f93..f6efdf86 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonPylon.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDemonPylon.java @@ -56,11 +56,12 @@ public class TileDemonPylon extends TileEntity implements ITickable, IDemonWillC } @Override - public void writeToNBT(NBTTagCompound tag) + public NBTTagCompound writeToNBT(NBTTagCompound tag) { super.writeToNBT(tag); holder.writeToNBT(tag, "Will"); + return tag; } // IDemonWillConduit diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDimensionalPortal.java b/src/main/java/WayofTime/bloodmagic/tile/TileDimensionalPortal.java index e8ab0246..b86f68b7 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDimensionalPortal.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDimensionalPortal.java @@ -29,7 +29,7 @@ public class TileDimensionalPortal extends TileEntity masterStoneZ = tagCompound.getInteger("masterStoneZ"); } - public void writeToNBT(NBTTagCompound tagCompound) + public NBTTagCompound writeToNBT(NBTTagCompound tagCompound) { super.writeToNBT(tagCompound); @@ -38,6 +38,7 @@ public class TileDimensionalPortal extends TileEntity tagCompound.setInteger("masterStoneX", masterStoneX); tagCompound.setInteger("masterStoneY", masterStoneY); tagCompound.setInteger("masterStoneZ", masterStoneZ); + return tagCompound; } public BlockPos getMasterStonePos() diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java b/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java index dd62d8c3..e1496e85 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java @@ -82,11 +82,12 @@ public class TileIncenseAltar extends TileInventory implements ITickable } @Override - public void writeToNBT(NBTTagCompound tag) + public NBTTagCompound writeToNBT(NBTTagCompound tag) { super.writeToNBT(tag); tag.setDouble("tranquility", tranquility); tag.setDouble("incenseAddition", incenseAddition); + return tag; } public void recheckConstruction() diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileInventory.java b/src/main/java/WayofTime/bloodmagic/tile/TileInventory.java index bbf09a4d..d03dc9b5 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileInventory.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileInventory.java @@ -74,7 +74,7 @@ public class TileInventory extends TileEntity implements IInventory } @Override - public void writeToNBT(NBTTagCompound tagCompound) + public NBTTagCompound writeToNBT(NBTTagCompound tagCompound) { super.writeToNBT(tagCompound); NBTTagList tags = new NBTTagList(); @@ -91,10 +91,11 @@ public class TileInventory extends TileEntity implements IInventory } tagCompound.setTag("Items", tags); + return tagCompound; } @Override - public Packet getDescriptionPacket() + public SPacketUpdateTileEntity getUpdatePacket() { NBTTagCompound nbt = new NBTTagCompound(); writeToNBT(nbt); diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java index 83b8998d..5a3167c0 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java @@ -103,7 +103,7 @@ public class TileMasterRitualStone extends TileEntity implements IMasterRitualSt } @Override - public void writeToNBT(NBTTagCompound tag) + public NBTTagCompound writeToNBT(NBTTagCompound tag) { super.writeToNBT(tag); String ritualId = RitualRegistry.getIdForRitual(getCurrentRitual()); @@ -119,6 +119,7 @@ public class TileMasterRitualStone extends TileEntity implements IMasterRitualSt tag.setInteger(Constants.NBT.RUNTIME, getActiveTime()); tag.setInteger(Constants.NBT.DIRECTION, direction.getIndex()); tag.setBoolean(Constants.NBT.IS_REDSTONED, redstoned); + return tag; } @Override @@ -274,7 +275,7 @@ public class TileMasterRitualStone extends TileEntity implements IMasterRitualSt } @Override - public Packet getDescriptionPacket() + public SPacketUpdateTileEntity getUpdatePacket() { NBTTagCompound nbttagcompound = new NBTTagCompound(); writeToNBT(nbttagcompound); diff --git a/src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java b/src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java index 0c93c4fb..1df18add 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java @@ -30,10 +30,11 @@ public class TilePhantomBlock extends TileEntity implements ITickable } @Override - public void writeToNBT(NBTTagCompound tagCompound) + public NBTTagCompound writeToNBT(NBTTagCompound tagCompound) { super.writeToNBT(tagCompound); tagCompound.setInteger(Constants.NBT.TICKS_REMAINING, ticksRemaining); + return tagCompound; } @Override @@ -49,7 +50,7 @@ public class TilePhantomBlock extends TileEntity implements ITickable } @Override - public Packet getDescriptionPacket() + public SPacketUpdateTileEntity getUpdatePacket() { NBTTagCompound nbt = new NBTTagCompound(); writeToNBT(nbt); diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java b/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java index 5685fb56..f901fa06 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java @@ -41,11 +41,12 @@ public class TileSoulForge extends TileInventory implements ITickable, IDemonWil } @Override - public void writeToNBT(NBTTagCompound tag) + public NBTTagCompound writeToNBT(NBTTagCompound tag) { super.writeToNBT(tag); tag.setInteger(Constants.NBT.SOUL_FORGE_BURN, burnTime); + return tag; } @Override diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileSpectralBlock.java b/src/main/java/WayofTime/bloodmagic/tile/TileSpectralBlock.java index b92d79aa..d1e00b22 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileSpectralBlock.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileSpectralBlock.java @@ -33,12 +33,13 @@ public class TileSpectralBlock extends TileEntity implements ITickable } @Override - public void writeToNBT(NBTTagCompound tagCompound) + public NBTTagCompound writeToNBT(NBTTagCompound tagCompound) { super.writeToNBT(tagCompound); tagCompound.setInteger(Constants.NBT.TICKS_REMAINING, ticksRemaining); tagCompound.setString(Constants.NBT.CONTAINED_BLOCK_NAME, Strings.isNullOrEmpty(containedBlockName) ? "" : containedBlockName); tagCompound.setInteger(Constants.NBT.CONTAINED_BLOCK_META, containedBlockMeta); + return tagCompound; } @Override diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java b/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java index 2585d5dc..dabf44c2 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java @@ -42,10 +42,11 @@ public class TileTeleposer extends TileInventory implements ITickable } @Override - public void writeToNBT(NBTTagCompound tagCompound) + public NBTTagCompound writeToNBT(NBTTagCompound tagCompound) { super.writeToNBT(tagCompound); tagCompound.setInteger(Constants.NBT.PREVIOUS_INPUT, previousInput); + return tagCompound; } @Override diff --git a/src/main/java/WayofTime/bloodmagic/tile/container/package-info.java b/src/main/java/WayofTime/bloodmagic/tile/container/package-info.java new file mode 100644 index 00000000..a249a1d0 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/tile/container/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.tile.container; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/tile/package-info.java b/src/main/java/WayofTime/bloodmagic/tile/package-info.java new file mode 100644 index 00000000..25a795be --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/tile/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.tile; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/tile/routing/TileFilteredRoutingNode.java b/src/main/java/WayofTime/bloodmagic/tile/routing/TileFilteredRoutingNode.java index 9e3ecc0d..f03b1c9a 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/routing/TileFilteredRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/tile/routing/TileFilteredRoutingNode.java @@ -48,11 +48,12 @@ public class TileFilteredRoutingNode extends TileRoutingNode implements ISidedIn } @Override - public void writeToNBT(NBTTagCompound tag) + public NBTTagCompound writeToNBT(NBTTagCompound tag) { super.writeToNBT(tag); tag.setInteger("currentSlot", currentActiveSlot); tag.setIntArray(Constants.NBT.ROUTING_PRIORITY, priorities); + return tag; } public void swapFilters(int requestedSlot) diff --git a/src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java b/src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java index 24f7f2c9..81df48ec 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java @@ -30,7 +30,6 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti public TileMasterRoutingNode() { super(0, "masterRoutingNode"); - // TODO Auto-generated constructor stub } // A list of connections @@ -146,7 +145,7 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti } @Override - public void writeToNBT(NBTTagCompound tag) + public NBTTagCompound writeToNBT(NBTTagCompound tag) { super.writeToNBT(tag); @@ -182,6 +181,7 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti tags.appendTag(posTag); } tag.setTag(Constants.NBT.ROUTING_MASTER_OUTPUT, tags); + return tag; } @Override diff --git a/src/main/java/WayofTime/bloodmagic/tile/routing/TileRoutingNode.java b/src/main/java/WayofTime/bloodmagic/tile/routing/TileRoutingNode.java index c4c0eaae..76c00128 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/routing/TileRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/tile/routing/TileRoutingNode.java @@ -28,7 +28,7 @@ public class TileRoutingNode extends TileInventory implements IRoutingNode, IIte private List connectionList = new LinkedList(); @Override - public void writeToNBT(NBTTagCompound tag) + public NBTTagCompound writeToNBT(NBTTagCompound tag) { super.writeToNBT(tag); NBTTagCompound masterTag = new NBTTagCompound(); @@ -47,6 +47,7 @@ public class TileRoutingNode extends TileInventory implements IRoutingNode, IIte tags.appendTag(posTag); } tag.setTag(Constants.NBT.ROUTING_CONNECTION, tags); + return tag; } @Override @@ -137,12 +138,7 @@ public class TileRoutingNode extends TileInventory implements IRoutingNode, IIte public boolean isMaster(IMasterRoutingNode master) { BlockPos checkPos = master.getBlockPos(); - if (checkPos.equals(getMasterPos())) - { - return true; - } - - return false; + return checkPos.equals(getMasterPos()); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/tile/routing/package-info.java b/src/main/java/WayofTime/bloodmagic/tile/routing/package-info.java new file mode 100644 index 00000000..6156b264 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/tile/routing/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.tile.routing; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/util/Utils.java b/src/main/java/WayofTime/bloodmagic/util/Utils.java index fc1eda7f..9446efc5 100644 --- a/src/main/java/WayofTime/bloodmagic/util/Utils.java +++ b/src/main/java/WayofTime/bloodmagic/util/Utils.java @@ -774,7 +774,7 @@ public class Utils if (initialTile != null) { - TileEntity newTileInitial = TileEntity.createTileEntity(FMLCommonHandler.instance().getMinecraftServerInstance(), initialTag); + TileEntity newTileInitial = TileEntity.create(initialTag); finalWorld.setTileEntity(finalPos, newTileInitial); newTileInitial.setPos(finalPos); @@ -785,7 +785,7 @@ public class Utils if (finalTile != null) { - TileEntity newTileFinal = TileEntity.createTileEntity(FMLCommonHandler.instance().getMinecraftServerInstance(), finalTag); + TileEntity newTileFinal = TileEntity.create(finalTag); initialWorld.setTileEntity(initialPos, newTileFinal); newTileFinal.setPos(initialPos); diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java index b60dd3fa..0a1dadea 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java @@ -28,8 +28,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.PotionEffect; import net.minecraft.util.DamageSource; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.ChunkPos; import net.minecraft.util.math.MathHelper; -import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.EnumDifficulty; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; @@ -212,7 +212,7 @@ public class EventHandler } } - this.serverTicks.put(Integer.valueOf(dim), Integer.valueOf(ticks + 1)); + this.serverTicks.put(dim, ticks + 1); } } @@ -221,7 +221,7 @@ public class EventHandler public void chunkSave(ChunkDataEvent.Save event) { int dim = event.getWorld().provider.getDimension(); - ChunkCoordIntPair loc = event.getChunk().getChunkCoordIntPair(); + ChunkPos loc = event.getChunk().getChunkCoordIntPair(); NBTTagCompound nbt = new NBTTagCompound(); event.getData().setTag("BloodMagic", nbt); diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/package-info.java b/src/main/java/WayofTime/bloodmagic/util/handler/package-info.java new file mode 100644 index 00000000..f5a9d369 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/util/handler/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.util.handler; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/package-info.java b/src/main/java/WayofTime/bloodmagic/util/helper/package-info.java new file mode 100644 index 00000000..338a7367 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/util/helper/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.util.helper; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/util/package-info.java b/src/main/java/WayofTime/bloodmagic/util/package-info.java new file mode 100644 index 00000000..f2d1940d --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/util/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package WayofTime.bloodmagic.util; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index bb5a2837..27e23905 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -513,6 +513,11 @@ chat.BloodMagic.routing.set=Setting node location chat.BloodMagic.routing.link.master=Linked node to master! chat.BloodMagic.routing.link=Linked nodes together +# sekrit + +secret.BloodMagic.bread.bloody=&r&cBloody Bread +secret.BloodMagic.bread.bloody.desc=Only for &odire &r&7emergencies. + # Commands commands.error.arg.invalid=Invalid arguments commands.error.arg.missing=Not enough arguments diff --git a/src/main/resources/assets/bloodmagicguide/lang/en_US.lang b/src/main/resources/assets/bloodmagicguide/lang/en_US.lang index e0d08255..f0d2799f 100644 --- a/src/main/resources/assets/bloodmagicguide/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagicguide/lang/en_US.lang @@ -1,8 +1,8 @@ # Book Information -guide.BloodMagic.book.title=Sanguine Scientiem -guide.BloodMagic.book.display=Sanguine Scientiem -guide.BloodMagic.book.author=Blood Magic -guide.BloodMagic.book.welcome=Blood Magic +guide.BloodMagic.title=Sanguine Scientiem +guide.BloodMagic.display=Sanguine Scientiem +guide.BloodMagic.author=Blood Magic +guide.BloodMagic.welcome=Blood Magic # Page Information guide.BloodMagic.page.bloodAltar=Blood Altar Recipe @@ -10,11 +10,11 @@ guide.BloodMagic.page.tier=Tier: %d guide.BloodMagic.page.lp=LP: %d # Categories -guide.BloodMagic.category.architect.name=The Architect -guide.BloodMagic.category.ritual.name=The Ritual Master -guide.BloodMagic.category.demon.name=The Demon Kin -guide.BloodMagic.category.spell.name=The Battle Mage -guide.BloodMagic.category.alchemy.name=The Alchemist +guide.BloodMagic.category.architect=The Architect +guide.BloodMagic.category.ritual=The Ritual Master +guide.BloodMagic.category.demon=The Demon Kin +guide.BloodMagic.category.spell=The Battle Mage +guide.BloodMagic.category.alchemy=The Alchemist # Architect Entries guide.BloodMagic.entry.architect.intro=A Classic Tragic Back-story diff --git a/src/main/resources/assets/bloodmagicguide/textures/gui/bullet_point.png b/src/main/resources/assets/bloodmagicguide/textures/gui/bullet_point.png new file mode 100644 index 00000000..fd56d1bb Binary files /dev/null and b/src/main/resources/assets/bloodmagicguide/textures/gui/bullet_point.png differ