Finished reimplementing the Sigil of Holding

Probably missed a few System.out messages for testing, but ah well.
This commit is contained in:
WayofTime 2021-01-20 12:50:34 -05:00
parent b7e06f23bf
commit 3d51f61915
23 changed files with 429 additions and 45 deletions

View file

@ -58,7 +58,7 @@ e6d9cf699667aaa47efff37b2b033895dee29c15 assets/bloodmagic/blockstates/waterritu
42f26f715bddd16c069f9b51e3767b36477c8908 assets/bloodmagic/blockstates/woodtilepath.json
3c6ce233dae6c1307d9016406c324bbe844b4e1e assets/bloodmagic/blockstates/wornstonebrickpath.json
d59655f12d1724b73b77c373fb6864fcff69db12 assets/bloodmagic/blockstates/wornstonetilepath.json
53c238d0ba2c0f02bc268f69e8040a0f0a4418ef assets/bloodmagic/lang/en_us.json
6018c5727249da4191f055bc7be11a67af18513b assets/bloodmagic/lang/en_us.json
34445195b9f2459475cde53454bc8e37d32865d7 assets/bloodmagic/models/block/accelerationrune.json
bcdbccc49d4509571be6988762ab87126275a4c8 assets/bloodmagic/models/block/airritualstone.json
adf6c0b1e25451609486dc8c8cfbd9cf0f8c67f4 assets/bloodmagic/models/block/alchemicalreactionchamber.json
@ -304,6 +304,7 @@ dd4a590f68820a04ca4a71df507e8a39ca6bd393 assets/bloodmagic/models/item/quick_dra
df9beacb97275ffaa7f186778d94ad11138dffe3 assets/bloodmagic/models/item/reagentbloodlight.json
ba57b2a11a0920e7a4df894c6fbae38bf2a6e0ce assets/bloodmagic/models/item/reagentfastminer.json
f9a2fbb703e22dee4ae74daff99249e5f22caa0f assets/bloodmagic/models/item/reagentgrowth.json
a0e2480efd5433e9ead1ef87c2b31b0dbbc7ecb6 assets/bloodmagic/models/item/reagentholding.json
2f8cfb7f2c9cb3dd62a007c2ec56f585414149d8 assets/bloodmagic/models/item/reagentlava.json
2a07dc18d2d8166815c29aa989ccd0093d5d112b assets/bloodmagic/models/item/reagentmagnetism.json
7ce18ad9b0de94a3fc5abf03c6726c8cc4cf5524 assets/bloodmagic/models/item/reagentsight.json
@ -323,6 +324,7 @@ eb098783e91a17d07429d9006fb09bf056350e57 assets/bloodmagic/models/item/sanguiner
b6e98c7b1789654fe7ff559e95011c0a28c58bc1 assets/bloodmagic/models/item/seersigil.json
cc71421e98ee7ee047a4cfbb6cb69529c2b02d4e assets/bloodmagic/models/item/selfsacrificerune.json
7f0256ef2f219d92882e759677399050b0776d64 assets/bloodmagic/models/item/shaped_charge.json
6cc73920a09d4d6925154732f4064d8d03590f25 assets/bloodmagic/models/item/sigilofholding.json
ea5747638d0b5dcc03f008b202cc60a11e0827bb assets/bloodmagic/models/item/sigilofmagnetism.json
dd4a590f68820a04ca4a71df507e8a39ca6bd393 assets/bloodmagic/models/item/silk_touch_anointment.json
08bee690d5092e3c9e6c04c43f50af668fdb3b7e assets/bloodmagic/models/item/slate_vial.json
@ -554,6 +556,7 @@ eb8f2ef0c592ba022190d727eec69d73b7437bac data/bloodmagic/recipes/alchemytable/re
47a4511054bd10454302a6b41eecfac942d27864 data/bloodmagic/recipes/alchemytable/reagent_blood_light.json
e50bf64f33ac29e704f553ef465c2631c1857777 data/bloodmagic/recipes/alchemytable/reagent_fastminer.json
00d41617bb2e67cdfcfcd87c3bb931726bd37e13 data/bloodmagic/recipes/alchemytable/reagent_growth.json
2c613ba6d23fb3a133963e48134893ac7e404042 data/bloodmagic/recipes/alchemytable/reagent_holding.json
e06d24e618d3f2f17cb34a79ac630bd81c85dc45 data/bloodmagic/recipes/alchemytable/reagent_lava.json
41969af0a92baece82c53a779f2e71aec71fe0cb data/bloodmagic/recipes/alchemytable/reagent_magnetism.json
cb5b17173d9f6b7dad40a59aa920f47601e1304e data/bloodmagic/recipes/alchemytable/reagent_sight.json
@ -616,6 +619,7 @@ f6b6c72c0a2d6b3e602976f0dd2dfa778be41777 data/bloodmagic/recipes/array/bounce.js
4bd220ced486f1d8fc4468ebd61dac755670d716 data/bloodmagic/recipes/array/fastminersigil.json
d9ae32c70d4bd872f22229006ad3c8e0cf7e3721 data/bloodmagic/recipes/array/grove.json
f191a3c9982b827b0b2ba93164a81fc4f8cb0959 data/bloodmagic/recipes/array/growthsigil.json
4452b681c328ed01ec680b6b68cb2a0aee11ed3d data/bloodmagic/recipes/array/holdingsigil.json
78c880321f0bfad14239d4b9d2edae170a7fa86e data/bloodmagic/recipes/array/lavasigil.json
165f8f8ba7ae094cdd1367716a0797a0f8d4d605 data/bloodmagic/recipes/array/living_boots.json
1de17e8a769d471c934835955184d0c8782fb619 data/bloodmagic/recipes/array/living_helmet.json

