Merge branch '1.8-Rewrite' of https://github.com/WayofTime/BloodMagic into 1.8-Rewrite

src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java

@@ -59,7 +59,7 @@ public class ModBlocks
     public static Block ritualController;
     public static Block ritualStone;
     public static Block bloodLight;
-    public static Block testSpellBlock;
+//    public static Block testSpellBlock;
     public static Block pedestal;
     public static Block teleposer;
     public static Block alchemyArray;
@@ -89,7 +89,6 @@ public class ModBlocks
         ritualController = registerBlock(new BlockRitualController(), ItemBlockRitualController.class);
         ritualStone = registerBlock(new BlockRitualStone(), ItemBlockRitualStone.class);
         bloodLight = registerBlock(new BlockBloodLight());
-        testSpellBlock = registerBlock(new BlockTestSpellBlock());
         pedestal = registerBlock(new BlockPedestal(), ItemBlockPedestal.class);
         teleposer = registerBlock(new BlockTeleposer());
         alchemyArray = registerBlock(new BlockAlchemyArray());
@@ -105,6 +104,8 @@ public class ModBlocks
         incenseAltar = registerBlock(new BlockIncenseAltar());
         pathBlock = registerBlock(new BlockPath(), ItemBlockPath.class);
 
+//        testSpellBlock = registerBlock(new BlockTestSpellBlock());
+
         BloodMagicAPI.addToTeleposerBlacklist(inputRoutingNode);
         BloodMagicAPI.addToTeleposerBlacklist(outputRoutingNode);
         BloodMagicAPI.addToTeleposerBlacklist(itemRoutingNode);

src/main/resources/assets/bloodmagic/lang/en_US.lang

@@ -15,7 +15,7 @@ item.BloodMagic.daggerOfSacrifice.name=Dagger of Sacrifice
 
 item.BloodMagic.lavaCrystal.name=Lava Crystal
 
-item.BloodMagic.bound.sword.name=Bound Sword
+item.BloodMagic.bound.sword.name=Bound Blade
 item.BloodMagic.bound.pickaxe.name=Bound Pickaxe
 item.BloodMagic.bound.axe.name=Bound Axe
 item.BloodMagic.bound.shovel.name=Bound Shovel
@@ -350,3 +350,4 @@ option.BloodMagic.bypassSneak=Bypass Sneak
 option.BloodMagic.bloodAltar=Blood Altar
 option.BloodMagic.ritualController=Ritual Stones
 option.BloodMagic.teleposer=Teleposer
+option.BloodMagic.array=Alchemy Array

src/main/resources/assets/bloodmagic/models/item/ItemBoundAxe0.json

