Skip to content

Commit 261064d

Browse files
WaterpickerWaterpicker
committed
Add config option for zygarde cube to accept cell overflow with appropiate alternate text to match the fact cube is full still.
1 parent 4c9b10d commit 261064d

6 files changed

Lines changed: 104 additions & 91 deletions

File tree

‎common/src/main/generated/resources/assets/generations_core/lang/en_us.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3325,6 +3325,7 @@
33253325
"item.generations_core.zygarde_cube": "Zygarde Cube",
33263326
"item.generations_core.zygarde_cube.tooltip.cell_add": "Zygarde Cell collected!",
33273327
"item.generations_core.zygarde_cube.tooltip.cell_full": "The Zygarde Cube is full!",
3328+
"item.generations_core.zygarde_cube.tooltip.cell_overflow": "Due to Zygarde Cube being full, the zygarde cell atomizes.",
33283329
"item.generations_core.zygarde_cube.tooltip.lore1": "A strange cube capable of storing up to 100 Zygarde Cells,",
33293330
"item.generations_core.zygarde_cube.tooltip.lore2": "as well as fusing them together to reconstruct the legendary Zygarde.",
33303331
"item.generations_core.zygarde_cube.tooltip.lore3": "Collect Zygarde Cells to summon the balance.",

‎common/src/main/generated/resources/data/minecraft/tags/blocks/mineable/axe.json‎

