diff --git a/src/main/java/WayofTime/bloodmagic/api/ritual/LocalRitualStorage.java b/src/main/java/WayofTime/bloodmagic/api/ritual/LocalRitualStorage.java deleted file mode 100644 index 848eb4f8..00000000 --- a/src/main/java/WayofTime/bloodmagic/api/ritual/LocalRitualStorage.java +++ /dev/null @@ -1,28 +0,0 @@ -package WayofTime.bloodmagic.api.ritual; - -import WayofTime.bloodmagic.api.NBTHolder; -import lombok.Getter; -import lombok.Setter; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.BlockPos; - -/** - * This class is used to pass ritual-specific data into the RitualEffect from the containing Master Ritual Stone. This is basically used as auxiliary storage, - * for when simply storing to NBT becomes... difficult. - */ -@Getter -@Setter -public class LocalRitualStorage { - - private BlockPos pos; - - public void writeToNBT(NBTTagCompound tagCompound) { - tagCompound.setInteger(NBTHolder.NBT_COORDX, pos.getX()); - tagCompound.setInteger(NBTHolder.NBT_COORDY, pos.getY()); - tagCompound.setInteger(NBTHolder.NBT_COORDZ, pos.getZ()); - } - - public void readFromNBT(NBTTagCompound tagCompound) { - this.pos = new BlockPos(tagCompound.getInteger(NBTHolder.NBT_COORDX), tagCompound.getInteger(NBTHolder.NBT_COORDY), tagCompound.getInteger(NBTHolder.NBT_COORDZ)); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockRitualHome.java b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockRitualController.java similarity index 82% rename from src/main/java/WayofTime/bloodmagic/item/block/ItemBlockRitualHome.java rename to src/main/java/WayofTime/bloodmagic/item/block/ItemBlockRitualController.java index fe5ece0c..8d9be4dd 100644 --- a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockRitualHome.java +++ b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockRitualController.java @@ -5,9 +5,9 @@ import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -public class ItemBlockRitualHome extends ItemBlock { +public class ItemBlockRitualController extends ItemBlock { - public ItemBlockRitualHome(Block block) { + public ItemBlockRitualController(Block block) { super(block); setHasSubtypes(true); diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java b/src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java index 67fbfc55..faa3f307 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java @@ -5,7 +5,7 @@ import WayofTime.bloodmagic.ConfigHandler; import WayofTime.bloodmagic.block.BlockAltar; import WayofTime.bloodmagic.block.BlockLifeEssence; import WayofTime.bloodmagic.block.BlockRitualController; -import WayofTime.bloodmagic.item.block.ItemBlockRitualHome; +import WayofTime.bloodmagic.item.block.ItemBlockRitualController; import WayofTime.bloodmagic.util.helper.InventoryRenderHelper; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; @@ -28,7 +28,7 @@ public class ModBlocks { lifeEssence = registerBlock(new BlockLifeEssence()); altar = registerBlock(new BlockAltar()); - ritualStone = registerBlock(new BlockRitualController(), ItemBlockRitualHome.class); + ritualStone = registerBlock(new BlockRitualController(), ItemBlockRitualController.class); initTiles(); }