@@ -1,5 +1,5 @@
 {
-  "parent":"bloodmagic:item/ItemModelBase",
+  "parent":"bloodmagic:item/ItemToolBase",
   "textures": {
     "layer0":"bloodmagic:items/Item_deactivated"
   }

src/main/resources/assets/bloodmagic/models/item/ItemBoundAxe1.json

@@ -1,5 +1,5 @@
 {
-  "parent":"bloodmagic:item/ItemModelBase",
+  "parent":"bloodmagic:item/ItemToolBase",
   "textures": {
     "layer0":"bloodmagic:items/BoundAxe_activated"
   }

src/main/resources/assets/bloodmagic/models/item/ItemBoundPickaxe0.json

@@ -1,5 +1,5 @@
 {
-  "parent":"bloodmagic:item/ItemModelBase",
+  "parent":"bloodmagic:item/ItemToolBase",
   "textures": {
     "layer0":"bloodmagic:items/Item_deactivated"
   }

src/main/resources/assets/bloodmagic/models/item/ItemBoundPickaxe1.json

@@ -1,5 +1,5 @@
 {
-  "parent":"bloodmagic:item/ItemModelBase",
+  "parent":"bloodmagic:item/ItemToolBase",
   "textures": {
     "layer0":"bloodmagic:items/BoundPickaxe_activated"
   }

src/main/resources/assets/bloodmagic/models/item/ItemBoundShovel0.json

@@ -1,5 +1,5 @@
 {
-  "parent":"bloodmagic:item/ItemModelBase",
+  "parent":"bloodmagic:item/ItemToolBase",
   "textures": {
     "layer0":"bloodmagic:items/Item_deactivated"
   }

src/main/resources/assets/bloodmagic/models/item/ItemBoundShovel1.json

@@ -1,5 +1,5 @@
 {
-  "parent":"bloodmagic:item/ItemModelBase",
+  "parent":"bloodmagic:item/ItemToolBase",
   "textures": {
     "layer0":"bloodmagic:items/BoundShovel_activated"
   }

src/main/resources/assets/bloodmagic/models/item/ItemBoundSword0.json

@@ -1,5 +1,5 @@
 {
-  "parent":"bloodmagic:item/ItemModelBase",
+  "parent":"bloodmagic:item/ItemToolBase",
   "textures": {
     "layer0":"bloodmagic:items/Item_deactivated"
   }

src/main/resources/assets/bloodmagic/models/item/ItemBoundSword1.json

@@ -1,5 +1,5 @@
 {
-  "parent":"bloodmagic:item/ItemModelBase",
+  "parent":"bloodmagic:item/ItemToolBase",
   "textures": {
     "layer0":"bloodmagic:items/BoundSword_activated"
   }

src/main/resources/assets/bloodmagic/models/item/ItemDaggerOfSacrifice.json

@@ -1,5 +1,5 @@
 {
-  "parent":"bloodmagic:item/ItemModelBase",
+  "parent":"bloodmagic:item/ItemToolBase",
   "textures": {
     "layer0":"bloodmagic:items/DaggerOfSacrifice"
   }

src/main/resources/assets/bloodmagic/models/item/ItemSacrificialDagger0.json

@@ -1,5 +1,5 @@
 {
-  "parent":"bloodmagic:item/ItemModelBase",
+  "parent":"bloodmagic:item/ItemToolBase",
   "textures": {
     "layer0":"bloodmagic:items/SacrificialDagger"
   }

src/main/resources/assets/bloodmagic/models/item/ItemSacrificialDagger1.json

@@ -1,5 +1,5 @@
 {
-  "parent":"bloodmagic:item/ItemModelBase",
+  "parent":"bloodmagic:item/ItemToolBase",
   "textures": {
     "layer0":"bloodmagic:items/SacrificialDagger"
   }

src/main/resources/assets/bloodmagic/models/item/ItemSentientSword0.json

@@ -1,5 +1,5 @@
 {
-  "parent":"bloodmagic:item/ItemModelBase",
+  "parent":"bloodmagic:item/ItemToolBase",
   "textures": {
     "layer0":"bloodmagic:items/SoulSword_deactivated"
   }

src/main/resources/assets/bloodmagic/models/item/ItemSentientSword1.json

@@ -1,5 +1,5 @@
 {
-  "parent":"bloodmagic:item/ItemModelBase",
+  "parent":"bloodmagic:item/ItemToolBase",
   "textures": {
     "layer0":"bloodmagic:items/SoulSword_activated"
   }

src/main/resources/assets/bloodmagic/models/item/ItemToolBase.json

@@ -0,0 +1,15 @@
+{
+  "parent":"builtin/generated",
+  "display": {
+    "thirdperson": {
+      "rotation": [ 0, 90, -35 ],
+      "translation": [ 0, 1.25, -3.5 ],
+      "scale": [ 0.85, 0.85, 0.85 ]
+    },
+    "firstperson": {
+      "rotation": [ 0, -135, 25 ],
+      "translation": [ 0, 4, 2 ],
+      "scale": [ 1.7, 1.7, 1.7 ]
+    }
+  }
+}