Lines changed: 67 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -56,101 +56,101 @@
5656
"generations_core:cursed_carved_pumpkin",
5757
"generations_core:scarecrow",
5858
"generations_core:box",
59-
"generations_core:gray_couch_arm_left",
59+
"generations_core:purple_couch_arm_left",
60+
"generations_core:light_gray_couch_arm_left",
61+
"generations_core:green_couch_arm_left",
6062
"generations_core:yellow_couch_arm_left",
63+
"generations_core:gray_couch_arm_left",
64+
"generations_core:blue_couch_arm_left",
65+
"generations_core:brown_couch_arm_left",
6166
"generations_core:magenta_couch_arm_left",
62-
"generations_core:light_blue_couch_arm_left",
63-
"generations_core:black_couch_arm_left",
64-
"generations_core:lime_couch_arm_left",
65-
"generations_core:light_gray_couch_arm_left",
66-
"generations_core:cyan_couch_arm_left",
67+
"generations_core:white_couch_arm_left",
6768
"generations_core:red_couch_arm_left",
68-
"generations_core:purple_couch_arm_left",
69+
"generations_core:lime_couch_arm_left",
70+
"generations_core:black_couch_arm_left",
71+
"generations_core:light_blue_couch_arm_left",
6972
"generations_core:orange_couch_arm_left",
70-
"generations_core:white_couch_arm_left",
73+
"generations_core:cyan_couch_arm_left",
7174
"generations_core:pink_couch_arm_left",
72-
"generations_core:blue_couch_arm_left",
73-
"generations_core:brown_couch_arm_left",
74-
"generations_core:green_couch_arm_left",
75-
"generations_core:gray_couch_arm_right",
75+
"generations_core:purple_couch_arm_right",
76+
"generations_core:light_gray_couch_arm_right",
77+
"generations_core:green_couch_arm_right",
7678
"generations_core:yellow_couch_arm_right",
79+
"generations_core:gray_couch_arm_right",
80+
"generations_core:blue_couch_arm_right",
81+
"generations_core:brown_couch_arm_right",
7782
"generations_core:magenta_couch_arm_right",
78-
"generations_core:light_blue_couch_arm_right",
79-
"generations_core:black_couch_arm_right",
80-
"generations_core:lime_couch_arm_right",
81-
"generations_core:light_gray_couch_arm_right",
82-
"generations_core:cyan_couch_arm_right",
83+
"generations_core:white_couch_arm_right",
8384
"generations_core:red_couch_arm_right",
84-
"generations_core:purple_couch_arm_right",
85+
"generations_core:lime_couch_arm_right",
86+
"generations_core:black_couch_arm_right",
87+
"generations_core:light_blue_couch_arm_right",
8588
"generations_core:orange_couch_arm_right",
86-
"generations_core:white_couch_arm_right",
89+
"generations_core:cyan_couch_arm_right",
8790
"generations_core:pink_couch_arm_right",
88-
"generations_core:blue_couch_arm_right",
89-
"generations_core:brown_couch_arm_right",
90-
"generations_core:green_couch_arm_right",
91-
"generations_core:gray_couch_corner_left",
91+
"generations_core:purple_couch_corner_left",
92+
"generations_core:light_gray_couch_corner_left",
93+
"generations_core:green_couch_corner_left",
9294
"generations_core:yellow_couch_corner_left",
95+
"generations_core:gray_couch_corner_left",
96+
"generations_core:blue_couch_corner_left",
97+
"generations_core:brown_couch_corner_left",
9398
"generations_core:magenta_couch_corner_left",
94-
"generations_core:light_blue_couch_corner_left",
95-
"generations_core:black_couch_corner_left",
96-
"generations_core:lime_couch_corner_left",
97-
"generations_core:light_gray_couch_corner_left",
98-
"generations_core:cyan_couch_corner_left",
99+
"generations_core:white_couch_corner_left",
99100
"generations_core:red_couch_corner_left",
100-
"generations_core:purple_couch_corner_left",
101+
"generations_core:lime_couch_corner_left",
102+
"generations_core:black_couch_corner_left",
103+
"generations_core:light_blue_couch_corner_left",
101104
"generations_core:orange_couch_corner_left",
102-
"generations_core:white_couch_corner_left",
105+
"generations_core:cyan_couch_corner_left",
103106
"generations_core:pink_couch_corner_left",
104-
"generations_core:blue_couch_corner_left",
105-
"generations_core:brown_couch_corner_left",
106-
"generations_core:green_couch_corner_left",
107-
"generations_core:gray_couch_corner_right",
107+
"generations_core:purple_couch_corner_right",
108+
"generations_core:light_gray_couch_corner_right",
109+
"generations_core:green_couch_corner_right",
108110
"generations_core:yellow_couch_corner_right",
111+
"generations_core:gray_couch_corner_right",
112+
"generations_core:blue_couch_corner_right",
113+
"generations_core:brown_couch_corner_right",
109114
"generations_core:magenta_couch_corner_right",
110-
"generations_core:light_blue_couch_corner_right",
111-
"generations_core:black_couch_corner_right",
112-
"generations_core:lime_couch_corner_right",
113-
"generations_core:light_gray_couch_corner_right",
114-
"generations_core:cyan_couch_corner_right",
115+
"generations_core:white_couch_corner_right",
115116
"generations_core:red_couch_corner_right",
116-
"generations_core:purple_couch_corner_right",
117+
"generations_core:lime_couch_corner_right",
118+
"generations_core:black_couch_corner_right",
119+
"generations_core:light_blue_couch_corner_right",
117120
"generations_core:orange_couch_corner_right",
118-
"generations_core:white_couch_corner_right",
121+
"generations_core:cyan_couch_corner_right",
119122
"generations_core:pink_couch_corner_right",
120-
"generations_core:blue_couch_corner_right",
121-
"generations_core:brown_couch_corner_right",
122-
"generations_core:green_couch_corner_right",
123-
"generations_core:gray_couch_middle",
123+
"generations_core:purple_couch_middle",
124+
"generations_core:light_gray_couch_middle",
125+
"generations_core:green_couch_middle",
124126
"generations_core:yellow_couch_middle",
127+
"generations_core:gray_couch_middle",
128+
"generations_core:blue_couch_middle",
129+
"generations_core:brown_couch_middle",
125130
"generations_core:magenta_couch_middle",
126-
"generations_core:light_blue_couch_middle",
127-
"generations_core:black_couch_middle",
128-
"generations_core:lime_couch_middle",
129-
"generations_core:light_gray_couch_middle",
130-
"generations_core:cyan_couch_middle",
131+
"generations_core:white_couch_middle",
131132
"generations_core:red_couch_middle",
132-
"generations_core:purple_couch_middle",
133+
"generations_core:lime_couch_middle",
134+
"generations_core:black_couch_middle",
135+
"generations_core:light_blue_couch_middle",
133136
"generations_core:orange_couch_middle",
134-
"generations_core:white_couch_middle",
137+
"generations_core:cyan_couch_middle",
135138
"generations_core:pink_couch_middle",
136-
"generations_core:blue_couch_middle",
137-
"generations_core:brown_couch_middle",
138-
"generations_core:green_couch_middle",
139-
"generations_core:gray_couch_ottoman",
139+
"generations_core:purple_couch_ottoman",
140+
"generations_core:light_gray_couch_ottoman",
141+
"generations_core:green_couch_ottoman",
140142
"generations_core:yellow_couch_ottoman",
143+
"generations_core:gray_couch_ottoman",
144+
"generations_core:blue_couch_ottoman",
145+
"generations_core:brown_couch_ottoman",
141146
"generations_core:magenta_couch_ottoman",
142-
"generations_core:light_blue_couch_ottoman",
143-
"generations_core:black_couch_ottoman",
144-
"generations_core:lime_couch_ottoman",
145-
"generations_core:light_gray_couch_ottoman",
146-
"generations_core:cyan_couch_ottoman",
147+
"generations_core:white_couch_ottoman",
147148
"generations_core:red_couch_ottoman",
148-
"generations_core:purple_couch_ottoman",
149+
"generations_core:lime_couch_ottoman",
150+
"generations_core:black_couch_ottoman",
151+
"generations_core:light_blue_couch_ottoman",
149152
"generations_core:orange_couch_ottoman",
150-
"generations_core:white_couch_ottoman",
151-
"generations_core:pink_couch_ottoman",
152-
"generations_core:blue_couch_ottoman",
153-
"generations_core:brown_couch_ottoman",
154-
"generations_core:green_couch_ottoman"
153+
"generations_core:cyan_couch_ottoman",
154+
"generations_core:pink_couch_ottoman"
155155
]
156156
}

