Skip to content

Commit 0a81490

Browse files
LounodeLounode
committed
flowers final
1 parent 4669e5c commit 0a81490

130 files changed

Lines changed: 2549 additions & 40 deletions

File tree

Some content is hidden

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

‎Fabric/src/main/java/io/github/lounode/extrabotany/fabric/FabricExtraBotanyConfig.java‎

Lines changed: 86 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
import vazkii.botania.xplat.XplatAbstractions;
44

55
import io.github.lounode.extrabotany.api.ExtraBotanyAPI;
6-
import io.github.lounode.extrabotany.common.block.flower.functional.AnnoyingFlowerBlockEntity;
7-
import io.github.lounode.extrabotany.common.block.flower.functional.SerenitianBlockEntity;
8-
import io.github.lounode.extrabotany.common.block.flower.functional.TradeOrchidBlockEntity;
6+
import io.github.lounode.extrabotany.common.block.flower.functional.*;
97
import io.github.lounode.extrabotany.common.block.flower.generating.*;
108
import io.github.lounode.extrabotany.common.lib.LibMisc;
119
import io.github.lounode.extrabotany.xplat.ExtraBotanyConfig;
@@ -118,6 +116,12 @@ private static class COMMON implements ExtraBotanyConfig.ConfigAccess {
118116
public final PropertyMirror<Integer> bloodEnchantressMaxMana = PropertyMirror.create(INTEGER);
119117
public final PropertyMirror<Integer> bloodEnchantressProduceMana = PropertyMirror.create(INTEGER);
120118
public final PropertyMirror<Integer> serenitianRange = PropertyMirror.create(INTEGER);
119+
public final PropertyMirror<Integer> mirrowtuniaMaxMana = PropertyMirror.create(INTEGER);
120+
public final PropertyMirror<Integer> mirrowtuniaEffectCost = PropertyMirror.create(INTEGER);
121+
public final PropertyMirror<Integer> necrofleurMaxMana = PropertyMirror.create(INTEGER);
122+
public final PropertyMirror<Integer> manalinkTransferSpeed = PropertyMirror.create(INTEGER);
123+
public final PropertyMirror<Integer> enchanterTransformCost = PropertyMirror.create(INTEGER);
124+
public final PropertyMirror<Integer> enchanterConsumeSpeed = PropertyMirror.create(INTEGER);
121125

122126
public ConfigTree configure(ConfigTreeBuilder builder) {
123127
builder
@@ -451,6 +455,55 @@ Working range centered on self (±X axis, +Y axis, ±Z axis)""")
451455
Working range in blocks""")
452456
.finishValue(serenitianRange::mirror)
453457
.finishBranch()//End serenitian
458+
.fork("mirrowtunia").withComment("""
459+
镜姬
460+
Mirrowtunia""")
461+
.beginValue("maxMana", INTEGER, MirrowtuniaBlockEntity.MAX_MANA)
462+
.withComment("""
463+
最大魔力值
464+
Maximum mana""")
465+
.finishValue(mirrowtuniaMaxMana::mirror)
466+
.beginValue("effectCost", INTEGER, MirrowtuniaBlockEntity.EFFECT_COST)
467+
.withComment("""
468+
施加效果消耗的魔力量
469+
Mana cost per effect""")
470+
.finishValue(mirrowtuniaEffectCost::mirror)
471+
.finishBranch() // End mirrowtunia
472+
473+
.fork("necrofleur").withComment("""
474+
死之花
475+
Necrofleur""")
476+
.beginValue("maxMana", INTEGER, NecrofleurBlockEntity.MAX_MANA)
477+
.withComment("""
478+
最大魔力值
479+
Maximum mana""")
480+
.finishValue(necrofleurMaxMana::mirror)
481+
.finishBranch() // End necrofleur
482+
483+
.fork("manalink").withComment("""
484+
魔链星
485+
Manalink""")
486+
.beginValue("transferSpeed", INTEGER, ManalinkBlockEntity.TRANSFER_SPEED)
487+
.withComment("""
488+
魔力传输速度
489+
Mana transfer speed""")
490+
.finishValue(manalinkTransferSpeed::mirror)
491+
.finishBranch() // End manalink
492+
493+
.fork("enchanter").withComment("""
494+
蕴魔瑾
495+
Enchanter""")
496+
.beginValue("transformCost", INTEGER, EnchanterBlockEntity.TRANSFORM_COST)
497+
.withComment("""
498+
转换草方块为蕴魔土的总消耗
499+
Total mana cost to transform grass to enchanted soil""")
500+
.finishValue(enchanterTransformCost::mirror)
501+
.beginValue("consumeSpeed", INTEGER, EnchanterBlockEntity.CONSUME_SPEED)
502+
.withComment("""
503+
魔力消耗速度
504+
Mana consume speed""")
505+
.finishValue(enchanterConsumeSpeed::mirror)
506+
.finishBranch() // End enchanter
454507

455508
.finishBranch()//End flower
456509

@@ -683,6 +736,36 @@ public int bloodEnchantressProduceMana() {
683736
public int serenitianRange() {
684737
return serenitianRange.getValue();
685738
}
739+
740+
@Override
741+
public int mirrowtuniaMaxMana() {
742+
return mirrowtuniaMaxMana.getValue();
743+
}
744+
745+
@Override
746+
public int mirrowtuniaEffectCost() {
747+
return mirrowtuniaEffectCost.getValue();
748+
}
749+
750+
@Override
751+
public int necrofleurMaxMana() {
752+
return necrofleurMaxMana.getValue();
753+
}
754+
755+
@Override
756+
public int manalinkTransferSpeed() {
757+
return manalinkTransferSpeed.getValue();
758+
}
759+
760+
@Override
761+
public int enchanterTransformCost() {
762+
return enchanterTransformCost.getValue();
763+
}
764+
765+
@Override
766+
public int enchanterConsumeSpeed() {
767+
return enchanterConsumeSpeed.getValue();
768+
}
686769
}
687770

688771
private static void writeDefaultConfig(ConfigTree config, Path path, JanksonValueSerializer serializer) {

‎Forge/src/main/java/io/github/lounode/extrabotany/forge/ForgeExtrabotanyConfig.java‎

Lines changed: 90 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@
1111

1212
import vazkii.botania.xplat.XplatAbstractions;
1313

14-
import io.github.lounode.extrabotany.common.block.flower.functional.AnnoyingFlowerBlockEntity;
15-
import io.github.lounode.extrabotany.common.block.flower.functional.SerenitianBlockEntity;
16-
import io.github.lounode.extrabotany.common.block.flower.functional.TradeOrchidBlockEntity;
14+
import io.github.lounode.extrabotany.common.block.flower.functional.*;
1715
import io.github.lounode.extrabotany.common.block.flower.generating.*;
1816
import io.github.lounode.extrabotany.common.lib.LibMisc;
1917
import io.github.lounode.extrabotany.xplat.ExtraBotanyConfig;
@@ -101,6 +99,12 @@ private static class Common implements ExtraBotanyConfig.ConfigAccess {
10199
public final ForgeConfigSpec.IntValue bloodEnchantressMaxMana;
102100
public final ForgeConfigSpec.IntValue bloodEnchantressProduceMana;
103101
public final ForgeConfigSpec.IntValue serenitianRange;
102+
public final ForgeConfigSpec.IntValue mirrowtuniaMaxMana;
103+
public final ForgeConfigSpec.IntValue mirrowtuniaEffectCost;
104+
public final ForgeConfigSpec.IntValue necrofleurMaxMana;
105+
public final ForgeConfigSpec.IntValue manalinkTransferSpeed;
106+
public final ForgeConfigSpec.IntValue enchanterTransformCost;
107+
public final ForgeConfigSpec.IntValue enchanterConsumeSpeed;
104108

105109
public Common(ForgeConfigSpec.Builder builder) {
106110

@@ -433,6 +437,59 @@ Working range centered on self (±X axis, +Y axis, ±Z axis)""")
433437
Working range in blocks""")
434438
.defineInRange("range", SerenitianBlockEntity.RANGE, 1, 16);
435439
builder.pop();//End serenitian
440+
builder.comment("""
441+
镜姬
442+
Mirrowtunia""");
443+
builder.push("mirrowtunia");
444+
mirrowtuniaMaxMana = builder
445+
.comment("""
446+
最大魔力值
447+
Maximum mana""")
448+
.defineInRange("maxMana", MirrowtuniaBlockEntity.MAX_MANA, 0, Integer.MAX_VALUE);
449+
mirrowtuniaEffectCost = builder
450+
.comment("""
451+
施加效果消耗的魔力量
452+
Mana cost per effect""")
453+
.defineInRange("effectCost", MirrowtuniaBlockEntity.EFFECT_COST, 0, Integer.MAX_VALUE);
454+
builder.pop(); // End mirrowtunia
455+
456+
builder.comment("""
457+
死之花
458+
Necrofleur""");
459+
builder.push("necrofleur");
460+
necrofleurMaxMana = builder
461+
.comment("""
462+
最大魔力值
463+
Maximum mana""")
464+
.defineInRange("maxMana", NecrofleurBlockEntity.MAX_MANA, 0, Integer.MAX_VALUE);
465+
builder.pop(); // End necrofleur
466+
467+
builder.comment("""
468+
魔链星
469+
Manalink""");
470+
builder.push("manalink");
471+
manalinkTransferSpeed = builder
472+
.comment("""
473+
魔力传输速度
474+
Mana transfer speed""")
475+
.defineInRange("transferSpeed", ManalinkBlockEntity.TRANSFER_SPEED, 0, Integer.MAX_VALUE);
476+
builder.pop(); // End manalink
477+
478+
builder.comment("""
479+
蕴魔瑾
480+
Enchanter""");
481+
builder.push("enchanter");
482+
enchanterTransformCost = builder
483+
.comment("""
484+
转换草方块为蕴魔土的总消耗
485+
Total mana cost to transform grass to enchanted soil""")
486+
.defineInRange("transformCost", EnchanterBlockEntity.TRANSFORM_COST, 0, Integer.MAX_VALUE);
487+
enchanterConsumeSpeed = builder
488+
.comment("""
489+
魔力消耗速度
490+
Mana consume speed""")
491+
.defineInRange("consumeSpeed", EnchanterBlockEntity.CONSUME_SPEED, 0, Integer.MAX_VALUE);
492+
builder.pop(); // End enchanter
436493

437494
builder.pop();//End flower
438495
builder.pop();//End server
@@ -664,6 +721,36 @@ public int bloodEnchantressProduceMana() {
664721
public int serenitianRange() {
665722
return serenitianRange.get();
666723
}
724+
725+
@Override
726+
public int mirrowtuniaMaxMana() {
727+
return mirrowtuniaMaxMana.get();
728+
}
729+
730+
@Override
731+
public int mirrowtuniaEffectCost() {
732+
return mirrowtuniaEffectCost.get();
733+
}
734+
735+
@Override
736+
public int necrofleurMaxMana() {
737+
return necrofleurMaxMana.get();
738+
}
739+
740+
@Override
741+
public int manalinkTransferSpeed() {
742+
return manalinkTransferSpeed.get();
743+
}
744+
745+
@Override
746+
public int enchanterTransformCost() {
747+
return enchanterTransformCost.get();
748+
}
749+
750+
@Override
751+
public int enchanterConsumeSpeed() {
752+
return enchanterConsumeSpeed.get();
753+
}
667754
}
668755

669756
private static final Common COMMON;

‎Xplat/src/generated/resources/assets/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/enchanter.json‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"category": "botania:functional_flowers",
3+
"extra_recipe_mappings": {
4+
"extrabotany:floating_enchanter": 1
5+
},
6+
"icon": "extrabotany:enchanter",
7+
"name": "extrabotany.entry.enchanter",
8+
"pages": [
9+
{
10+
"type": "patchouli:text",
11+
"text": "extrabotany.page.enchanter0"
12+
},
13+
{
14+
"type": "botania:petal_apothecary",
15+
"recipe": "extrabotany:petal_apothecary/enchanter",
16+
"text": "extrabotany.page.enchanter1"
17+
}
18+
]
19+
}

‎Xplat/src/generated/resources/assets/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/mirrowtunia.json‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"category": "botania:functional_flowers",
3+
"extra_recipe_mappings": {
4+
"extrabotany:floating_mirrowtunia": 1
5+
},
6+
"icon": "extrabotany:mirrowtunia",
7+
"name": "extrabotany.entry.mirrowtunia",
8+
"pages": [
9+
{
10+
"type": "patchouli:text",
11+
"text": "extrabotany.page.mirrowtunia0"
12+
},
13+
{
14+
"type": "botania:petal_apothecary",
15+
"recipe": "extrabotany:petal_apothecary/mirrowtunia",
16+
"text": "extrabotany.page.mirrowtunia1"
17+
}
18+
]
19+
}

‎Xplat/src/generated/resources/assets/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/necrofleur.json‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
{
2+
"category": "botania:functional_flowers",
3+
"extra_recipe_mappings": {
4+
"extrabotany:floating_necrofleur": 1,
5+
"extrabotany:floating_necrofleur_chibi": 3
6+
},
7+
"icon": "extrabotany:necrofleur",
8+
"name": "extrabotany.entry.necrofleur",
9+
"pages": [
10+
{
11+
"type": "patchouli:text",
12+
"text": "extrabotany.page.necrofleur0"
13+
},
14+
{
15+
"type": "botania:petal_apothecary",
16+
"recipe": "extrabotany:petal_apothecary/necrofleur",
17+
"text": "extrabotany.page.necrofleur1"
18+
},
19+
{
20+
"type": "patchouli:text",
21+
"text": "extrabotany.page.necrofleur2"
22+
},
23+
{
24+
"type": "botania:mana_infusion",
25+
"recipes": "extrabotany:mana_infusion/necrofleur_chibi",
26+
"text": "extrabotany.page.necrofleur3"
27+
}
28+
]
29+
}

‎Xplat/src/generated/resources/assets/botania/patchouli_books/lexicon/en_us/entries/functional_flowers/serenitian.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"category": "botania:functional_flowers",
33
"extra_recipe_mappings": {
4-
"extrabotany:serenitian": 1
4+
"extrabotany:floating_serenitian": 1
55
},
66
"icon": "extrabotany:serenitian",
77
"name": "extrabotany.entry.serenitian",

‎Xplat/src/generated/resources/assets/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/blood_enchantress.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"category": "botania:generating_flowers",
33
"extra_recipe_mappings": {
4-
"extrabotany:blood_enchantress": 2
4+
"extrabotany:floating_blood_enchantress": 2
55
},
66
"icon": "extrabotany:blood_enchantress",
77
"name": "extrabotany.entry.blood_enchantress",

‎Xplat/src/generated/resources/assets/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/moonlight_lily.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"category": "botania:generating_flowers",
33
"extra_recipe_mappings": {
4-
"extrabotany:moonlight_lily": 1
4+
"extrabotany:floating_moonlight_lily": 1
55
},
66
"icon": "extrabotany:moonlight_lily",
77
"name": "extrabotany.entry.moonlight_lily",

‎Xplat/src/generated/resources/assets/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/omniviolet.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"category": "botania:generating_flowers",
33
"extra_recipe_mappings": {
4-
"extrabotany:omniviolet": 1
4+
"extrabotany:floating_omniviolet": 1
55
},
66
"icon": "extrabotany:omniviolet",
77
"name": "extrabotany.entry.omniviolet",

‎Xplat/src/generated/resources/assets/botania/patchouli_books/lexicon/en_us/entries/generating_flowers/tinkle.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"category": "botania:generating_flowers",
33
"extra_recipe_mappings": {
4-
"extrabotany:tinkle": 1
4+
"extrabotany:floating_tinkle": 1
55
},
66
"icon": "extrabotany:tinkle",
77
"name": "extrabotany.entry.tinkle",

0 commit comments

Comments
 (0)