Skip to content

Commit

Permalink
Rework encyclopedia
Browse files Browse the repository at this point in the history
Instead of crafting it from all four books, you craft it from a book and molten gold
As you craft each other book, the encyclopedia fills with sections
Encyclopedia now has an intro section
Since we only have space for 12 sections without a second index, combined small and broad tools into one section
  • Loading branch information
KnightMiner committed May 1, 2022
1 parent 1cb30df commit 54666c9
Show file tree
Hide file tree
Showing 27 changed files with 145 additions and 172 deletions.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,20 +1,13 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "tconstruct:materials_and_you"
},
{
"item": "tconstruct:puny_smelting"
},
{
"item": "tconstruct:mighty_smelting"
},
{
"item": "tconstruct:fantastic_foundry"
}
],
"result": {
"item": "tconstruct:encyclopedia"
}
"type": "tconstruct:casting_table",
"cast": {
"item": "minecraft:book"
},
"cast_consumed": true,
"fluid": {
"tag": "forge:molten_gold",
"amount": 90
},
"result": "tconstruct:encyclopedia",
"cooling_time": 57
}
Original file line number Diff line number Diff line change
Expand Up @@ -141,13 +141,10 @@ private void addCommonRecipes(Consumer<FinishedRecipe> consumer) {
.requires(TinkerSmeltery.netherGrout)
.unlockedBy("has_item", has(TinkerSmeltery.netherGrout))
.save(consumer, prefix(TinkerCommons.fantasticFoundry, "common/"));
ShapelessRecipeBuilder.shapeless(TinkerCommons.encyclopedia)
.requires(TinkerCommons.materialsAndYou)
.requires(TinkerCommons.punySmelting)
.requires(TinkerCommons.mightySmelting)
.requires(TinkerCommons.fantasticFoundry)
.unlockedBy("has_item", has(TinkerCommons.fantasticFoundry))
.save(consumer, prefix(TinkerCommons.encyclopedia, "common/"));
ItemCastingRecipeBuilder.tableRecipe(TinkerCommons.encyclopedia)
.setFluidAndTime(TinkerFluids.moltenGold, true, FluidValues.INGOT)
.setCast(Items.BOOK, true)
.save(consumer, prefix(TinkerCommons.encyclopedia, "common/"));

// glass
folder = "common/glass/";
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"title": "Updates",
"text": [
{
"text": "Due to copyright issues, I could not simply include all the contents from other authors in this book unless the reader also owns the source book. Using the magic of gold, I managed to make the book automatically add new sections as you create the other books."
},
{
"text": "To get the full contents of this book, you will need to obtain copies of Materials and You, Puny Smelting, Mighty Smelting, Fantastic Foundry, and Tinkers' Gadgetry.",
"paragraph": true
}
]
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
intro=Introduction

small_tools=Small Tools
large_tools=Broad Tools
tools=Tools
tools.group_small=Small Tools
tools.group_large=Broad Tools
armor=Armor

tier_one_materials=Tier 1 Materials
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"title": "Tool Information",
"title": "Broad Tools",
"text": [
{ "text": "All broad tools require the Tinker's Anvil to be created, and to swap parts. Most require 4 tool parts, and start with only 2 upgrade slots and 1 ability slot." },
{ "text": "Large tools have both attack bonuses and modifiers like small tools, and many more have traits. In addition, many tools have a durability or a mining speed modifier that act similarly to the attack modifier, affecting both base stats and stat bonuses from modifiers. Finally, all broad tools have the \"two handed\" trait, which prevents use of the offhand unless a modifier such as offhanded is applied.", "paragraph": true }
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"title": "Tool Information",
"title": "Small Tools",
"text": [
{ "text": "All small tools can be created in either the Tinker Station or the Tinker's Anvil. They require between 2 to 3 parts, granting 2 to 3 traits. Most small tools start with 1 ability slot and 3 upgrade slots as well." },
{ "text": "Most tools have an attack damage bonus, which is added to the head stats and multiplied by the handle stats. In addition, some tools have an attack modifier, which multiplies attack damage from all sources on the tool, including modifiers. Some tools also start with tool traits, which are applied to fully built tools similarly to material traits.", "paragraph": true }
Expand Down
46 changes: 25 additions & 21 deletions src/main/resources/assets/tconstruct/book/encyclopedia/index.json
Original file line number Diff line number Diff line change
@@ -1,40 +1,26 @@
[
{
"name": "small_tools",
"data": "sections/small_tools.json",
"name": "intro",
"data": "sections/intro.json",
"icon": {
"item": {
"type": "forge:nbt",
"item": "tconstruct:pickaxe",
"nbt": {
"tic_broken": false,
"tic_display": true,
"Damage": 0,
"tic_materials": [
"tconstruct:ui_render#head",
"tconstruct:ui_render#handle",
"tconstruct:ui_render#extra"
]
}
}
"item": "minecraft:paper"
}
},
{
"name": "large_tools",
"data": "sections/large_tools.json",
"name": "tools",
"data": "sections/tools.json",
"icon": {
"item": {
"type": "forge:nbt",
"item": "tconstruct:cleaver",
"item": "tconstruct:pickaxe",
"nbt": {
"tic_broken": false,
"tic_display": true,
"Damage": 0,
"tic_materials": [
"tconstruct:ui_render#head",
"tconstruct:ui_render#handle",
"tconstruct:ui_render#extra",
"tconstruct:ui_render#large"
"tconstruct:ui_render#extra"
]
}
}
Expand All @@ -57,37 +43,49 @@
},
{
"name": "tier_one_materials",
"requirements": [ "tconstruct:tools/materials_and_you" ],
"hideWhenLocked": true,
"icon": {
"item": "minecraft:stone"
}
},
{
"name": "tier_two_materials",
"requirements": [ "tconstruct:smeltery/puny_smelting" ],
"hideWhenLocked": true,
"icon": {
"item": "minecraft:iron_ingot"
}
},
{
"name": "tier_three_materials",
"requirements": [ "tconstruct:smeltery/mighty_smelting" ],
"hideWhenLocked": true,
"icon": {
"item": "tconstruct:slimesteel_ingot"
}
},
{
"name": "tier_four_materials",
"requirements": [ "tconstruct:foundry/fantastic_foundry" ],
"hideWhenLocked": true,
"icon": {
"item": "tconstruct:manyullyn_ingot"
}
},
{
"name": "skull_materials",
"requirements": [ "tconstruct:world/tinkers_gadgetry" ],
"hideWhenLocked": true,
"icon": {
"item": "minecraft:skeleton_skull"
}
},
{
"name": "upgrades",
"data": "sections/upgrades.json",
"requirements": [ "tconstruct:smeltery/puny_smelting" ],
"hideWhenLocked": true,
"icon": {
"item": {
"type": "forge:nbt",
Expand All @@ -101,6 +99,8 @@
{
"name": "defense",
"data": "sections/defense.json",
"requirements": [ "tconstruct:smeltery/mighty_smelting" ],
"hideWhenLocked": true,
"icon": {
"item": {
"type": "forge:nbt",
Expand All @@ -114,6 +114,8 @@
{
"name": "slotless",
"data": "sections/slotless.json",
"requirements": [ "tconstruct:smeltery/puny_smelting" ],
"hideWhenLocked": true,
"icon": {
"item": {
"type": "forge:nbt",
Expand All @@ -127,6 +129,8 @@
{
"name": "abilities",
"data": "sections/abilities.json",
"requirements": [ "tconstruct:smeltery/mighty_smelting" ],
"hideWhenLocked": true,
"icon": {
"item": {
"type": "forge:nbt",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
[
{
"type": "mantle:blank"
"name": "forward",
"type": "mantle:text",
"data": "intro/forward.json"
},
{
"name": "intro",
"name": "updates",
"type": "mantle:text",
"data": "intro/text.json"
"data": "intro/updates.json"
}
]

This file was deleted.

This file was deleted.

0 comments on commit 54666c9

Please sign in to comment.