Skip to content

Commit e0f2f91

Browse files
authored
Enhance docgen for overriding default logic (#357)
* dont log twice if flags are true * use LoadStage enum for annotation * remove IFormat parameter from gen wiki * add targetFile to generateExamples * move examples to "generated" subfolder * generate wiki in wiki/mods folder * add IContainerDocumentation * change vanilla wiki to generate in separate folder * add the ability to export files directly * add vanilla index file to export directly * log.info into log * return boolean for IContainerDocumentation * use IGroovyContainer for doc * rename parameter to loadStage * simplify Registry creation * use list for inworldcrafting * allow a single annotation to target multiple methods * refactor recursive annotation fetching * gather recursive annotations for RBMD/RBRM * extract try-catch IO in Documentation, simplify * move VALUE method examples to first * pass lang key into builder * consolidate logic with IRegistryDocumentation * make default reference use global binding if exists * adjust vanilla logic with custom container * make vanilla register globals based on its aliases * extract strings to constants * apply change to vanilla minecraft postInit * generate mekanism infusion texture * generate preInit ZorraAltar examples * fix piston push validation incorrectly allowing 0 * allow non-mod ContainerHolder headers * add in-world crafting * ensure trailing whitespace is the same in all examples * change carving sound to ADDITION * simplify documenting type method * streamline compare packages * convert example to use case insensitive * sort example entries better * the humble spotless apply * delete old in_world_crafting examples * end index file with more line breaks * make minecraft use alias and have more of them * rename minecraft wiki page to Vanilla Registries * rework package block to be clearer and less spammy * always admonition, but only collapse if too many * switch admonition to quote * fix vararg method ties * rename generated files * make inWorldCrafting have properties correctly * deduplicate sets in a different location * add more inworldcrafting examples * add header control to markdown sections * rename subtitle to comment * note header level * remove random unused imports * reduce some code complexity * document containerholder better * add LangHelper.fallback * replace all headers with MarkdownSection * rename to Heading * make header IFormat * thats now how you make new lines * add category header overrides * make non-varargs translate method * rework lang key usage for category * adjust documenting methods * surround mod in parentheses for title * extract tab indent whitespace * document content creation * gather overrides from class * tulip typo * fix error not logging desired info * add description to recipe builder methods * reduce complexity of some field doc code * ensure period in custom register description * document content builders * remove trailing newlines on index files * sort classes that skipped documentation * add method descriptions to more places * fix melting recipe builder * spotless apply * needs two percent symbols * move heading to constructor, split link logic * add custom iwc description * remove now-unused test file * add a single space to indent better * use priority for wiki * minor whitespace change * remove useless distinct call * add more content documentation * minor capitalization typo
1 parent ca3286a commit e0f2f91

File tree

128 files changed

+2428
-1267
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

128 files changed

+2428
-1267
lines changed

examples/postInit/custom/in_world_crafting.groovy

Lines changed: 0 additions & 38 deletions
This file was deleted.

examples/postInit/actuallyadditions.groovy renamed to examples/postInit/generated/actuallyadditions_generated.groovy

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Auto generated groovyscript example file
33
// MODS_LOADED: actuallyadditions
44

5-
log.info 'mod \'actuallyadditions\' detected, running script'
5+
log 'mod \'actuallyadditions\' detected, running script'
66

77
// Atomic Reconstructor:
88
// The Atomic Reconstructor is a block which uses energy to convert a block or item in front of it into other items.
@@ -120,8 +120,8 @@ mods.actuallyadditions.empowerer.recipeBuilder()
120120
// A weighted oredict for the block obtained via firing a Mining Lens at a block of Netherrack. The oredict must have a
121121
// block, or the world will hang.
122122

123-
mods.actuallyadditions.nether_mining_lens.removeByOre(ore('oreQuartz'))
124123
mods.actuallyadditions.nether_mining_lens.removeByOre('oreQuartz')
124+
mods.actuallyadditions.nether_mining_lens.removeByOre(ore('oreQuartz'))
125125
// mods.actuallyadditions.nether_mining_lens.removeAll()
126126

127127
mods.actuallyadditions.nether_mining_lens.recipeBuilder()
@@ -139,8 +139,8 @@ mods.actuallyadditions.nether_mining_lens.recipeBuilder()
139139
// Turns a fluid into power at a rate.
140140

141141
mods.actuallyadditions.oil_gen.removeByInput(fluid('canolaoil').getFluid())
142-
mods.actuallyadditions.oil_gen.removeByInput(fluid('canolaoil'))
143142
mods.actuallyadditions.oil_gen.removeByInput('refinedcanolaoil')
143+
mods.actuallyadditions.oil_gen.removeByInput(fluid('canolaoil'))
144144
// mods.actuallyadditions.oil_gen.removeAll()
145145

146146
mods.actuallyadditions.oil_gen.recipeBuilder()
@@ -160,8 +160,8 @@ mods.actuallyadditions.oil_gen.recipeBuilder()
160160
// A weighted oredict for the block obtained via firing a Mining Lens at a block of Stone. The oredict must have a block,
161161
// or the world will hang.
162162

163-
mods.actuallyadditions.stone_mining_lens.removeByOre(ore('oreCoal'))
164163
mods.actuallyadditions.stone_mining_lens.removeByOre('oreLapis')
164+
mods.actuallyadditions.stone_mining_lens.removeByOre(ore('oreCoal'))
165165
// mods.actuallyadditions.stone_mining_lens.removeAll()
166166

167167
mods.actuallyadditions.stone_mining_lens.recipeBuilder()
@@ -188,5 +188,3 @@ mods.actuallyadditions.treasure_chest.recipeBuilder()
188188
.min(16)
189189
.max(32)
190190
.register()
191-
192-

examples/postInit/advancedmortars.groovy renamed to examples/postInit/generated/advancedmortars_generated.groovy

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Auto generated groovyscript example file
33
// MODS_LOADED: advancedmortars
44

5-
log.info 'mod \'advancedmortars\' detected, running script'
5+
log 'mod \'advancedmortars\' detected, running script'
66

77
// Mortar:
88
// Uses any number of specific types of Mortars to convert multiple items into a single output with a possible chance
@@ -32,7 +32,6 @@ mods.advancedmortars.mortar.recipeBuilder()
3232
.register()
3333

3434

35-
mods.advancedmortars.mortar.add(['iron', 'wood'], item('minecraft:tnt') * 5, 4, item('minecraft:tnt'), 0.7, [ore('ingotIron'), ore('ingotIron'), ore('ingotIron'), ore('ingotIron'),ore('ingotIron'), ore('ingotIron'), ore('ingotIron'), ore('ingotIron')])
3635
mods.advancedmortars.mortar.add(['stone'], item('minecraft:tnt'), 4, [ore('ingotGold')])
3736
mods.advancedmortars.mortar.add(['stone'], item('minecraft:diamond') * 4, 4, [ore('ingotGold')])
38-
37+
mods.advancedmortars.mortar.add(['iron', 'wood'], item('minecraft:tnt') * 5, 4, item('minecraft:tnt'), 0.7, [ore('ingotIron'), ore('ingotIron'), ore('ingotIron'), ore('ingotIron'),ore('ingotIron'), ore('ingotIron'), ore('ingotIron'), ore('ingotIron')])

examples/postInit/advancedrocketry.groovy renamed to examples/postInit/generated/advancedrocketry_generated.groovy

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Auto generated groovyscript example file
33
// MODS_LOADED: advancedrocketry
44

5-
log.info 'mod \'advancedrocketry\' detected, running script'
5+
log 'mod \'advancedrocketry\' detected, running script'
66

77
// Centrifuge:
88
// Converts an input fluid into up to 12 output items and up to 4 output fluids, consuming RF.
@@ -169,5 +169,3 @@ mods.advancedrocketry.small_plate_presser.recipeBuilder()
169169
.input(item('minecraft:cobblestone'))
170170
.output(item('minecraft:diamond'))
171171
.register()
172-
173-

examples/postInit/aether_legacy.groovy renamed to examples/postInit/generated/aether_legacy_generated.groovy

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Auto generated groovyscript example file
33
// MODS_LOADED: aether_legacy
44

5-
log.info 'mod \'aether_legacy\' detected, running script'
5+
log 'mod \'aether_legacy\' detected, running script'
66

77
// Accessory:
88
// The Aether Accessory system.
@@ -57,4 +57,3 @@ mods.aether_legacy.freezer_fuel.removeByItem(item('aether_legacy:icestone'))
5757
// mods.aether_legacy.freezer_fuel.removeAll()
5858

5959
mods.aether_legacy.freezer_fuel.add(item('minecraft:packed_ice'), 1000)
60-

examples/postInit/alchemistry.groovy renamed to examples/postInit/generated/alchemistry_generated.groovy

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Auto generated groovyscript example file
33
// MODS_LOADED: alchemistry
44

5-
log.info 'mod \'alchemistry\' detected, running script'
5+
log 'mod \'alchemistry\' detected, running script'
66

77
// Atomizer:
88
// Converts a non-element into its component elements.
@@ -125,5 +125,3 @@ mods.alchemistry.liquifier.recipeBuilder()
125125
.input(item('minecraft:magma'))
126126
.fluidOutput(fluid('lava') * 750)
127127
.register()
128-
129-

examples/postInit/appliedenergistics2.groovy renamed to examples/postInit/generated/appliedenergistics2_generated.groovy

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@
44

55
import appeng.capabilities.Capabilities
66

7-
log.info 'mod \'appliedenergistics2\' detected, running script'
7+
log 'mod \'appliedenergistics2\' detected, running script'
88

99
// P2P Attunement:
1010
// Controls using specific items, any items from a mod, or any items with a Capability to convert a P2P into a specific
1111
// tunnel type.
1212

13-
mods.appliedenergistics2.attunement.remove(Capabilities.FORGE_ENERGY, tunnel('fe_power'))
14-
mods.appliedenergistics2.attunement.remove(item('minecraft:lever'), tunnel('redstone'))
1513
mods.appliedenergistics2.attunement.remove('thermaldynamics', tunnel('fe_power'))
14+
mods.appliedenergistics2.attunement.remove(item('minecraft:lever'), tunnel('redstone'))
15+
mods.appliedenergistics2.attunement.remove(Capabilities.FORGE_ENERGY, tunnel('fe_power'))
1616
mods.appliedenergistics2.attunement.removeByTunnel(tunnel('item'))
1717
// mods.appliedenergistics2.attunement.removeAll()
1818

19-
mods.appliedenergistics2.attunement.add(Capabilities.FORGE_ENERGY, tunnel('item'))
20-
mods.appliedenergistics2.attunement.add(item('minecraft:clay'), tunnel('item'))
2119
mods.appliedenergistics2.attunement.add('thermaldynamics', tunnel('redstone'))
20+
mods.appliedenergistics2.attunement.add(item('minecraft:clay'), tunnel('item'))
21+
mods.appliedenergistics2.attunement.add(Capabilities.FORGE_ENERGY, tunnel('item'))
2222

2323
// Cannon Ammo:
2424
// Item and weight, where weight is a factor in how much damage is dealt.
@@ -78,4 +78,3 @@ mods.appliedenergistics2.spatial.remove('net.minecraft.tileentity.TileEntityChes
7878
// mods.appliedenergistics2.spatial.removeAll()
7979

8080
mods.appliedenergistics2.spatial.add('net.minecraft.tileentity.TileEntityStructure')
81-

examples/postInit/arcanearchives.groovy renamed to examples/postInit/generated/arcanearchives_generated.groovy

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Auto generated groovyscript example file
33
// MODS_LOADED: arcanearchives
44

5-
log.info 'mod \'arcanearchives\' detected, running script'
5+
log 'mod \'arcanearchives\' detected, running script'
66

77
// Gem Cutting Table:
88
// Converts any number of itemstacks into a single output itemstack via selecting the desired output itemstack in the GUI.
@@ -21,5 +21,3 @@ mods.arcanearchives.gem_cutting_table.recipeBuilder()
2121
.input(item('minecraft:stone'),item('minecraft:gold_ingot'),item('minecraft:gold_nugget'))
2222
.output(item('minecraft:clay') * 4)
2323
.register()
24-
25-

examples/postInit/arcaneworld.groovy renamed to examples/postInit/generated/arcaneworld_generated.groovy

Lines changed: 26 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Auto generated groovyscript example file
33
// MODS_LOADED: arcaneworld
44

5-
log.info 'mod \'arcaneworld\' detected, running script'
5+
log 'mod \'arcaneworld\' detected, running script'
66

77
// Ritual:
88
// Converts up to 5 input itemstacks into a wide number of possible effects, including spawning entities, opening a portal
@@ -21,51 +21,40 @@ mods.arcaneworld.ritual.recipeBuilder()
2121
.name('groovyscript:custom_name')
2222
.register()
2323

24+
mods.arcaneworld.ritual.recipeBuilderTime()
25+
.input(item('minecraft:diamond'), item('minecraft:clay'), item('minecraft:clay'), item('minecraft:clay'))
26+
.translationKey('groovyscript.demo_time')
27+
.time(5000)
28+
.register()
29+
2430
mods.arcaneworld.ritual.recipeBuilderArena()
2531
.input(item('minecraft:stone'), item('minecraft:stone'), item('minecraft:clay'))
2632
.translationKey('groovyscript.demo_arena')
2733
.entity(entity('minecraft:chicken'))
2834
.register()
2935

30-
mods.arcaneworld.ritual.recipeBuilderCommand()
31-
.input(item('minecraft:diamond'), item('minecraft:diamond'), item('minecraft:clay'))
32-
.translationKey('groovyscript.demo_command')
33-
.command('say hi',
34-
'give @p minecraft:coal 5')
35-
.register()
36-
37-
mods.arcaneworld.ritual.recipeBuilderCreateItem()
38-
.input(item('minecraft:diamond'), item('minecraft:diamond'), item('minecraft:diamond'))
39-
.translationKey('groovyscript.demo_create_item')
40-
.output(item('minecraft:diamond'))
41-
.register()
42-
4336
mods.arcaneworld.ritual.recipeBuilderCustom()
4437
.input(item('minecraft:diamond'), item('minecraft:diamond'), item('minecraft:clay'), item('minecraft:clay'))
4538
.translationKey('groovyscript.demo_custom')
4639
.onActivate({ World world, BlockPos blockPos, EntityPlayer player, ItemStack... itemStacks -> { log.info blockPos } })
4740
.register()
4841

49-
mods.arcaneworld.ritual.recipeBuilderDragonBreath()
50-
.input(item('minecraft:clay'), item('minecraft:clay'), item('minecraft:clay'), item('minecraft:clay'), item('minecraft:clay'))
51-
.translationKey('groovyscript.demo_dragon_breath')
52-
.register()
53-
54-
mods.arcaneworld.ritual.recipeBuilderDungeon()
55-
.input(item('minecraft:diamond'), item('minecraft:clay'), item('minecraft:clay'))
56-
.translationKey('groovyscript.demo_dungeon')
57-
.register()
58-
5942
mods.arcaneworld.ritual.recipeBuilderSummon()
6043
.input(item('minecraft:stone'), item('minecraft:clay'), item('minecraft:clay'))
6144
.translationKey('groovyscript.demo_summon')
6245
.entity(entity('minecraft:chicken'))
6346
.register()
6447

65-
mods.arcaneworld.ritual.recipeBuilderTime()
66-
.input(item('minecraft:diamond'), item('minecraft:clay'), item('minecraft:clay'), item('minecraft:clay'))
67-
.translationKey('groovyscript.demo_time')
68-
.time(5000)
48+
mods.arcaneworld.ritual.recipeBuilderCommand()
49+
.input(item('minecraft:diamond'), item('minecraft:diamond'), item('minecraft:clay'))
50+
.translationKey('groovyscript.demo_command')
51+
.command('say hi',
52+
'give @p minecraft:coal 5')
53+
.register()
54+
55+
mods.arcaneworld.ritual.recipeBuilderDungeon()
56+
.input(item('minecraft:diamond'), item('minecraft:clay'), item('minecraft:clay'))
57+
.translationKey('groovyscript.demo_dungeon')
6958
.register()
7059

7160
mods.arcaneworld.ritual.recipeBuilderWeather()
@@ -86,4 +75,13 @@ mods.arcaneworld.ritual.recipeBuilderWeather()
8675
.weatherThunder()
8776
.register()
8877

78+
mods.arcaneworld.ritual.recipeBuilderCreateItem()
79+
.input(item('minecraft:diamond'), item('minecraft:diamond'), item('minecraft:diamond'))
80+
.translationKey('groovyscript.demo_create_item')
81+
.output(item('minecraft:diamond'))
82+
.register()
8983

84+
mods.arcaneworld.ritual.recipeBuilderDragonBreath()
85+
.input(item('minecraft:clay'), item('minecraft:clay'), item('minecraft:clay'), item('minecraft:clay'), item('minecraft:clay'))
86+
.translationKey('groovyscript.demo_dragon_breath')
87+
.register()

examples/postInit/armorplus.groovy renamed to examples/postInit/generated/armorplus_generated.groovy

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Auto generated groovyscript example file
33
// MODS_LOADED: armorplus
44

5-
log.info 'mod \'armorplus\' detected, running script'
5+
log 'mod \'armorplus\' detected, running script'
66

77
// Champion Bench:
88
// A normal crafting recipe, but with a 9x9 grid and in the Champion Bench.
@@ -41,8 +41,8 @@ mods.armorplus.high_tech_bench.removeByOutput(item('armorplus:emerald_helmet'))
4141
mods.armorplus.high_tech_bench.shapedBuilder()
4242
.output(item('minecraft:diamond') * 32)
4343
.matrix([[item('minecraft:gold_ingot'), item('minecraft:gold_ingot'), item('minecraft:gold_ingot')],
44-
[item('minecraft:gold_ingot'), item('minecraft:gold_ingot'), item('minecraft:gold_ingot')],
45-
[item('minecraft:gold_ingot'), item('minecraft:gold_ingot'), item('minecraft:gold_ingot')]])
44+
[item('minecraft:gold_ingot'), item('minecraft:gold_ingot'), item('minecraft:gold_ingot')],
45+
[item('minecraft:gold_ingot'), item('minecraft:gold_ingot'), item('minecraft:gold_ingot')]])
4646
.register()
4747

4848

@@ -114,5 +114,3 @@ mods.armorplus.work_bench.shapelessBuilder()
114114
.output(item('minecraft:clay') * 8)
115115
.input(item('minecraft:stone'), item('minecraft:stone'), item('minecraft:stone'))
116116
.register()
117-
118-

0 commit comments

Comments
 (0)