View file

@ -70,6 +70,9 @@
"block.bloodmagic.woodtilepath": "Tiled Wooden Path",
"block.bloodmagic.wornstonebrickpath": "Worn Stone Path",
"block.bloodmagic.wornstonetilepath": "Tiled Worn Stone Path",
"bloodmagic.keybind.cycle_holding_neg": "Cycle Sigil (-)",
"bloodmagic.keybind.cycle_holding_pos": "Cycle Sigil (+)",
"bloodmagic.keybind.open_holding": "Open Sigil of Holding",
"chat.bloodmagic.damageSource": "%s's soul became too weak",
"chat.bloodmagic.living_upgrade_level_increase": "%s has leveled up to %d",
"chat.bloodmagic.ritual.activate": "A rush of energy flows through the ritual!",
@ -147,6 +150,7 @@
"item.bloodmagic.reagentbloodlight": "Blood Lamp Reagent",
"item.bloodmagic.reagentfastminer": "Mining Reagent",
"item.bloodmagic.reagentgrowth": "Growth Reagent",
"item.bloodmagic.reagentholding": "Holding Reagent",
"item.bloodmagic.reagentlava": "Lava Reagent",
"item.bloodmagic.reagentmagnetism": "Magnetism Reagent",
"item.bloodmagic.reagentsight": "Sight Reagent",
@ -161,6 +165,7 @@
"item.bloodmagic.sand_netherite": "Netherite Scrap Sand",
"item.bloodmagic.sanguinereverter": "Sanguine Reverter",
"item.bloodmagic.seersigil": "Seer's Sigil",
"item.bloodmagic.sigilofholding": "Sigil of Holding",
"item.bloodmagic.sigilofmagnetism": "Sigil of Magnetism",
"item.bloodmagic.silk_touch_anointment": "Soft Coating",
"item.bloodmagic.slate_vial": "Slate-infused Vial",
@ -200,6 +205,7 @@
"jei.bloodmagic.recipe.soulforge": "Hellfire Forge",
"jei.bloodmagic.recipe.soulsdrained": "Drained: %s Will",
"jei.bloodmagic.recipe.ticksRequired": "Time: %sTicks",
"key.bloodmagic.category": "Blood Magic",
"living_upgrade.bloodmagic.arrow_protect": "Pin Cushion",
"living_upgrade.bloodmagic.arrow_shot": "Trick Shot",
"living_upgrade.bloodmagic.battleHunger": "Battle Hungry",
@ -390,6 +396,7 @@
"tile.bloodmagic.alchemytable.name": "Alchemy Table",
"tile.bloodmagic.arc.name": "Alchemical Reaction Chamber",
"tile.bloodmagic.soulforge.name": "Hellfire Forge",
"tooltip.bloodmagic.activated": "Activated",
"tooltip.bloodmagic.activationcrystal.awakened": "Activates more powerful rituals",
"tooltip.bloodmagic.activationcrystal.creative": "Creative Only - Activates any ritual",
"tooltip.bloodmagic.activationcrystal.weak": "Activates low-level rituals",
@ -409,6 +416,7 @@
"tooltip.bloodmagic.currentType.destructive": "Contains: Destructive Will",
"tooltip.bloodmagic.currentType.steadfast": "Contains: Steadfast Will",
"tooltip.bloodmagic.currentType.vengeful": "Contains: Vengeful Will",
"tooltip.bloodmagic.deactivated": "Deactivated",
"tooltip.bloodmagic.decoration.notSafe": "Dangerous for decoration",
"tooltip.bloodmagic.decoration.safe": "Safe for decoration",
"tooltip.bloodmagic.diviner.airRune": "Air Runes: %d",
@ -458,6 +466,9 @@
"tooltip.bloodmagic.sigil.divination.otherNetwork": "Peering into the soul of %s",
"tooltip.bloodmagic.sigil.fastminer.desc": "Keep mining, and mining...",
"tooltip.bloodmagic.sigil.greengrove.desc": "Environmentally friendly",
"tooltip.bloodmagic.sigil.holding.desc": "Sigil-ception",
"tooltip.bloodmagic.sigil.holding.press": "Press %s to modify",
"tooltip.bloodmagic.sigil.holding.sigilInSlot": "Slot %d: %s",
"tooltip.bloodmagic.sigil.lava.desc": "HOT! DO NOT EAT",
"tooltip.bloodmagic.sigil.magnetism.desc": "I have a very magnetic personality",
"tooltip.bloodmagic.sigil.seer.currentAltarCapacity": "Current Capacity: %d LP",

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "bloodmagic:item/reagentholding"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "bloodmagic:item/sigilofholding"
}
}

View file

@ -0,0 +1,23 @@
{
"type": "bloodmagic:alchemytable",
"input": [
{
"tag": "forge:chests"
},
{
"tag": "forge:leather"
},
{
"tag": "forge:string"
},
{
"tag": "forge:string"
}
],
"output": {
"item": "bloodmagic:reagentholding"
},
"syphon": 2000,
"ticks": 200,
"upgradeLevel": 2
}

View file

@ -0,0 +1,13 @@
{
"type": "bloodmagic:array",
"texture": "bloodmagic:textures/models/alchemyarrays/sightsigil.png",
"baseinput": {
"item": "bloodmagic:reagentholding"
},
"addedinput": {
"item": "bloodmagic:infusedslate"
},
"output": {
"item": "bloodmagic:sigilofholding"
}
}