From ddb75428274f94184048fc198ec1ecb988e9ca52 Mon Sep 17 00:00:00 2001
From: Nicholas Ignoffo <speedynutty68@gmail.com>
Date: Mon, 13 Feb 2017 16:21:54 -0800
Subject: [PATCH] Implement an inverted MRS that requires an RS signal to
 function (#1022)

---
 .../bloodmagic/block/BlockRitualController.java   |  14 +++++++++-----
 .../block/enums/EnumRitualController.java         |   4 +++-
 .../provider/DataProviderRitualController.java    |   6 ++++--
 .../WayofTime/bloodmagic/registry/ModRecipes.java |   2 ++
 .../bloodmagic/tile/TileMasterRitualStone.java    |  14 ++++++++++++--
 .../blockstates/BlockRitualController.json        |   5 +++++
 .../resources/assets/bloodmagic/lang/en_US.lang   |   1 +
 .../blocks/MasterRitualStone_Inverted.png         | Bin 0 -> 724 bytes
 8 files changed, 36 insertions(+), 10 deletions(-)
 create mode 100644 src/main/resources/assets/bloodmagic/textures/blocks/MasterRitualStone_Inverted.png

diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java b/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java
index 86509cd7..2b2c0d80 100644
--- a/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java
+++ b/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java
@@ -59,7 +59,7 @@ public class BlockRitualController extends BlockEnumContainer<EnumRitualControll
     {
         TileEntity tile = world.getTileEntity(pos);
 
-        if (getMetaFromState(state) == 0 && tile instanceof TileMasterRitualStone)
+        if (state.getValue(getProperty()) != EnumRitualController.IMPERFECT && tile instanceof TileMasterRitualStone)
         {
             if (heldItem != null && heldItem.getItem() == ModItems.ACTIVATION_CRYSTAL)
             {
@@ -72,13 +72,15 @@ public class BlockRitualController extends BlockEnumContainer<EnumRitualControll
                     if (((TileMasterRitualStone) tile).activateRitual(heldItem, player, RitualRegistry.getRitualForId(key)))
                     {
                         ((TileMasterRitualStone) tile).setDirection(direction);
+                        if (state.getValue(getProperty()) == EnumRitualController.INVERTED)
+                            ((TileMasterRitualStone) tile).setInverted(true);
                     }
                 } else
                 {
                     ChatUtil.sendNoSpamUnloc(player, "chat.BloodMagic.ritual.notValid");
                 }
             }
-        } else if (getMetaFromState(state) == 1 && tile instanceof TileImperfectRitualStone)
+        } else if (state.getValue(getProperty()) == EnumRitualController.IMPERFECT && tile instanceof TileImperfectRitualStone)
         {
 
             IBlockState determinerState = world.getBlockState(pos.up());
@@ -109,13 +111,15 @@ public class BlockRitualController extends BlockEnumContainer<EnumRitualControll
     }
 
     @Override
