diff --git a/build.gradle b/build.gradle index d3ae53bc5..8480bd802 100644 --- a/build.gradle +++ b/build.gradle @@ -3,10 +3,12 @@ buildscript { maven { url = 'https://maven.minecraftforge.net' } maven { url = 'https://repo.spongepowered.org/maven' } mavenCentral() + maven { url = 'https://maven.parchmentmc.org' } } dependencies { classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1+', changing: true classpath group: 'org.spongepowered', name: 'mixingradle', version: '0.7-SNAPSHOT' + classpath 'org.parchmentmc:librarian:1.+' } } @@ -15,6 +17,7 @@ plugins { } apply plugin: 'net.minecraftforge.gradle' +apply plugin: 'org.parchmentmc.librarian.forgegradle' apply plugin: 'org.spongepowered.mixin' apply plugin: 'eclipse' apply plugin: 'maven-publish' diff --git a/build.properties b/build.properties index eef607a55..490f12b7a 100644 --- a/build.properties +++ b/build.properties @@ -1,5 +1,5 @@ #Sun Apr 09 14:41:44 WEST 2023 -mapping_channel=official +mapping_channel=parchment mod_id=psi forge_version=43.3.0 jei_version=11.6.0.1013 @@ -7,6 +7,6 @@ build_number=99 patchy_version=1.19.2-77 dir_output=../Build Output/Psi/ version=1.19 -mapping_version=1.19.2 +mapping_version=2022.11.27-1.19.2 mod_name=Psi mc_version=1.19.2 \ No newline at end of file diff --git a/src/main/java/vazkii/psi/client/patchouli/SpellGridComponent.java b/src/main/java/vazkii/psi/client/patchouli/SpellGridComponent.java index 29726b85c..0fcf20738 100644 --- a/src/main/java/vazkii/psi/client/patchouli/SpellGridComponent.java +++ b/src/main/java/vazkii/psi/client/patchouli/SpellGridComponent.java @@ -8,11 +8,13 @@ */ package vazkii.psi.client.patchouli; +import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.Tesselator; import com.mojang.brigadier.exceptions.CommandSyntaxException; import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.resources.language.I18n; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.TagParser; import net.minecraft.util.StringUtil; @@ -26,13 +28,13 @@ import java.util.function.UnaryOperator; +import static vazkii.psi.client.gui.GuiProgrammer.texture; + public class SpellGridComponent implements ICustomComponent { - private transient int x, y; - private transient boolean isDownscaled; private transient SpellGrid grid; + private transient String spellName; public IVariable spell; - public IVariable halfsize; @Override public void build(int componentX, int componentY, int pageNum) { @@ -47,20 +49,31 @@ public void build(int componentX, int componentY, int pageNum) { throw new IllegalArgumentException("Invalid spell string: " + spell); } grid = fromNBT.grid; + spellName = fromNBT.name; } catch (CommandSyntaxException e) { throw new IllegalArgumentException("Invalid spell string: " + spell, e); } - isDownscaled = halfsize.asBoolean(false); } @Override public void render(PoseStack ms, IComponentRenderContext context, float pticks, int mouseX, int mouseY) { - float scale = isDownscaled ? 0.5f : 1.0f; + float scale = 0.65f; - MultiBufferSource.BufferSource buffer = MultiBufferSource.immediate(Tesselator.getInstance().getBuilder()); ms.pushPose(); - ms.translate(x, y, 0); - ms.scale(scale, scale, scale); + ms.scale(scale, scale, 0f); + + // Draw the Programmer BG + RenderSystem.setShaderColor(1F, 1F, 1F, 1F); + RenderSystem.setShaderTexture(0, texture); + context.getGui().blit(ms, 0, 0, 0, 0, 174, 184); + + // Draw the name label and spell name + context.getGui().getMinecraft().font.drawShadow(ms, I18n.get("psimisc.name"), 7, 171, 0xFFFFFF); + context.getGui().getMinecraft().font.drawShadow(ms, spellName, 44, 170, 0xFFFFFF); + + // Pad the spell pieces and draw them + ms.translate(7f, 7f, 0f); + MultiBufferSource.BufferSource buffer = MultiBufferSource.immediate(Tesselator.getInstance().getBuilder()); grid.draw(ms, buffer, 0xF000F0); buffer.endBatch(); @@ -72,7 +85,7 @@ public void render(PoseStack ms, IComponentRenderContext context, float pticks, SpellPiece[] data = gridData[i]; for(int j = 0; j < data.length; j++) { SpellPiece piece = data[j]; - if(piece != null && context.isAreaHovered(mouseX, mouseY, (int) (x + i * scaledSize), (int) (y + j * scaledSize), scaledHoverSize, scaledHoverSize)) { + if(piece != null && context.isAreaHovered(mouseX, mouseY, (int) (4 + i * scaledSize), (int) (4 + j * scaledSize), scaledHoverSize, scaledHoverSize)) { PatchouliUtils.setPieceTooltip(context, piece); } } @@ -83,6 +96,5 @@ public void render(PoseStack ms, IComponentRenderContext context, float pticks, @Override public void onVariablesAvailable(UnaryOperator lookup) { spell = lookup.apply(spell); - halfsize = lookup.apply(halfsize); } } diff --git a/src/main/resources/assets/psi/lang/en_us.json b/src/main/resources/assets/psi/lang/en_us.json index feef2906a..1c18fb25b 100644 --- a/src/main/resources/assets/psi/lang/en_us.json +++ b/src/main/resources/assets/psi/lang/en_us.json @@ -627,7 +627,7 @@ "psi.datatype.entity": "Entity", "psi.datatype.living_entity": "Entity (Living)", "psi.datatype.living_entity_base": "Entity (Living)", - "psi.datatype.player_entity": "Entity (Player, Living)", + "psi.datatype.player": "Entity (Player, Living)", "psi.datatype.entity_list_wrapper": "Entity List", "psi.spellerror.nospell": "No Spell to compile", "psi.spellerror.invalid_base": "ERROR: Cannot interpret bases below 2", @@ -829,7 +829,7 @@ "psi.book.page.tutorial4.7": "Copy the $(thing)Spell$(0) into your $(thing)CAD$(0), look straight ahead, and cast. If you get thrown forward, then congratulations! You've just finished writing your first real $(thing)Spell$(0)!$(p)$(o)Note: Casting your new $(thing)Spell$(0) too many times in a row might be bad for your health. More on this in $(l:basics/tutorial_5)the next tutorial$(/l).$()", "psi.book.entry.tutorial5": "Tutorial (5): Limits", "psi.book.page.tutorial5.0": "Open your $(l:basics/spell_programmer)$(o)$(item)Spell Programmer$(0)$(/l) again, and review the $(thing)Spell$(0) you wrote in $(l:basics/tutorial_4)the last tutorial$(/l).$(p)When it compiled correctly, you should have seen five icons appear to the right of the grid, each with two numbers. These numerical stats define the practical limits on exactly what $(thing)Spells$(0) you're able to cast.", - "psi.book.page.tutorial5.1": "The stats for your Add Motion $(thing)Spell$(0) (assuming your constant was 3)", + "psi.book.page.tutorial5.1": "The stats for your Add Motion $(thing)Spell$(0) (assuming your constant was 2)", "psi.book.subsec.tutorial5.2": "Complexity", "psi.book.page.tutorial5.2": "The first stat is $(thing)Complexity$(0), the total number of $(thing)Operators$(0), $(thing)Selectors$(0), and non-debug $(thing)Tricks$(0) in the $(thing)Spell$(0).$(p)Its maximum value is determined by the $(l:components/core)$(o)$(item)CAD Core$(0)$(/l) you have installed; if a $(thing)Spell$(0)'s $(thing)Complexity$(0) exceeds your $(thing)CAD$(0)'s capacity, it won't be castable.", "psi.book.subsec.tutorial5.3": "Potency", diff --git a/src/main/resources/assets/psi/patchouli_books/encyclopaedia_psionica/en_us/entries/basics/eval_order.json b/src/main/resources/assets/psi/patchouli_books/encyclopaedia_psionica/en_us/entries/basics/eval_order.json index c00d61618..a170d7a9b 100644 --- a/src/main/resources/assets/psi/patchouli_books/encyclopaedia_psionica/en_us/entries/basics/eval_order.json +++ b/src/main/resources/assets/psi/patchouli_books/encyclopaedia_psionica/en_us/entries/basics/eval_order.json @@ -16,36 +16,27 @@ "text": "psi.book.page.evalOrder.2" }, { - "type": "image", - "text": "psi.book.page.evalOrder.3", - "images": [ - "psi:textures/gui/entries/eval_order_1.png" - ], - "border": false + "type": "psi:spell_grid", + "spell": "{modsRequired:[{modName:\"psi\",modVersion:\"2.0.0\"}],spellList:[{data:{key:\"psi:trick_debug\",params:{_number:0,_target:4}},x:1,y:2},{data:{key:\"psi:trick_debug\",params:{_number:0,_target:4}},x:1,y:6},{data:{constantValue:\"1\",key:\"psi:constant_number\"},x:2,y:2},{data:{constantValue:\"3\",key:\"psi:constant_number\"},x:2,y:6},{data:{key:\"psi:trick_debug\",params:{_number:0,_target:4}},x:6,y:2},{data:{key:\"psi:trick_debug\",params:{_number:0,_target:4}},x:6,y:6},{data:{constantValue:\"2\",key:\"psi:constant_number\"},x:7,y:2},{data:{constantValue:\"4\",key:\"psi:constant_number\"},x:7,y:6}],spellName:\"Rule 1\",uuidLeast:-8740135302326498868L,uuidMost:4572508895319312811L,validSpell:1b}", + "text": "psi.book.page.evalOrder.3" }, { "type": "text", "text": "psi.book.page.evalOrder.4" }, { - "type": "image", - "text": "psi.book.page.evalOrder.5", - "images": [ - "psi:textures/gui/entries/eval_order_2.png" - ], - "border": false + "type": "psi:spell_grid", + "spell": "{modsRequired:[{modName:\"psi\",modVersion:\"2.0.0\"}],spellList:[{data:{constantValue:\"1\",key:\"psi:constant_number\"},x:1,y:5},{data:{key:\"psi:operator_entity_look\",params:{_target:1}},x:1,y:6},{data:{constantValue:\"0\",key:\"psi:constant_number\"},x:2,y:2},{data:{key:\"psi:trick_debug\",params:{_number:0,_target:1}},x:2,y:3},{data:{key:\"psi:operator_absolute\",params:{_target:2}},x:2,y:5},{data:{key:\"psi:selector_caster\"},x:2,y:6},{data:{key:\"psi:operator_vector_negate\",params:{_target:2}},x:6,y:2},{data:{key:\"psi:connector\",params:{_target:4}},x:6,y:3},{data:{key:\"psi:selector_caster\"},x:6,y:5},{data:{key:\"psi:operator_divide\",params:{_number1:1,_number2:4,_number3:0}},x:6,y:6},{data:{key:\"psi:connector\",params:{_target:3}},x:7,y:2},{data:{key:\"psi:connector\",params:{_target:1}},x:7,y:3},{data:{key:\"psi:selector_focal_point\"},x:7,y:6}],spellName:\"Undefined Behaviour\",uuidLeast:-8740135302326498868L,uuidMost:4572508895319312811L,validSpell:1b}", + "text": "psi.book.page.evalOrder.5" }, { "type": "text", "text": "psi.book.page.evalOrder.6" }, { - "type": "image", - "text": "psi.book.page.evalOrder.7", - "images": [ - "psi:textures/gui/entries/eval_order_3.png" - ], - "border": false + "type": "psi:spell_grid", + "spell": "{modsRequired:[{modName:\"psi\",modVersion:\"2.0.0\"}],spellList:[{data:{key:\"psi:trick_debug\",params:{_number:0,_target:2}},x:3,y:3},{data:{key:\"psi:connector\",params:{_target:4}},x:3,y:4},{data:{key:\"psi:trick_debug\",params:{_number:0,_target:1}},x:3,y:5},{data:{constantValue:\"1\",key:\"psi:constant_number\"},x:4,y:3},{data:{key:\"psi:operator_random\",params:{_max:1,_min:0}},x:4,y:4},{data:{key:\"psi:trick_debug_spamless\",params:{_number:0,_target:2}},x:5,y:3},{data:{key:\"psi:connector\",params:{_target:3}},x:5,y:4},{data:{key:\"psi:trick_debug_spamless\",params:{_number:0,_target:1}},x:5,y:5}],spellName:\"Rule 3\",uuidLeast:-4674464373897948180L,uuidMost:-1782855518829395229L,validSpell:1b}", + "text": "psi.book.page.evalOrder.7" } ] } \ No newline at end of file diff --git a/src/main/resources/assets/psi/patchouli_books/encyclopaedia_psionica/en_us/entries/basics/tutorial_1.json b/src/main/resources/assets/psi/patchouli_books/encyclopaedia_psionica/en_us/entries/basics/tutorial_1.json index 84bdfbdeb..ff526e5f4 100644 --- a/src/main/resources/assets/psi/patchouli_books/encyclopaedia_psionica/en_us/entries/basics/tutorial_1.json +++ b/src/main/resources/assets/psi/patchouli_books/encyclopaedia_psionica/en_us/entries/basics/tutorial_1.json @@ -58,12 +58,8 @@ "text": "psi.book.page.tutorial1.12" }, { - "type": "image", - "text": "psi.book.page.tutorial1.13", - "images": [ - "psi:textures/gui/entries/tutorial_1_spell.png" - ], - "border": true + "type": "psi:spell_grid", + "spell": "{modsRequired:[{modName:\"psi\",modVersion:\"2.0.0\"}],spellList:[{data:{key:\"psi:selector_caster\"},x:4,y:4},{data:{key:\"psi:trick_debug\",params:{_number:0,_target:3}},x:5,y:4}],spellName:\"Debug\",uuidLeast:-8344502881889052755L,uuidMost:8904817452787319960L,validSpell:1b}" }, { "type": "text", diff --git a/src/main/resources/assets/psi/patchouli_books/encyclopaedia_psionica/en_us/entries/basics/tutorial_3.json b/src/main/resources/assets/psi/patchouli_books/encyclopaedia_psionica/en_us/entries/basics/tutorial_3.json index fb7b923e1..14c4c3d26 100644 --- a/src/main/resources/assets/psi/patchouli_books/encyclopaedia_psionica/en_us/entries/basics/tutorial_3.json +++ b/src/main/resources/assets/psi/patchouli_books/encyclopaedia_psionica/en_us/entries/basics/tutorial_3.json @@ -18,12 +18,9 @@ "text": "psi.book.page.tutorial3.2" }, { - "type": "image", - "text": "psi.book.page.tutorial3.3", - "images": [ - "psi:textures/gui/entries/tutorial_3_tooltip.png" - ], - "border": false + "type": "psi:spellpiece_spotlight", + "spellpiece": "psi:selector_caster", + "text": "psi.book.page.tutorial3.3" }, { "type": "text", @@ -54,24 +51,16 @@ "text": "psi.book.page.tutorial3.10" }, { - "type": "image", - "text": "psi.book.page.tutorial3.11", - "images": [ - "psi:textures/gui/entries/tutorial_3_connector.png" - ], - "border": false + "type": "psi:spell_grid", + "spell": "{modsRequired:[{modName:\"psi\",modVersion:\"2.0.0\"}],spellList:[{data:{key:\"psi:trick_debug\",params:{_number:0,_target:4}},x:3,y:4},{data:{key:\"psi:connector\",params:{_target:4}},x:4,y:4},{data:{key:\"psi:selector_caster\"},x:5,y:4}],spellName:\"Bridge to Terabithia\",uuidLeast:-8344502881889052755L,uuidMost:8904817452787319960L,validSpell:1b}" }, { "type": "text", "text": "psi.book.page.tutorial3.12" }, { - "type": "image", - "text": "psi.book.page.tutorial3.13", - "images": [ - "psi:textures/gui/entries/tutorial_3_chain.png" - ], - "border": false + "type": "psi:spell_grid", + "spell": "{modsRequired:[{modName:\"psi\",modVersion:\"2.0.0\"}],spellList:[{data:{key:\"psi:connector\",params:{_target:2}},x:2,y:3},{data:{constantValue:\"42\",key:\"psi:constant_number\"},x:2,y:4},{data:{key:\"psi:connector\",params:{_target:1}},x:2,y:5},{data:{key:\"psi:connector\",params:{_target:3}},x:3,y:3},{data:{key:\"psi:selector_caster\"},x:3,y:4},{data:{key:\"psi:connector\",params:{_target:3}},x:3,y:5},{data:{key:\"psi:connector\",params:{_target:3}},x:4,y:3},{data:{key:\"psi:connector\",params:{_target:3}},x:4,y:4},{data:{key:\"psi:connector\",params:{_target:3}},x:4,y:5},{data:{key:\"psi:connector\",params:{_target:3}},x:5,y:3},{data:{key:\"psi:trick_debug\",params:{_number:0,_target:3}},x:5,y:4},{data:{key:\"psi:connector\",params:{_target:3}},x:5,y:5},{data:{key:\"psi:connector\",params:{_target:3}},x:6,y:3},{data:{key:\"psi:trick_debug\",params:{_number:1,_target:2}},x:6,y:4},{data:{key:\"psi:connector\",params:{_target:3}},x:6,y:5}],spellName:\"The long way around\",uuidLeast:-8344502881889052755L,uuidMost:8904817452787319960L,validSpell:1b}" } ] } \ No newline at end of file diff --git a/src/main/resources/assets/psi/patchouli_books/encyclopaedia_psionica/en_us/entries/basics/tutorial_4.json b/src/main/resources/assets/psi/patchouli_books/encyclopaedia_psionica/en_us/entries/basics/tutorial_4.json index ae2ed2fde..4604da2be 100644 --- a/src/main/resources/assets/psi/patchouli_books/encyclopaedia_psionica/en_us/entries/basics/tutorial_4.json +++ b/src/main/resources/assets/psi/patchouli_books/encyclopaedia_psionica/en_us/entries/basics/tutorial_4.json @@ -30,12 +30,9 @@ "text": "psi.book.page.tutorial4.5" }, { - "type": "image", - "text": "psi.book.page.tutorial4.6", - "images": [ - "psi:textures/gui/entries/tutorial_4_spell.png" - ], - "border": false + "type": "psi:spell_grid", + "spell": "{modsRequired:[{modName:\"psi\",modVersion:\"2.0.0\"}],spellList:[{data:{constantValue:\"2\",key:\"psi:constant_number\"},x:3,y:4},{data:{key:\"psi:selector_caster\"},x:4,y:3},{data:{key:\"psi:trick_add_motion\",params:{_direction:4,_speed:3,_target:1}},x:4,y:4},{data:{key:\"psi:connector\",params:{_target:3}},x:5,y:3},{data:{key:\"psi:operator_entity_look\",params:{_target:1}},x:5,y:4}],spellName:\"Add motion\",uuidLeast:-8344502881889052755L,uuidMost:8904817452787319960L,validSpell:1b}", + "text": "psi.book.page.tutorial4.6" }, { "type": "text", diff --git a/src/main/resources/assets/psi/patchouli_books/encyclopaedia_psionica/en_us/entries/basics/tutorial_6.json b/src/main/resources/assets/psi/patchouli_books/encyclopaedia_psionica/en_us/entries/basics/tutorial_6.json index 8506b8808..5fa923f10 100644 --- a/src/main/resources/assets/psi/patchouli_books/encyclopaedia_psionica/en_us/entries/basics/tutorial_6.json +++ b/src/main/resources/assets/psi/patchouli_books/encyclopaedia_psionica/en_us/entries/basics/tutorial_6.json @@ -46,12 +46,9 @@ "text": "psi.book.page.tutorial6.9" }, { - "type": "image", - "text": "psi.book.page.tutorial6.10", - "images": [ - "psi:textures/gui/entries/tutorial_6_spell.png" - ], - "border": false + "type": "psi:spell_grid", + "spell": "{modsRequired:[{modName:\"psi\",modVersion:\"2.0.0\"}],spellList:[{data:{key:\"psi:selector_caster\"},x:3,y:3},{data:{key:\"psi:operator_entity_position\",params:{_target:1}},x:3,y:4},{data:{key:\"psi:operator_entity_look\",params:{_target:3}},x:4,y:3},{data:{key:\"psi:operator_vector_raycast\",params:{_max:0,_position:3,_ray:1}},x:4,y:4},{data:{key:\"psi:trick_explode\",params:{_position:1,_power:4}},x:4,y:5},{data:{constantValue:\"1.4\",key:\"psi:constant_number\"},x:5,y:5}],spellName:\"Explode\",uuidLeast:-8344502881889052755L,uuidMost:8904817452787319960L,validSpell:1b}", + "text": "psi.book.page.tutorial6.10" }, { "type": "text", diff --git a/src/main/resources/assets/psi/patchouli_books/encyclopaedia_psionica/en_us/entries/items/circle_bullet.json b/src/main/resources/assets/psi/patchouli_books/encyclopaedia_psionica/en_us/entries/items/circle_bullet.json index cb3a8f47c..b0126b73a 100644 --- a/src/main/resources/assets/psi/patchouli_books/encyclopaedia_psionica/en_us/entries/items/circle_bullet.json +++ b/src/main/resources/assets/psi/patchouli_books/encyclopaedia_psionica/en_us/entries/items/circle_bullet.json @@ -35,12 +35,9 @@ "anchor": "circlesync" }, { - "type": "image", - "text": "psi.book.page.circleBullet.7", - "images": [ - "psi:textures/gui/entries/circle_bullet_circlesync.png" - ], - "border": false + "type": "psi:spell_grid", + "spell": "{modsRequired:[{modName:\"psi\",modVersion:\"2.0.0\"}],spellList:[{data:{key:\"psi:trick_delay\",params:{_time:2}},x:3,y:3},{data:{key:\"psi:constant_wrapper\",params:{_constant:2,_target:4}},x:3,y:4},{data:{constantValue:\"95\",key:\"psi:constant_number\"},x:3,y:5},{data:{key:\"psi:operator_subtract\",params:{_number1:2,_number2:4,_number3:0}},x:4,y:4},{data:{key:\"psi:connector\",params:{_target:3}},x:4,y:5},{data:{key:\"psi:selector_loopcast_index\"},x:5,y:3},{data:{key:\"psi:operator_multiply\",params:{_number1:1,_number2:2,_number3:0}},x:5,y:4},{data:{constantValue:\"5\",key:\"psi:constant_number\"},x:5,y:5}],spellName:\"Circlesync\",uuidLeast:-5666065845008046135L,uuidMost:-8982799496831941618L,validSpell:1b}", + "text": "psi.book.page.circleBullet.7" }, { "type": "text", @@ -53,12 +50,9 @@ "text": "psi.book.page.circleBullet.9" }, { - "type": "image", - "text": "psi.book.page.circleBullet.10", - "images": [ - "psi:textures/gui/entries/circle_bullet_20b_tower.png" - ], - "border": false + "type": "psi:spell_grid", + "spell": "{modsRequired:[{modName:\"psi\",modVersion:\"2.0.0\"}],spellList:[{data:{key:\"psi:trick_die\",params:{_target:4}},x:3,y:3},{data:{key:\"psi:selector_ruler_vector\"},x:3,y:4},{data:{key:\"psi:selector_block_presence\",params:{_position:2}},x:4,y:3},{data:{key:\"psi:operator_vector_sum\",params:{_vector1:4,_vector2:3,_vector3:0}},x:4,y:4},{data:{key:\"psi:selector_loopcast_index\"},x:5,y:3},{data:{key:\"psi:operator_vector_construct\",params:{_x:0,_y:1,_z:0}},x:5,y:4}],spellName:\"20-Bit Tower\",uuidLeast:-6418013341378361091L,uuidMost:8665330167676028379L,validSpell:1b}", + "text": "psi.book.page.circleBullet.10" } ] } \ No newline at end of file diff --git a/src/main/resources/assets/psi/patchouli_books/encyclopaedia_psionica/en_us/templates/spell_grid.json b/src/main/resources/assets/psi/patchouli_books/encyclopaedia_psionica/en_us/templates/spell_grid.json index 258c6e0a7..fa4335cc9 100644 --- a/src/main/resources/assets/psi/patchouli_books/encyclopaedia_psionica/en_us/templates/spell_grid.json +++ b/src/main/resources/assets/psi/patchouli_books/encyclopaedia_psionica/en_us/templates/spell_grid.json @@ -1,23 +1,9 @@ { "components": [ { - "type": "header", - "text": "#title", - "x": -1, - "y": -1 - }, - { - "type": "custom", + "type": "patchouli:custom", "class": "vazkii.psi.client.patchouli.SpellGridComponent", - "x": 5, - "y": 5, - "spell": "#spell", - "halfsize": "#halfsize" - }, - { - "type": "text", - "text": "#text", - "y": 100 + "spell": "#spell" } ] } diff --git a/src/main/resources/assets/psi/patchouli_books/encyclopaedia_psionica/en_us/templates/spellpiece_spotlight.json b/src/main/resources/assets/psi/patchouli_books/encyclopaedia_psionica/en_us/templates/spellpiece_spotlight.json index a2e1cee42..084e5a265 100644 --- a/src/main/resources/assets/psi/patchouli_books/encyclopaedia_psionica/en_us/templates/spellpiece_spotlight.json +++ b/src/main/resources/assets/psi/patchouli_books/encyclopaedia_psionica/en_us/templates/spellpiece_spotlight.json @@ -19,7 +19,7 @@ "texture_height": 128 }, { - "type": "custom", + "type": "patchouli:custom", "class": "vazkii.psi.client.patchouli.SpellPieceComponent", "x": 50, "y": 15, diff --git a/src/main/resources/assets/psi/textures/gui/entries/circle_bullet_20b_tower.png b/src/main/resources/assets/psi/textures/gui/entries/circle_bullet_20b_tower.png deleted file mode 100644 index ea6c3eb21..000000000 Binary files a/src/main/resources/assets/psi/textures/gui/entries/circle_bullet_20b_tower.png and /dev/null differ diff --git a/src/main/resources/assets/psi/textures/gui/entries/circle_bullet_circlesync.png b/src/main/resources/assets/psi/textures/gui/entries/circle_bullet_circlesync.png deleted file mode 100644 index 92ada6286..000000000 Binary files a/src/main/resources/assets/psi/textures/gui/entries/circle_bullet_circlesync.png and /dev/null differ diff --git a/src/main/resources/assets/psi/textures/gui/entries/eval_order_1.png b/src/main/resources/assets/psi/textures/gui/entries/eval_order_1.png deleted file mode 100644 index 7560ccdf0..000000000 Binary files a/src/main/resources/assets/psi/textures/gui/entries/eval_order_1.png and /dev/null differ diff --git a/src/main/resources/assets/psi/textures/gui/entries/eval_order_2.png b/src/main/resources/assets/psi/textures/gui/entries/eval_order_2.png deleted file mode 100644 index 1e3df5013..000000000 Binary files a/src/main/resources/assets/psi/textures/gui/entries/eval_order_2.png and /dev/null differ diff --git a/src/main/resources/assets/psi/textures/gui/entries/eval_order_3.png b/src/main/resources/assets/psi/textures/gui/entries/eval_order_3.png deleted file mode 100644 index 973fbaa97..000000000 Binary files a/src/main/resources/assets/psi/textures/gui/entries/eval_order_3.png and /dev/null differ diff --git a/src/main/resources/assets/psi/textures/gui/entries/tutorial_1_spell.png b/src/main/resources/assets/psi/textures/gui/entries/tutorial_1_spell.png deleted file mode 100644 index 41f5f45a3..000000000 Binary files a/src/main/resources/assets/psi/textures/gui/entries/tutorial_1_spell.png and /dev/null differ diff --git a/src/main/resources/assets/psi/textures/gui/entries/tutorial_3_chain.png b/src/main/resources/assets/psi/textures/gui/entries/tutorial_3_chain.png deleted file mode 100644 index 00cf0d4df..000000000 Binary files a/src/main/resources/assets/psi/textures/gui/entries/tutorial_3_chain.png and /dev/null differ diff --git a/src/main/resources/assets/psi/textures/gui/entries/tutorial_3_connector.png b/src/main/resources/assets/psi/textures/gui/entries/tutorial_3_connector.png deleted file mode 100644 index a1cfa401c..000000000 Binary files a/src/main/resources/assets/psi/textures/gui/entries/tutorial_3_connector.png and /dev/null differ diff --git a/src/main/resources/assets/psi/textures/gui/entries/tutorial_3_tooltip.png b/src/main/resources/assets/psi/textures/gui/entries/tutorial_3_tooltip.png deleted file mode 100644 index 8b39da53b..000000000 Binary files a/src/main/resources/assets/psi/textures/gui/entries/tutorial_3_tooltip.png and /dev/null differ diff --git a/src/main/resources/assets/psi/textures/gui/entries/tutorial_4_spell.png b/src/main/resources/assets/psi/textures/gui/entries/tutorial_4_spell.png deleted file mode 100644 index 5203d1192..000000000 Binary files a/src/main/resources/assets/psi/textures/gui/entries/tutorial_4_spell.png and /dev/null differ diff --git a/src/main/resources/assets/psi/textures/gui/entries/tutorial_5_stats.png b/src/main/resources/assets/psi/textures/gui/entries/tutorial_5_stats.png index 2f5c14533..29bb194b2 100644 Binary files a/src/main/resources/assets/psi/textures/gui/entries/tutorial_5_stats.png and b/src/main/resources/assets/psi/textures/gui/entries/tutorial_5_stats.png differ diff --git a/src/main/resources/assets/psi/textures/gui/entries/tutorial_6_spell.png b/src/main/resources/assets/psi/textures/gui/entries/tutorial_6_spell.png deleted file mode 100644 index 221b7119b..000000000 Binary files a/src/main/resources/assets/psi/textures/gui/entries/tutorial_6_spell.png and /dev/null differ diff --git a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/categories/basics.json b/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/categories/basics.json deleted file mode 100644 index e813f9ed6..000000000 --- a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/categories/basics.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "psi.book.category.basics", - "description": "psi.book.category.basics.desc", - "icon": "psi:textures/spell/trick_debug.png", - "sortnum": 0 -} \ No newline at end of file diff --git a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/categories/components.json b/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/categories/components.json deleted file mode 100644 index c8d143116..000000000 --- a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/categories/components.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "psi.book.category.components", - "description": "psi.book.category.components.desc", - "icon": "psi:cad_assembly_psimetal", - "sortnum": 1 -} \ No newline at end of file diff --git a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/categories/items.json b/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/categories/items.json deleted file mode 100644 index 4582ca812..000000000 --- a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/categories/items.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "psi.book.category.items", - "description": "psi.book.category.items.desc", - "icon": "psi:spell_bullet", - "sortnum": 2 -} \ No newline at end of file diff --git a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/categories/legacy.json b/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/categories/legacy.json deleted file mode 100644 index 1bdcdd6e2..000000000 --- a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/categories/legacy.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "psi.book.category.legacy", - "description": "psi.book.category.legacy.desc", - "icon": "psi:cad_assembly_gold", - "sortnum": 3 -} \ No newline at end of file diff --git a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/basics/cad_assembler.json b/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/basics/cad_assembler.json deleted file mode 100644 index ef0540ebe..000000000 --- a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/basics/cad_assembler.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "name": "psi.book.entry.cadAssembler", - "category": "basics", - "icon": "psi:cad_assembler", - "pages": [ - { - "type": "text", - "text": "psi.book.page.cadAssembler.0" - }, - { - "type": "crafting", - "text": "psi.book.page.cadAssembler.1", - "recipe": "psi:assembler" - }, - { - "type": "image", - "text": "psi.book.page.cadAssembler.2", - "images": [ - "psi:textures/gui/entries/assembler_build.png" - ], - "border": true - }, - { - "type": "text", - "text": "psi.book.page.cadAssembler.3" - }, - { - "type": "text", - "text": "psi.book.page.cadAssembler.4" - }, - { - "type": "image", - "text": "psi.book.page.cadAssembler.5", - "images": [ - "psi:textures/gui/entries/assembler_load.png" - ], - "border": true - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/basics/eval_order.json b/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/basics/eval_order.json deleted file mode 100644 index 0f85054bd..000000000 --- a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/basics/eval_order.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "name": "psi.book.entry.evalOrder", - "category": "basics", - "icon": "minecraft:air", - "pages": [ - { - "type": "text", - "text": "psi.book.page.evalOrder.0" - }, - { - "type": "text", - "text": "psi.book.page.evalOrder.1" - }, - { - "type": "text", - "text": "psi.book.page.evalOrder.2" - }, - { - "type": "image", - "text": "psi.book.page.evalOrder.3", - "images": [ - "psi:textures/gui/entries/eval_order_1.png" - ], - "border": false - }, - { - "type": "text", - "text": "psi.book.page.evalOrder.4" - }, - { - "type": "image", - "text": "psi.book.page.evalOrder.5", - "images": [ - "psi:textures/gui/entries/eval_order_2.png" - ], - "border": false - }, - { - "type": "text", - "text": "psi.book.page.evalOrder.6" - }, - { - "type": "image", - "text": "psi.book.page.evalOrder.7", - "images": [ - "psi:textures/gui/entries/eval_order_3.png" - ], - "border": false - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/basics/introduction.json b/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/basics/introduction.json deleted file mode 100644 index cb2da6e82..000000000 --- a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/basics/introduction.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "psi.book.entry.introduction", - "category": "basics", - "icon": "minecraft:air", - "priority": true, - "pages": [ - { - "type": "text", - "text": "psi.book.page.introduction.0" - }, - { - "type": "text", - "text": "psi.book.page.introduction.1" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/basics/spell_programmer.json b/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/basics/spell_programmer.json deleted file mode 100644 index 0257cbded..000000000 --- a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/basics/spell_programmer.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "psi.book.entry.spellProgrammer", - "category": "basics", - "icon": "psi:programmer", - "pages": [ - { - "type": "text", - "text": "psi.book.page.spellProgrammer.0" - }, - { - "type": "crafting", - "text": "psi.book.page.spellProgrammer.1", - "recipe": "psi:programmer" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/basics/tutorial_1.json b/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/basics/tutorial_1.json deleted file mode 100644 index 04f51e550..000000000 --- a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/basics/tutorial_1.json +++ /dev/null @@ -1,76 +0,0 @@ -{ - "name": "psi.book.entry.tutorial1", - "category": "basics", - "icon": "minecraft:air", - "priority": true, - "pages": [ - { - "type": "text", - "text": "psi.book.page.tutorial1.0" - }, - { - "type": "text", - "text": "psi.book.page.tutorial1.1" - }, - { - "type": "text", - "text": "psi.book.page.tutorial1.2" - }, - { - "type": "text", - "text": "psi.book.page.tutorial1.3" - }, - { - "type": "text", - "text": "psi.book.page.tutorial1.4" - }, - { - "type": "text", - "text": "psi.book.page.tutorial1.5" - }, - { - "type": "text", - "text": "psi.book.page.tutorial1.6" - }, - { - "type": "text", - "text": "psi.book.page.tutorial1.7" - }, - { - "type": "text", - "text": "psi.book.page.tutorial1.8" - }, - { - "type": "text", - "text": "psi.book.page.tutorial1.9" - }, - { - "type": "text", - "text": "psi.book.page.tutorial1.10" - }, - { - "type": "text", - "text": "psi.book.page.tutorial1.11" - }, - { - "type": "text", - "text": "psi.book.page.tutorial1.12" - }, - { - "type": "image", - "text": "psi.book.page.tutorial1.13", - "images": [ - "psi:textures/gui/entries/tutorial_1_spell.png" - ], - "border": true - }, - { - "type": "text", - "text": "psi.book.page.tutorial1.14" - }, - { - "type": "text", - "text": "psi.book.page.tutorial1.15" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/basics/tutorial_2.json b/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/basics/tutorial_2.json deleted file mode 100644 index 7428b888f..000000000 --- a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/basics/tutorial_2.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "name": "psi.book.entry.tutorial2", - "category": "basics", - "icon": "minecraft:air", - "priority": true, - "pages": [ - { - "type": "text", - "text": "psi.book.page.tutorial2.0" - }, - { - "type": "text", - "text": "psi.book.page.tutorial2.1" - }, - { - "type": "text", - "text": "psi.book.page.tutorial2.2" - }, - { - "type": "text", - "text": "psi.book.page.tutorial2.3" - }, - { - "type": "text", - "text": "psi.book.page.tutorial2.4" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/basics/tutorial_3.json b/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/basics/tutorial_3.json deleted file mode 100644 index 4f35d4dd9..000000000 --- a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/basics/tutorial_3.json +++ /dev/null @@ -1,76 +0,0 @@ -{ - "name": "psi.book.entry.tutorial3", - "category": "basics", - "icon": "minecraft:air", - "priority": true, - "pages": [ - { - "type": "text", - "text": "psi.book.page.tutorial3.0" - }, - { - "type": "text", - "text": "psi.book.page.tutorial3.1" - }, - { - "type": "text", - "text": "psi.book.page.tutorial3.2" - }, - { - "type": "image", - "text": "psi.book.page.tutorial3.3", - "images": [ - "psi:textures/gui/entries/tutorial_3_tooltip.png" - ], - "border": false - }, - { - "type": "text", - "text": "psi.book.page.tutorial3.4" - }, - { - "type": "text", - "text": "psi.book.page.tutorial3.5" - }, - { - "type": "text", - "text": "psi.book.page.tutorial3.6" - }, - { - "type": "text", - "text": "psi.book.page.tutorial3.7" - }, - { - "type": "text", - "text": "psi.book.page.tutorial3.8" - }, - { - "type": "text", - "text": "psi.book.page.tutorial3.9" - }, - { - "type": "text", - "text": "psi.book.page.tutorial3.10" - }, - { - "type": "image", - "text": "psi.book.page.tutorial3.11", - "images": [ - "psi:textures/gui/entries/tutorial_3_connector.png" - ], - "border": false - }, - { - "type": "text", - "text": "psi.book.page.tutorial3.12" - }, - { - "type": "image", - "text": "psi.book.page.tutorial3.13", - "images": [ - "psi:textures/gui/entries/tutorial_3_chain.png" - ], - "border": false - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/basics/tutorial_4.json b/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/basics/tutorial_4.json deleted file mode 100644 index fc2cc758d..000000000 --- a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/basics/tutorial_4.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "name": "psi.book.entry.tutorial4", - "category": "basics", - "icon": "minecraft:air", - "priority": true, - "pages": [ - { - "type": "text", - "text": "psi.book.page.tutorial4.0" - }, - { - "type": "text", - "text": "psi.book.page.tutorial4.1" - }, - { - "type": "text", - "text": "psi.book.page.tutorial4.2" - }, - { - "type": "text", - "text": "psi.book.page.tutorial4.3" - }, - { - "type": "text", - "text": "psi.book.page.tutorial4.4" - }, - { - "type": "text", - "text": "psi.book.page.tutorial4.5" - }, - { - "type": "image", - "text": "psi.book.page.tutorial4.6", - "images": [ - "psi:textures/gui/entries/tutorial_4_spell.png" - ], - "border": false - }, - { - "type": "text", - "text": "psi.book.page.tutorial4.7" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/basics/tutorial_5.json b/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/basics/tutorial_5.json deleted file mode 100644 index 1eb5794ec..000000000 --- a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/basics/tutorial_5.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "name": "psi.book.entry.tutorial5", - "category": "basics", - "icon": "minecraft:air", - "priority": true, - "pages": [ - { - "type": "text", - "text": "psi.book.page.tutorial5.0" - }, - { - "type": "image", - "text": "psi.book.page.tutorial5.1", - "images": [ - "psi:textures/gui/entries/tutorial_5_stats.png" - ], - "border": true - }, - { - "type": "text", - "title": "psi.book.subsec.tutorial5.2", - "text": "psi.book.page.tutorial5.2", - "anchor": "complexity" - }, - { - "type": "text", - "title": "psi.book.subsec.tutorial5.3", - "text": "psi.book.page.tutorial5.3", - "anchor": "potency" - }, - { - "type": "text", - "title": "psi.book.subsec.tutorial5.4", - "text": "psi.book.page.tutorial5.4", - "anchor": "cost" - }, - { - "type": "text", - "text": "psi.book.page.tutorial5.5" - }, - { - "type": "text", - "text": "psi.book.page.tutorial5.6" - }, - { - "type": "text", - "text": "psi.book.page.tutorial5.7" - }, - { - "type": "text", - "title": "psi.book.subsec.tutorial5.8", - "text": "psi.book.page.tutorial5.8", - "anchor": "projection" - }, - { - "type": "text", - "title": "psi.book.subsec.tutorial5.9", - "text": "psi.book.page.tutorial5.9", - "anchor": "bandwidth" - }, - { - "type": "text", - "text": "psi.book.page.tutorial5.10" - }, - { - "type": "text", - "text": "psi.book.page.tutorial5.11" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/basics/tutorial_6.json b/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/basics/tutorial_6.json deleted file mode 100644 index 981b6c5ab..000000000 --- a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/basics/tutorial_6.json +++ /dev/null @@ -1,72 +0,0 @@ -{ - "name": "psi.book.entry.tutorial6", - "category": "basics", - "icon": "minecraft:air", - "priority": true, - "pages": [ - { - "type": "text", - "text": "psi.book.page.tutorial6.0" - }, - { - "type": "text", - "text": "psi.book.page.tutorial6.1" - }, - { - "type": "text", - "text": "psi.book.page.tutorial6.2" - }, - { - "type": "text", - "text": "psi.book.page.tutorial6.3" - }, - { - "type": "text", - "text": "psi.book.page.tutorial6.4" - }, - { - "type": "text", - "text": "psi.book.page.tutorial6.5" - }, - { - "type": "text", - "text": "psi.book.page.tutorial6.6" - }, - { - "type": "text", - "text": "psi.book.page.tutorial6.7" - }, - { - "type": "text", - "text": "psi.book.page.tutorial6.8" - }, - { - "type": "text", - "text": "psi.book.page.tutorial6.9" - }, - { - "type": "image", - "text": "psi.book.page.tutorial6.10", - "images": [ - "psi:textures/gui/entries/tutorial_6_spell.png" - ], - "border": false - }, - { - "type": "text", - "text": "psi.book.page.tutorial6.11" - }, - { - "type": "text", - "text": "psi.book.page.tutorial6.12" - }, - { - "type": "text", - "text": "psi.book.page.tutorial6.13" - }, - { - "type": "text", - "text": "psi.book.page.tutorial6.14" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/basics/vector_primer.json b/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/basics/vector_primer.json deleted file mode 100644 index 0f16bbfb4..000000000 --- a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/basics/vector_primer.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "name": "psi.book.entry.vectorPrimer", - "category": "basics", - "icon": "psi:textures/spell/operator_vector_construct.png", - "pages": [ - { - "type": "link", - "text": "psi.book.page.vectorPrimer.0", - "url": "https://www.youtube.com/watch?v=fNk_zzaMoSs", - "link_text": "3Blue1Brown" - }, - { - "type": "text", - "text": "psi.book.page.vectorPrimer.1" - }, - { - "type": "text", - "text": "psi.book.page.vectorPrimer.2" - }, - { - "type": "text", - "text": "psi.book.page.vectorPrimer.3" - }, - { - "type": "text", - "text": "psi.book.page.vectorPrimer.4" - }, - { - "type": "text", - "text": "psi.book.page.vectorPrimer.5" - }, - { - "type": "text", - "text": "psi.book.page.vectorPrimer.6" - }, - { - "type": "text", - "text": "psi.book.page.vectorPrimer.7" - }, - { - "type": "text", - "text": "psi.book.page.vectorPrimer.8" - }, - { - "type": "text", - "text": "psi.book.page.vectorPrimer.9" - }, - { - "type": "text", - "text": "psi.book.page.vectorPrimer.10" - }, - { - "type": "text", - "text": "psi.book.page.vectorPrimer.11" - }, - { - "type": "text", - "text": "psi.book.page.vectorPrimer.12" - }, - { - "type": "text", - "text": "psi.book.page.vectorPrimer.13" - }, - { - "type": "text", - "text": "psi.book.page.vectorPrimer.14" - }, - { - "type": "text", - "text": "psi.book.page.vectorPrimer.15" - }, - { - "type": "text", - "text": "psi.book.page.vectorPrimer.16" - }, - { - "type": "text", - "text": "psi.book.page.vectorPrimer.17" - }, - { - "type": "text", - "text": "psi.book.page.vectorPrimer.18" - }, - { - "type": "text", - "text": "psi.book.page.vectorPrimer.19" - }, - { - "type": "text", - "text": "psi.book.page.vectorPrimer.20" - }, - { - "type": "text", - "text": "psi.book.page.vectorPrimer.21" - }, - { - "type": "text", - "text": "psi.book.page.vectorPrimer.22", - "anchor": "ops" - }, - { - "type": "text", - "text": "psi.book.page.vectorPrimer.23" - }, - { - "type": "text", - "text": "psi.book.page.vectorPrimer.24" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/components/assembly.json b/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/components/assembly.json deleted file mode 100644 index 00bfa56f7..000000000 --- a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/components/assembly.json +++ /dev/null @@ -1,75 +0,0 @@ -{ - "name": "psi.book.entry.assembly", - "category": "components", - "icon": "psi:cad_assembly_iron", - "pages": [ - { - "type": "text", - "text": "psi.book.page.assembly.0" - }, - { - "type": "text", - "text": "psi.book.page.assembly.1" - }, - { - "type": "spotlight", - "text": "psi.book.page.assembly.2", - "item": "psi:cad_assembly_iron", - "link_recipe": false, - "anchor": "iron" - }, - { - "type": "crafting", - "text": "psi.book.page.assembly.3", - "recipe": "psi:cad_assembly_iron" - }, - { - "type": "spotlight", - "text": "psi.book.page.assembly.4", - "item": "psi:cad_assembly_gold", - "link_recipe": false, - "anchor": "gold" - }, - { - "type": "crafting", - "text": "psi.book.page.assembly.5", - "recipe": "psi:cad_assembly_gold" - }, - { - "type": "spotlight", - "text": "psi.book.page.assembly.6", - "item": "psi:cad_assembly_psimetal", - "link_recipe": false, - "anchor": "psimetal" - }, - { - "type": "crafting", - "text": "psi.book.page.assembly.7", - "recipe": "psi:cad_assembly_psimetal" - }, - { - "type": "spotlight", - "text": "psi.book.page.assembly.8", - "item": "psi:cad_assembly_ebony_psimetal", - "link_recipe": false, - "anchor": "ebony" - }, - { - "type": "crafting", - "text": "psi.book.page.assembly.9", - "recipe": "psi:cad_assembly_ebony" - }, - { - "type": "spotlight", - "text": "psi.book.page.assembly.10", - "item": "psi:cad_assembly_ivory_psimetal", - "link_recipe": false, - "anchor": "ivory" - }, - { - "type": "crafting", - "text": "psi.book.page.assembly.11", - "recipe": "psi:cad_assembly_ivory" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/components/battery.json b/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/components/battery.json deleted file mode 100644 index 46208037b..000000000 --- a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/components/battery.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "name": "psi.book.entry.battery", - "category": "components", - "icon": "psi:cad_battery_basic", - "pages": [ - { - "type": "text", - "text": "psi.book.page.battery.0" - }, - { - "type": "text", - "text": "psi.book.page.battery.1" - }, - { - "type": "crafting", - "text": "psi.book.page.battery.2", - "recipe": "psi:cad_battery_basic", - "anchor": "basic" - }, - { - "type": "crafting", - "text": "psi.book.page.battery.3", - "recipe": "psi:cad_battery_extended", - "anchor": "extended" - }, - { - "type": "crafting", - "text": "psi.book.page.battery.4", - "recipe": "psi:cad_battery_ultradense", - "anchor": "ultradense" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/components/colorizer.json b/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/components/colorizer.json deleted file mode 100644 index 6c1b0b915..000000000 --- a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/components/colorizer.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "psi.book.entry.colorizer", - "category": "components", - "icon": "psi:cad_colorizer_psi", - "pages": [ - { - "type": "text", - "text": "psi.book.page.colorizer.0" - }, - { - "type": "text", - "text": "psi.book.page.colorizer.1" - }, - { - "type": "text", - "text": "psi.book.page.colorizer.2" - }, - { - "type": "crafting_multi", - "text": "psi.book.page.colorizer.3", - "recipes": "psi:cad_colorizer_psi;psi:cad_colorizer_rainbow;psi:cad_colorizer_empty;psi:cad_colorizer_white;psi:cad_colorizer_orange;psi:cad_colorizer_magenta;psi:cad_colorizer_light_blue;psi:cad_colorizer_yellow;psi:cad_colorizer_lime;psi:cad_colorizer_pink;psi:cad_colorizer_gray;psi:cad_colorizer_light_gray;psi:cad_colorizer_cyan;psi:cad_colorizer_purple;psi:cad_colorizer_blue;psi:cad_colorizer_brown;psi:cad_colorizer_green;psi:cad_colorizer_red;psi:cad_colorizer_black" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/components/core.json b/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/components/core.json deleted file mode 100644 index b03503f3d..000000000 --- a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/components/core.json +++ /dev/null @@ -1,75 +0,0 @@ -{ - "name": "psi.book.entry.core", - "category": "components", - "icon": "psi:cad_core_basic", - "pages": [ - { - "type": "text", - "text": "psi.book.page.core.0" - }, - { - "type": "text", - "text": "psi.book.page.core.1" - }, - { - "type": "spotlight", - "text": "psi.book.page.core.2", - "item": "psi:cad_core_basic", - "link_recipe": false, - "anchor": "basic" - }, - { - "type": "crafting", - "text": "psi.book.page.core.3", - "recipe": "psi:cad_core_basic" - }, - { - "type": "spotlight", - "text": "psi.book.page.core.4", - "item": "psi:cad_core_overclocked", - "link_recipe": false, - "anchor": "overclocked" - }, - { - "type": "crafting", - "text": "psi.book.page.core.5", - "recipe": "psi:cad_core_overclocked" - }, - { - "type": "spotlight", - "text": "psi.book.page.core.6", - "item": "psi:cad_core_conductive", - "link_recipe": false, - "anchor": "conductive" - }, - { - "type": "crafting", - "text": "psi.book.page.core.7", - "recipe": "psi:cad_core_conductive" - }, - { - "type": "spotlight", - "text": "psi.book.page.core.8", - "item": "psi:cad_core_hyperclocked", - "link_recipe": false, - "anchor": "hyperclocked" - }, - { - "type": "crafting", - "text": "psi.book.page.core.9", - "recipe": "psi:cad_core_hyperclocked" - }, - { - "type": "spotlight", - "text": "psi.book.page.core.10", - "item": "psi:cad_core_radiative", - "link_recipe": false, - "anchor": "radiative" - }, - { - "type": "crafting", - "text": "psi.book.page.core.11", - "recipe": "psi:cad_core_radiative" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/components/ebony_ivory.json b/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/components/ebony_ivory.json deleted file mode 100644 index f4fb91cfb..000000000 --- a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/components/ebony_ivory.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "name": "psi.book.entry.ebonyIvory", - "category": "components", - "icon": "psi:ivory_substance", - "pages": [ - { - "type": "text", - "text": "psi.book.page.ebonyIvory.0" - }, - { - "type": "text", - "text": "psi.book.page.ebonyIvory.1" - }, - { - "type": "spotlight", - "text": "psi.book.page.ebonyIvory.2", - "item": "psi:ebony_substance", - "link_recipe": true - }, - { - "type": "spotlight", - "text": "psi.book.page.ebonyIvory.3", - "item": "psi:ivory_substance", - "link_recipe": true - }, - { - "type": "crafting", - "text": "psi.book.page.ebonyIvory.4", - "recipe": "psi:ebony_psimetal" - }, - { - "type": "crafting", - "text": "psi.book.page.ebonyIvory.5", - "recipe": "psi:ivory_psimetal" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/components/psidust.json b/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/components/psidust.json deleted file mode 100644 index 5424174e7..000000000 --- a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/components/psidust.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "psi.book.entry.psidust", - "category": "components", - "icon": "psi:psidust", - "priority": true, - "pages": [ - { - "type": "text", - "text": "psi.book.page.psidust.0" - }, - { - "type": "spotlight", - "text": "psi.book.page.psidust.1", - "item": "psi:psidust", - "link_recipe": true - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/components/psigem.json b/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/components/psigem.json deleted file mode 100644 index 821dfbff8..000000000 --- a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/components/psigem.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "psi.book.entry.psigem", - "category": "components", - "icon": "psi:psigem", - "priority": true, - "pages": [ - { - "type": "text", - "text": "psi.book.page.psigem.0" - }, - { - "type": "spotlight", - "text": "psi.book.page.psigem.1", - "item": "psi:psigem", - "link_recipe": true - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/components/psimetal.json b/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/components/psimetal.json deleted file mode 100644 index 2bc24ef7e..000000000 --- a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/components/psimetal.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "psi.book.entry.psimetal", - "category": "components", - "icon": "psi:psimetal", - "priority": true, - "pages": [ - { - "type": "text", - "text": "psi.book.page.psimetal.0" - }, - { - "type": "spotlight", - "text": "psi.book.page.psimetal.1", - "item": "psi:psimetal", - "link_recipe": true - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/components/socket.json b/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/components/socket.json deleted file mode 100644 index 17bb13fee..000000000 --- a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/components/socket.json +++ /dev/null @@ -1,75 +0,0 @@ -{ - "name": "psi.book.entry.socket", - "category": "components", - "icon": "psi:cad_socket_basic", - "pages": [ - { - "type": "text", - "text": "psi.book.page.socket.0" - }, - { - "type": "text", - "text": "psi.book.page.socket.1" - }, - { - "type": "spotlight", - "text": "psi.book.page.socket.2", - "item": "psi:cad_socket_basic", - "link_recipe": false, - "anchor": "basic" - }, - { - "type": "crafting", - "text": "psi.book.page.socket.3", - "recipe": "psi:cad_socket_basic" - }, - { - "type": "spotlight", - "text": "psi.book.page.socket.4", - "item": "psi:cad_socket_signaling", - "link_recipe": false, - "anchor": "signaling" - }, - { - "type": "crafting", - "text": "psi.book.page.socket.5", - "recipe": "psi:cad_socket_signaling" - }, - { - "type": "spotlight", - "text": "psi.book.page.socket.6", - "item": "psi:cad_socket_large", - "link_recipe": false, - "anchor": "large" - }, - { - "type": "crafting", - "text": "psi.book.page.socket.7", - "recipe": "psi:cad_socket_large" - }, - { - "type": "spotlight", - "text": "psi.book.page.socket.8", - "item": "psi:cad_socket_transmissive", - "link_recipe": false, - "anchor": "transmissive" - }, - { - "type": "crafting", - "text": "psi.book.page.socket.9", - "recipe": "psi:cad_socket_transmissive" - }, - { - "type": "spotlight", - "text": "psi.book.page.socket.10", - "item": "psi:cad_socket_huge", - "link_recipe": false, - "anchor": "huge" - }, - { - "type": "crafting", - "text": "psi.book.page.socket.11", - "recipe": "psi:cad_socket_huge" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/items/basic_bullet.json b/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/items/basic_bullet.json deleted file mode 100644 index 0af30fe19..000000000 --- a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/items/basic_bullet.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "psi.book.entry.basicBullet", - "category": "items", - "icon": "psi:spell_bullet", - "pages": [ - { - "type": "text", - "text": "psi.book.page.basicBullet.0" - }, - { - "type": "crafting", - "text": "psi.book.page.basicBullet.1", - "recipe": "psi:spell_bullet_basic" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/items/charge_bullet.json b/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/items/charge_bullet.json deleted file mode 100644 index 88b415a63..000000000 --- a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/items/charge_bullet.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "psi.book.entry.chargeBullet", - "category": "items", - "icon": "psi:spell_bullet_charge", - "pages": [ - { - "type": "text", - "text": "psi.book.page.chargeBullet.0" - }, - { - "type": "crafting", - "text": "psi.book.page.chargeBullet.1", - "recipe": "psi:spell_bullet_charge" - }, - { - "type": "text", - "text": "psi.book.page.chargeBullet.2" - }, - { - "type": "text", - "text": "psi.book.page.chargeBullet.3" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/items/circle_bullet.json b/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/items/circle_bullet.json deleted file mode 100644 index d4d00cb81..000000000 --- a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/items/circle_bullet.json +++ /dev/null @@ -1,64 +0,0 @@ -{ - "name": "psi.book.entry.circleBullet", - "category": "items", - "icon": "psi:spell_bullet_circle", - "pages": [ - { - "type": "text", - "text": "psi.book.page.circleBullet.0" - }, - { - "type": "crafting", - "text": "psi.book.page.circleBullet.1", - "recipe": "psi:spell_bullet_circle" - }, - { - "type": "text", - "text": "psi.book.page.circleBullet.2" - }, - { - "type": "text", - "text": "psi.book.page.circleBullet.3" - }, - { - "type": "text", - "text": "psi.book.page.circleBullet.4" - }, - { - "type": "text", - "text": "psi.book.page.circleBullet.5" - }, - { - "type": "text", - "title": "psi.book.subsec.circleBullet.6", - "text": "psi.book.page.circleBullet.6", - "anchor": "circlesync" - }, - { - "type": "image", - "text": "psi.book.page.circleBullet.7", - "images": [ - "psi:textures/gui/entries/circle_bullet_circlesync.png" - ], - "border": false - }, - { - "type": "text", - "title": "psi.book.subsec.circleBullet.8", - "text": "psi.book.page.circleBullet.8", - "anchor": "20b_tower" - }, - { - "type": "text", - "text": "psi.book.page.circleBullet.9" - }, - { - "type": "image", - "text": "psi.book.page.circleBullet.10", - "images": [ - "psi:textures/gui/entries/circle_bullet_20b_tower.png" - ], - "border": false - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/items/detonator.json b/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/items/detonator.json deleted file mode 100644 index b8ff9926c..000000000 --- a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/items/detonator.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "psi.book.entry.detonator", - "category": "items", - "icon": "psi:detonator", - "pages": [ - { - "type": "text", - "text": "psi.book.page.detonator.0" - }, - { - "type": "crafting", - "text": "psi.book.page.detonator.1", - "recipe": "psi:detonator" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/items/exosuit.json b/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/items/exosuit.json deleted file mode 100644 index 26e839e9b..000000000 --- a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/items/exosuit.json +++ /dev/null @@ -1,83 +0,0 @@ -{ - "name": "psi.book.entry.exosuit", - "category": "items", - "icon": "psi:exosuit_controller", - "pages": [ - { - "type": "text", - "text": "psi.book.page.exosuit.0" - }, - { - "type": "text", - "text": "psi.book.page.exosuit.1" - }, - { - "type": "spotlight", - "text": "psi.book.page.exosuit.2", - "item": "psi:exosuit_controller", - "link_recipe": false, - "anchor": "controller" - }, - { - "type": "crafting", - "text": "psi.book.page.exosuit.3", - "recipe": "psi:exosuit_controller" - }, - { - "type": "text", - "text": "psi.book.page.exosuit.4" - }, - { - "type": "text", - "text": "psi.book.page.exosuit.5" - }, - { - "type": "spotlight", - "text": "psi.book.page.exosuit.6", - "item": "psi:psimetal_exosuit_helmet", - "link_recipe": false, - "anchor": "helmet" - }, - { - "type": "crafting", - "text": "psi.book.page.exosuit.7", - "recipe": "psi:psimetal_exosuit_helmet" - }, - { - "type": "spotlight", - "text": "psi.book.page.exosuit.8", - "item": "psi:psimetal_exosuit_chestplate", - "link_recipe": false, - "anchor": "chestplate" - }, - { - "type": "crafting", - "text": "psi.book.page.exosuit.9", - "recipe": "psi:psimetal_exosuit_chestplate" - }, - { - "type": "spotlight", - "text": "psi.book.page.exosuit.10", - "item": "psi:psimetal_exosuit_leggings", - "link_recipe": false, - "anchor": "leggings" - }, - { - "type": "crafting", - "text": "psi.book.page.exosuit.11", - "recipe": "psi:psimetal_exosuit_leggings" - }, - { - "type": "spotlight", - "text": "psi.book.page.exosuit.12", - "item": "psi:psimetal_exosuit_boots", - "link_recipe": false, - "anchor": "boots" - }, - { - "type": "crafting", - "text": "psi.book.page.exosuit.13", - "recipe": "psi:psimetal_exosuit_boots" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/items/exosuit_sensor.json b/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/items/exosuit_sensor.json deleted file mode 100644 index 85b10f8da..000000000 --- a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/items/exosuit_sensor.json +++ /dev/null @@ -1,75 +0,0 @@ -{ - "name": "psi.book.entry.exosuitSensor", - "category": "items", - "icon": "psi:exosuit_sensor_light", - "pages": [ - { - "type": "text", - "text": "psi.book.page.exosuitSensor.0" - }, - { - "type": "text", - "text": "psi.book.page.exosuitSensor.1" - }, - { - "type": "spotlight", - "text": "psi.book.page.exosuitSensor.2", - "item": "psi:exosuit_sensor_light", - "link_recipe": false, - "anchor": "light" - }, - { - "type": "crafting", - "text": "psi.book.page.exosuitSensor.3", - "recipe": "psi:exosuit_sensor_light" - }, - { - "type": "spotlight", - "text": "psi.book.page.exosuitSensor.4", - "item": "psi:exosuit_sensor_heat", - "link_recipe": false, - "anchor": "heat" - }, - { - "type": "crafting", - "text": "psi.book.page.exosuitSensor.5", - "recipe": "psi:exosuit_sensor_heat" - }, - { - "type": "spotlight", - "text": "psi.book.page.exosuitSensor.6", - "item": "psi:exosuit_sensor_stress", - "link_recipe": false, - "anchor": "stress" - }, - { - "type": "crafting", - "text": "psi.book.page.exosuitSensor.7", - "recipe": "psi:exosuit_sensor_stress" - }, - { - "type": "spotlight", - "text": "psi.book.page.exosuitSensor.8", - "item": "psi:exosuit_sensor_water", - "link_recipe": false, - "anchor": "water" - }, - { - "type": "crafting", - "text": "psi.book.page.exosuitSensor.9", - "recipe": "psi:exosuit_sensor_water" - }, - { - "type": "spotlight", - "text": "psi.book.page.exosuitSensor.10", - "item": "psi:exosuit_sensor_trigger", - "link_recipe": false, - "anchor": "trigger" - }, - { - "type": "crafting", - "text": "psi.book.page.exosuitSensor.11", - "recipe": "psi:exosuit_sensor_trigger" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/items/grenade_bullet.json b/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/items/grenade_bullet.json deleted file mode 100644 index bd09b2948..000000000 --- a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/items/grenade_bullet.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "psi.book.entry.grenadeBullet", - "category": "items", - "icon": "psi:spell_bullet_grenade", - "pages": [ - { - "type": "text", - "text": "psi.book.page.grenadeBullet.0" - }, - { - "type": "crafting", - "text": "psi.book.page.grenadeBullet.1", - "recipe": "psi:spell_bullet_grenade" - }, - { - "type": "text", - "text": "psi.book.page.grenadeBullet.2" - }, - { - "type": "text", - "text": "psi.book.page.grenadeBullet.3" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/items/loopcast_bullet.json b/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/items/loopcast_bullet.json deleted file mode 100644 index 425beacc7..000000000 --- a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/items/loopcast_bullet.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "name": "psi.book.entry.loopcastBullet", - "category": "items", - "icon": "psi:spell_bullet_loop", - "pages": [ - { - "type": "text", - "text": "psi.book.page.loopcastBullet.0" - }, - { - "type": "crafting", - "text": "psi.book.page.loopcastBullet.1", - "recipe": "psi:spell_bullet_loopcast" - }, - { - "type": "text", - "text": "psi.book.page.loopcastBullet.2" - }, - { - "type": "text", - "text": "psi.book.page.loopcastBullet.3" - }, - { - "type": "text", - "text": "psi.book.page.loopcastBullet.4" - }, - { - "type": "text", - "text": "psi.book.page.loopcastBullet.5" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/items/mine_bullet.json b/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/items/mine_bullet.json deleted file mode 100644 index f4c6b0037..000000000 --- a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/items/mine_bullet.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "psi.book.entry.mineBullet", - "category": "items", - "icon": "psi:spell_bullet_mine", - "pages": [ - { - "type": "text", - "text": "psi.book.page.mineBullet.0" - }, - { - "type": "crafting", - "text": "psi.book.page.mineBullet.1", - "recipe": "psi:spell_bullet_mine" - }, - { - "type": "text", - "text": "psi.book.page.mineBullet.2" - }, - { - "type": "text", - "text": "psi.book.page.mineBullet.3" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/items/projectile_bullet.json b/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/items/projectile_bullet.json deleted file mode 100644 index 52b6c671f..000000000 --- a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/items/projectile_bullet.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "psi.book.entry.projectileBullet", - "category": "items", - "icon": "psi:spell_bullet_projectile", - "pages": [ - { - "type": "text", - "text": "psi.book.page.projectileBullet.0" - }, - { - "type": "crafting", - "text": "psi.book.page.projectileBullet.1", - "recipe": "psi:spell_bullet_projectile" - }, - { - "type": "text", - "text": "psi.book.page.projectileBullet.2" - }, - { - "type": "text", - "text": "psi.book.page.projectileBullet.3" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/items/spell_bullet.json b/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/items/spell_bullet.json deleted file mode 100644 index 1ad6771e3..000000000 --- a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/items/spell_bullet.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "name": "psi.book.entry.spellBullet", - "category": "items", - "icon": "minecraft:air", - "priority": true, - "pages": [ - { - "type": "text", - "text": "psi.book.page.spellBullet.0" - }, - { - "type": "relations", - "text": "psi.book.page.spellBullet.1", - "entries": [ - "items/spell_bullet", - "items/projectile_bullet", - "items/loopcast_bullet", - "items/circle_bullet", - "items/grenade_bullet", - "items/charge_bullet", - "items/mine_bullet" - ], - "title": "Types of Bullets" - }, - { - "type": "text", - "text": "psi.book.page.spellBullet.2" - }, - { - "type": "text", - "text": "psi.book.page.spellBullet.3" - }, - { - "type": "text", - "text": "psi.book.page.spellBullet.4" - }, - { - "type": "text", - "text": "psi.book.page.spellBullet.5" - }, - { - "type": "text", - "text": "psi.book.page.spellBullet.6" - }, - { - "type": "text", - "text": "psi.book.page.spellBullet.7" - }, - { - "type": "text", - "text": "psi.book.page.spellBullet.8", - "anchor": "focal_point" - }, - { - "type": "text", - "text": "psi.book.page.spellBullet.9" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/items/spell_drive.json b/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/items/spell_drive.json deleted file mode 100644 index 3b367d23b..000000000 --- a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/items/spell_drive.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "name": "psi.book.entry.spellDrive", - "category": "items", - "icon": "psi:spell_drive", - "priority": true, - "pages": [ - { - "type": "text", - "text": "psi.book.page.spellDrive.0" - }, - { - "type": "crafting", - "text": "psi.book.page.spellDrive.1", - "recipe": "psi:spell_drive" - }, - { - "type": "text", - "text": "psi.book.page.spellDrive.2" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/items/tools.json b/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/items/tools.json deleted file mode 100644 index 1293b2daf..000000000 --- a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/items/tools.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "name": "psi.book.entry.tools", - "category": "items", - "icon": "psi:psimetal_pickaxe", - "pages": [ - { - "type": "text", - "text": "psi.book.page.tools.0" - }, - { - "type": "crafting_multi", - "text": "psi.book.page.tools.1", - "recipes": "psi:psimetal_sword;psi:psimetal_shovel;psi:psimetal_pickaxe;psi:psimetal_axe" - }, - { - "type": "text", - "text": "psi.book.page.tools.2" - }, - { - "type": "text", - "text": "psi.book.page.tools.3" - }, - { - "type": "text", - "text": "psi.book.page.tools.4" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/items/vector_ruler.json b/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/items/vector_ruler.json deleted file mode 100644 index 04d908e1d..000000000 --- a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/items/vector_ruler.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "psi.book.entry.vectorRuler", - "category": "items", - "icon": "psi:vector_ruler", - "priority": true, - "pages": [ - { - "type": "text", - "text": "psi.book.page.vectorRuler.0" - }, - { - "type": "crafting", - "text": "psi.book.page.vectorRuler.1", - "recipe": "psi:vector_ruler" - }, - { - "type": "text", - "text": "psi.book.page.vectorRuler.2" - }, - { - "type": "text", - "text": "psi.book.page.vectorRuler.3" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/legacy/block_conjuration.json b/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/legacy/block_conjuration.json deleted file mode 100644 index 7bebec6a6..000000000 --- a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/legacy/block_conjuration.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "psi.book.entry.blockConjuration", - "category": "legacy", - "icon": "psi:textures/spell/trick_conjure_block.png", - "pages": [ - { - "type": "text", - "text": "psi.book.page.blockConjuration.0" - }, - { - "type": "text", - "text": "psi.book.page.blockConjuration.1" - }, - { - "type": "text", - "text": "psi.book.page.blockConjuration.2" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/legacy/block_movement.json b/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/legacy/block_movement.json deleted file mode 100644 index 91ed43a57..000000000 --- a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/legacy/block_movement.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "psi.book.entry.blockMovement", - "category": "legacy", - "icon": "psi:textures/spell/trick_move_block.png", - "pages": [ - { - "type": "text", - "text": "psi.book.page.blockMovement.0" - }, - { - "type": "text", - "text": "psi.book.page.blockMovement.1" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/legacy/blockworks.json b/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/legacy/blockworks.json deleted file mode 100644 index b4e5b01ce..000000000 --- a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/legacy/blockworks.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "name": "psi.book.entry.blockworks", - "category": "legacy", - "icon": "psi:textures/spell/trick_break_in_sequence.png", - "pages": [ - { - "type": "text", - "text": "psi.book.page.blockworks.0" - }, - { - "type": "text", - "text": "psi.book.page.blockworks.1" - }, - { - "type": "text", - "text": "psi.book.page.blockworks.2" - }, - { - "type": "text", - "text": "psi.book.page.blockworks.3" - }, - { - "type": "text", - "text": "psi.book.page.blockworks.4" - }, - { - "type": "text", - "text": "psi.book.page.blockworks.5" - }, - { - "type": "text", - "text": "psi.book.page.blockworks.6" - }, - { - "type": "text", - "text": "psi.book.page.blockworks.7" - }, - { - "type": "text", - "text": "psi.book.page.blockworks.8" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/legacy/detection_dynamics.json b/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/legacy/detection_dynamics.json deleted file mode 100644 index cd7e26990..000000000 --- a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/legacy/detection_dynamics.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "name": "psi.book.entry.detectionDynamics", - "category": "legacy", - "icon": "psi:textures/spell/trick_switch_target_slot.png", - "pages": [ - { - "type": "text", - "text": "psi.book.page.detectionDynamics.0" - }, - { - "type": "text", - "text": "psi.book.page.detectionDynamics.1" - }, - { - "type": "text", - "text": "psi.book.page.detectionDynamics.2" - }, - { - "type": "text", - "text": "psi.book.page.detectionDynamics.3" - }, - { - "type": "text", - "text": "psi.book.page.detectionDynamics.4" - }, - { - "type": "text", - "text": "psi.book.page.detectionDynamics.5" - }, - { - "type": "text", - "text": "psi.book.page.detectionDynamics.6" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/legacy/eidos_manipulation.json b/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/legacy/eidos_manipulation.json deleted file mode 100644 index c3eab8210..000000000 --- a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/legacy/eidos_manipulation.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "psi.book.entry.eidosManipulation", - "category": "legacy", - "icon": "psi:textures/spell/trick_eidos_reversal.png", - "pages": [ - { - "type": "text", - "text": "psi.book.page.eidosManipulation.0" - }, - { - "type": "text", - "text": "psi.book.page.eidosManipulation.1" - }, - { - "type": "text", - "text": "psi.book.page.eidosManipulation.2" - }, - { - "type": "text", - "text": "psi.book.page.eidosManipulation.3" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/legacy/elemental_arts.json b/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/legacy/elemental_arts.json deleted file mode 100644 index 560e2eef0..000000000 --- a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/legacy/elemental_arts.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "psi.book.entry.elementalArts", - "category": "legacy", - "icon": "psi:textures/spell/trick_smite.png", - "pages": [ - { - "type": "text", - "text": "psi.book.page.elementalArts.0" - }, - { - "type": "text", - "text": "psi.book.page.elementalArts.1" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/legacy/entities101.json b/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/legacy/entities101.json deleted file mode 100644 index eb336f5c5..000000000 --- a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/legacy/entities101.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "psi.book.entry.entities101", - "category": "legacy", - "icon": "psi:textures/spell/operator_closest_to_point.png", - "pages": [ - { - "type": "text", - "text": "psi.book.page.entities101.0" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/legacy/flow_control.json b/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/legacy/flow_control.json deleted file mode 100644 index 759abb1e4..000000000 --- a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/legacy/flow_control.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "name": "psi.book.entry.flowControl", - "category": "legacy", - "icon": "psi:textures/spell/trick_delay.png", - "pages": [ - { - "type": "text", - "text": "psi.book.page.flowControl.0" - }, - { - "type": "text", - "text": "psi.book.page.flowControl.1" - }, - { - "type": "text", - "text": "psi.book.page.flowControl.2" - }, - { - "type": "text", - "text": "psi.book.page.flowControl.3" - }, - { - "type": "text", - "text": "psi.book.page.flowControl.4" - }, - { - "type": "text", - "text": "psi.book.page.flowControl.5" - }, - { - "type": "text", - "text": "psi.book.page.flowControl.6" - }, - { - "type": "text", - "text": "psi.book.page.flowControl.7" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/legacy/memory_management.json b/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/legacy/memory_management.json deleted file mode 100644 index 94f62ab8b..000000000 --- a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/legacy/memory_management.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "psi.book.entry.memoryManagement", - "category": "legacy", - "icon": "psi:textures/spell/trick_save_vector.png", - "pages": [ - { - "type": "text", - "text": "psi.book.page.memoryManagement.0" - }, - { - "type": "text", - "text": "psi.book.page.memoryManagement.1" - }, - { - "type": "text", - "text": "psi.book.page.memoryManagement.2" - }, - { - "type": "text", - "text": "psi.book.page.memoryManagement.3" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/legacy/movement_advances.json b/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/legacy/movement_advances.json deleted file mode 100644 index 9e3c80f8c..000000000 --- a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/legacy/movement_advances.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "psi.book.entry.movementAdvances", - "category": "legacy", - "icon": "psi:textures/spell/trick_blink.png", - "pages": [ - { - "type": "text", - "text": "psi.book.page.movementAdvances.0" - }, - { - "type": "text", - "text": "psi.book.page.movementAdvances.1" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/legacy/negative_effects.json b/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/legacy/negative_effects.json deleted file mode 100644 index 15ba1aafd..000000000 --- a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/legacy/negative_effects.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "psi.book.entry.negativeEffects", - "category": "legacy", - "icon": "psi:textures/spell/trick_wither.png", - "pages": [ - { - "type": "text", - "text": "psi.book.page.negativeEffects.0" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/legacy/positive_effects.json b/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/legacy/positive_effects.json deleted file mode 100644 index 3d5e927cb..000000000 --- a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/legacy/positive_effects.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "psi.book.entry.positiveEffects", - "category": "legacy", - "icon": "psi:textures/spell/trick_speed.png", - "pages": [ - { - "type": "text", - "text": "psi.book.page.positiveEffects.0" - }, - { - "type": "text", - "text": "psi.book.page.positiveEffects.1" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/legacy/secondary_operators.json b/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/legacy/secondary_operators.json deleted file mode 100644 index ef9ef1efe..000000000 --- a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/legacy/secondary_operators.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "psi.book.entry.secondaryOperators", - "category": "legacy", - "icon": "psi:textures/spell/operator_square.png", - "pages": [ - { - "type": "text", - "text": "psi.book.page.secondaryOperators.0" - }, - { - "type": "text", - "text": "psi.book.page.secondaryOperators.1" - }, - { - "type": "text", - "text": "psi.book.page.secondaryOperators.2" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/legacy/smeltery.json b/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/legacy/smeltery.json deleted file mode 100644 index 73fac64f2..000000000 --- a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/legacy/smeltery.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "psi.book.entry.smeltery", - "category": "legacy", - "icon": "psi:textures/spell/trick_smelt_item.png", - "pages": [ - { - "type": "text", - "text": "psi.book.page.smeltery.0" - }, - { - "type": "text", - "text": "psi.book.page.smeltery.1" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/legacy/trigonometry.json b/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/legacy/trigonometry.json deleted file mode 100644 index 9b77e1af0..000000000 --- a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/legacy/trigonometry.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "psi.book.entry.trigonometry", - "category": "legacy", - "icon": "psi:textures/spell/constant_pi.png", - "pages": [ - { - "type": "text", - "text": "psi.book.page.trigonometry.0" - }, - { - "type": "text", - "text": "psi.book.page.trigonometry.1" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/legacy/vectors101.json b/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/legacy/vectors101.json deleted file mode 100644 index 54116d5c2..000000000 --- a/src/main/resources/data/psi/patchouli_books/encyclopaedia_psionica/c/entries/legacy/vectors101.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "psi.book.entry.vectors101", - "category": "legacy", - "icon": "psi:textures/spell/operator_vector_construct.png", - "pages": [ - { - "type": "text", - "text": "psi.book.page.vectors101.0" - }, - { - "type": "text", - "text": "psi.book.page.vectors101.1" - } - ] -} \ No newline at end of file