‎common/src/main/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -804,38 +804,38 @@
804804
"generations_core:pink_elevator",
805805
"generations_core:desk",
806806
"generations_core:fridge",
807-
"generations_core:gray_street_lamp",
807+
"generations_core:purple_street_lamp",
808+
"generations_core:light_gray_street_lamp",
809+
"generations_core:green_street_lamp",
808810
"generations_core:yellow_street_lamp",
811+
"generations_core:gray_street_lamp",
812+
"generations_core:blue_street_lamp",
813+
"generations_core:brown_street_lamp",
809814
"generations_core:magenta_street_lamp",
810-
"generations_core:light_blue_street_lamp",
811-
"generations_core:black_street_lamp",
812-
"generations_core:lime_street_lamp",
813-
"generations_core:light_gray_street_lamp",
814-
"generations_core:cyan_street_lamp",
815+
"generations_core:white_street_lamp",
815816
"generations_core:red_street_lamp",
816-
"generations_core:purple_street_lamp",
817+
"generations_core:lime_street_lamp",
818+
"generations_core:black_street_lamp",
819+
"generations_core:light_blue_street_lamp",
817820
"generations_core:orange_street_lamp",
818-
"generations_core:white_street_lamp",
821+
"generations_core:cyan_street_lamp",
819822
"generations_core:pink_street_lamp",
820-
"generations_core:blue_street_lamp",
821-
"generations_core:brown_street_lamp",
822-
"generations_core:green_street_lamp",
823-
"generations_core:gray_pc",
823+
"generations_core:purple_pc",
824+
"generations_core:light_gray_pc",
825+
"generations_core:green_pc",
824826
"generations_core:yellow_pc",
827+
"generations_core:gray_pc",
828+
"generations_core:blue_pc",
829+
"generations_core:brown_pc",
825830
"generations_core:magenta_pc",
826-
"generations_core:light_blue_pc",
827-
"generations_core:black_pc",
828-
"generations_core:lime_pc",
829-
"generations_core:light_gray_pc",
830-
"generations_core:cyan_pc",
831+
"generations_core:white_pc",
831832
"generations_core:red_pc",
832-
"generations_core:purple_pc",
833+
"generations_core:lime_pc",
834+
"generations_core:black_pc",
835+
"generations_core:light_blue_pc",
833836
"generations_core:orange_pc",
834-
"generations_core:white_pc",
837+
"generations_core:cyan_pc",
835838
"generations_core:pink_pc",
836-
"generations_core:blue_pc",
837-
"generations_core:brown_pc",
838-
"generations_core:green_pc",
839839
"generations_core:empty_ball_display",
840840
"generations_core:poke_ball_display",
841841
"generations_core:great_ball_display",