-    public boolean hasTileEntity(IBlockState state) {
+    public boolean hasTileEntity(IBlockState state)
+    {
         return true;
     }
 
     @Override
-    public TileEntity createTileEntity(World world, IBlockState state) {
-        return state.getValue(getProperty()) == EnumRitualController.MASTER ? new TileMasterRitualStone() : new TileImperfectRitualStone();
+    public TileEntity createTileEntity(World world, IBlockState state)
+    {
+        return state.getValue(getProperty()) != EnumRitualController.IMPERFECT ? new TileMasterRitualStone() : new TileImperfectRitualStone();
     }
 
     // IVariantProvider
diff --git a/src/main/java/WayofTime/bloodmagic/block/enums/EnumRitualController.java b/src/main/java/WayofTime/bloodmagic/block/enums/EnumRitualController.java
index 45b22b24..46250f3a 100644
--- a/src/main/java/WayofTime/bloodmagic/block/enums/EnumRitualController.java
+++ b/src/main/java/WayofTime/bloodmagic/block/enums/EnumRitualController.java
@@ -7,7 +7,9 @@ import net.minecraft.util.IStringSerializable;
 public enum EnumRitualController implements IStringSerializable
 {
     MASTER,
-    IMPERFECT;
+    IMPERFECT,
+    INVERTED,
+    ;
 
     @Override
     public String toString()
diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java
index b9c1106c..b2533998 100644
--- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java
+++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java
@@ -47,7 +47,9 @@ public class DataProviderRitualController implements IWailaDataProvider
         {
             if (accessor.getBlock() instanceof BlockRitualController)
             {
-                if (accessor.getBlock().getMetaFromState(accessor.getBlockState()) == 0 && accessor.getTileEntity() instanceof TileMasterRitualStone)
+                int controllerMeta = accessor.getBlock().getMetaFromState(accessor.getBlockState());
+
+                if ((controllerMeta == 0 || controllerMeta == 2) && accessor.getTileEntity() instanceof TileMasterRitualStone)
                 {
                     TileMasterRitualStone mrs = (TileMasterRitualStone) accessor.getTileEntity();
 
@@ -63,7 +65,7 @@ public class DataProviderRitualController implements IWailaDataProvider
                     }
                 }
 
-                if (accessor.getBlock().getMetaFromState(accessor.getBlockState()) == 1 && accessor.getTileEntity() instanceof TileImperfectRitualStone)
+                if (controllerMeta == 1 && accessor.getTileEntity() instanceof TileImperfectRitualStone)
                 {
                     if (accessor.getWorld().getBlockState(accessor.getPosition().up()).getBlock() != null)
                     {
diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java
index 7226d51e..a69e7113 100644
--- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java
+++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java
@@ -150,6 +150,8 @@ public class ModRecipes
         GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ModBlocks.RITUAL_STONE, 4), "aba", "bcb", "aba", 'a', Blocks.OBSIDIAN, 'b', new ItemStack(ModItems.SLATE, 1, 1), 'c', OrbRegistry.getOrbStack(ModItems.ORB_APPRENTICE)));
         GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ModBlocks.RITUAL_CONTROLLER), "aba", "bcb", "aba", 'a', Blocks.OBSIDIAN, 'b', ModBlocks.RITUAL_STONE, 'c', OrbRegistry.getOrbStack(ModItems.ORB_MAGICIAN)));
         GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ModBlocks.RITUAL_CONTROLLER, 1, 1), "aba", "bcb", "aba", 'a', Blocks.OBSIDIAN, 'b', "stone", 'c', OrbRegistry.getOrbStack(ModItems.ORB_WEAK)));
+        GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.RITUAL_CONTROLLER, 1, 2), new ItemStack(ModBlocks.RITUAL_CONTROLLER), new ItemStack(Blocks.REDSTONE_TORCH), new ItemStack(ModItems.SLATE)));
+        GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.RITUAL_CONTROLLER), new ItemStack(ModBlocks.RITUAL_CONTROLLER, 1, 2)));
 
         GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.BASE_ITEM_FILTER, 1, 0), "sgs", "gfg", "sgs", 'f', ItemComponent.getStack(ItemComponent.COMPONENT_FRAME_PART), 'g', "blockGlass", 's', "stickWood"));
         GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.BASE_ITEM_FILTER, 1, 1), "sgs", "gfg", "sgs", 'f', ItemComponent.getStack(ItemComponent.COMPONENT_FRAME_PART), 'g', "dyeYellow", 's', "stickWood"));
diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java
index 52e65915..0b6adfd0 100644
--- a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java
+++ b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java
@@ -46,6 +46,8 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS
     private Ritual currentRitual;
     @Setter
     private EnumFacing direction = EnumFacing.NORTH;
+    @Setter
+    private boolean inverted;
 
     private List<EnumDemonWillType> currentActiveWillConfig = new ArrayList<EnumDemonWillType>();
 
@@ -55,7 +57,7 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS
         if (getWorld().isRemote)
             return;
 
-        if (getWorld().isBlockPowered(getPos()) && isActive())
+        if (isPowered() && isActive())
         {
             active = false;
             redstoned = true;
@@ -63,7 +65,7 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS
             return;
         }
 
-        if (!isActive() && !getWorld().isBlockPowered(getPos()) && isRedstoned() && getCurrentRitual() != null)
+        if (!isActive() && !isPowered() && isRedstoned() && getCurrentRitual() != null)
         {
             active = true;
             ItemStack crystalStack = NBTHelper.checkNBT(new ItemStack(ModItems.ACTIVATION_CRYSTAL, 1, getCurrentRitual().getCrystalLevel()));
@@ -405,4 +407,12 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS
             ChatUtil.sendNoSpam(player, new TextComponentTranslation("ritual.BloodMagic.willConfig.void"));
         }
     }