‎common/src/main/java/generations/gg/generations/core/generationscore/common/config/Config.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ public class Config {
2525
public Blocks blocks = new Blocks();
2626
public Special special = new Special();
2727

28+
public Legendary legendary = new Legendary();
29+
2830
public Client client = new Client();
2931

3032
public Economy economy = new Economy();
@@ -162,4 +164,8 @@ public static class Economy {
162164
public static class Breeding {
163165
public int blocksPerEggCcyle = 256;
164166
}
167+
168+
public static class Legendary {
169+
public boolean enableZygardeCubeOverflow = false;
170+
}
165171
}

‎common/src/main/java/generations/gg/generations/core/generationscore/common/world/entity/ZygardeCellEntity.kt‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package generations.gg.generations.core.generationscore.common.world.entity
22

33
import com.cobblemon.mod.common.api.text.text
4+
import generations.gg.generations.core.generationscore.common.GenerationsCore
45
import generations.gg.generations.core.generationscore.common.client.render.rarecandy.BlockObjectInstance
56
import generations.gg.generations.core.generationscore.common.client.render.rarecandy.instanceOrNull
67
import generations.gg.generations.core.generationscore.common.world.item.GenerationsItems
@@ -42,10 +43,12 @@ class ZygardeCellEntity : Entity {
4243
val serverPlayer = player.instanceOrNull<ServerPlayer>() ?: return InteractionResult.PASS;
4344
val stack = player.mainHandItem.takeIf { it.`is`(GenerationsItems.ZYGARDE_CUBE.get()) } ?: return InteractionResult.PASS
4445

45-
if (stack.damageValue != ZygardeCubeItem.FULL) {
46+
//Note: I'm treating Boolean? like a tristate here. True and null allow while false doesn't. This is to allow an alternate overflow message when taking a cell when full.
47+
val allowed = if(stack.damageValue != ZygardeCubeItem.FULL) true else if(GenerationsCore.CONFIG.legendary.enableZygardeCubeOverflow) null else false
48+
if (allowed != false) {
4649
stack.damageValue += 1
4750
serverPlayer.displayClientMessage(
48-
Component.translatable("item.generations_core.zygarde_cube.tooltip.cell_add"),
51+
Component.translatable(if(allowed != null) "item.generations_core.zygarde_cube.tooltip.cell_add" else "item.generations_core.zygarde_cube.tooltip.cell_overflow"),
4952
false
5053
)
5154
level().playSound(
@@ -56,6 +59,8 @@ class ZygardeCellEntity : Entity {
5659
0.2f,
5760
1.0f
5861
)
62+
63+
5964
remove(RemovalReason.DISCARDED)
6065

6166
player.cooldowns.addCooldown(stack.item, 20)

‎forge/src/main/java/generations/gg/generations/core/generationscore/forge/datagen/generators/lang/GeneralLang.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -370,6 +370,7 @@ protected void addTranslations() {
370370
addTooltip(MELOETTA_MUSIC_BOX, "§7HINT: You hear a wonderful melody from within. You need to hear more.”");
371371
//Zygarde
372372
addTooltip(ZYGARDE_CUBE, "cell_add", "Zygarde Cell collected!");
373+
addTooltip(ZYGARDE_CUBE, "cell_overflow", "Due to Zygarde Cube being full, the zygarde cell atomizes.");
373374
addTooltip(ZYGARDE_CUBE, "cell_full", "The Zygarde Cube is full!");
374375
addTooltip(ZYGARDE_CUBE, "lore1", "A strange cube capable of storing up to 100 Zygarde Cells,");
375376
addTooltip(ZYGARDE_CUBE, "lore2", "as well as fusing them together to reconstruct the legendary Zygarde.");

0 commit comments

Comments
 (0)