+
+    public boolean isPowered()
+    {
+        if (inverted)
+            return !getWorld().isBlockPowered(getPos());
+
+        return getWorld().isBlockPowered(getPos());
+    }
 }
diff --git a/src/main/resources/assets/bloodmagic/blockstates/BlockRitualController.json b/src/main/resources/assets/bloodmagic/blockstates/BlockRitualController.json
index 784afa96..1b8b489e 100644
--- a/src/main/resources/assets/bloodmagic/blockstates/BlockRitualController.json
+++ b/src/main/resources/assets/bloodmagic/blockstates/BlockRitualController.json
@@ -16,6 +16,11 @@
         "textures": {
           "all": "bloodmagic:blocks/ImperfectRitualStone"
         }
+      },
+      "inverted": {
+        "textures": {
+          "all": "bloodmagic:blocks/MasterRitualStone_Inverted"
+        }
       }
     }
   }
diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang
index dc5012a0..5c3409ad 100644
--- a/src/main/resources/assets/bloodmagic/lang/en_US.lang
+++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang
@@ -198,6 +198,7 @@ tile.BloodMagic.fluid.lifeEssence.name=Life Essence
 
 tile.BloodMagic.stone.ritual.master.name=Master Ritual Stone
 tile.BloodMagic.stone.ritual.imperfect.name=Imperfect Ritual Stone
+tile.BloodMagic.stone.ritual.inverted.name=Inverted Master Ritual Stone
 
 tile.BloodMagic.altar.name=Blood Altar
 tile.BloodMagic.alchemyArray.name=&r&fAlchemy Array
diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/MasterRitualStone_Inverted.png b/src/main/resources/assets/bloodmagic/textures/blocks/MasterRitualStone_Inverted.png
new file mode 100644
index 0000000000000000000000000000000000000000..9ba93d8b8bbf23394f1c72ef43134b7804402b8b
GIT binary patch
literal 724
zcmV;_0xSKAP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0007;Nkl<ZIE^)v
zy>8=17)8%FKm3=dwKtaSA`7HRfHbLt0D6ZY@3wEXNE5h9k;2~CvQ1KyL~_WPNulf$
zT%3E)mECR^0Yo5#h=?EpF+vCd5dk713WzAB03n0`fC2da?vA_dmSuLFPDixXY`3>8
z%Z!Mk?|a5^z&Qt^sH%#`f1i1Nd&9&S`T3_G`SSTQ)>zD@rm8BMFMlEmPNy?vS>n9s
zaOlar=Ve*=;g8?hHw{K9#lyn`Ns{u<?Jd?C(lo`^8?r2ASv-HeypW_Rrx=+g$1l@}
zn-@g>M@Vc!XASf0@YXOnM?&Q67v^QgRwYUs#0OFl#${od9UzzxJY`iNn+?y_qO%NR
z49hYTiLBRa#?f(ebHl6Ag!36ajI?b>2mvLcSg&iWb6j10pss7QRv3h<qCm|Ht1O}G
zT8b>AtX32;l4S-FP!KtE9m~96j3tD?@pxjD<!tw_d^#M+Y{ERx_!wxLhQwN`vIYbN
z!n&?Wl7wj*@!pf?If2X0!#Hv{^jK?oe0*ZF+2EYxaO?@*UrOxzo_TRJO-oEuwALtZ
z`8&@EX@&xZ<B`o~!+!t52k+_H4sG-Wp=mpuO|aH7O^!UzXpTqHbxk*pOu;h@Bg6T8
z5i3T@A_qWu9|&P#7)ScPCrvGHZw=pl{K$Lr&bqEqN>daCh%gQVT5Gzl$NPX%N>P;+
zcA5ZTY&$X{Z(pA<i$^&J!@$(G3{8Vc5<-9A`uh5tNb%zOF!D(hNs{1)ks=1P>H%=h
z;gSS^@cu*ulGGw17!l#@X42n&CC_tKtD4j4$T*H*48~dx`xnZhr0qKD^@{uZd%o^p
z5mCr)w~O9;wARG<?XHm+xg>fIA}A$<5Ybu@BWSG%A@U!J4Pmw=8q)y)0000<MNUMn
GLSTZ{!cbcP

literal 0
HcmV?d00001