From 42918ec6b4bf900224fba4858c48ebaccbf3724a Mon Sep 17 00:00:00 2001 From: Robotgiggle Date: Tue, 12 Nov 2024 03:15:37 -0500 Subject: [PATCH 1/4] Implement potion recipes --- .../hexcasting/common/lib/HexPotions.java | 20 +++++++++++++++++-- .../hexcasting/fabric/FabricHexInitializer.kt | 1 - .../hexcasting/forge/ForgeHexInitializer.java | 1 - 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/Common/src/main/java/at/petrak/hexcasting/common/lib/HexPotions.java b/Common/src/main/java/at/petrak/hexcasting/common/lib/HexPotions.java index f970235b5d..e86409e77c 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/lib/HexPotions.java +++ b/Common/src/main/java/at/petrak/hexcasting/common/lib/HexPotions.java @@ -3,18 +3,22 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.item.alchemy.Potion; +import net.minecraft.world.item.alchemy.Potions; +import net.minecraft.world.item.Items; import java.util.LinkedHashMap; import java.util.Map; import java.util.function.BiConsumer; import static at.petrak.hexcasting.api.HexAPI.modLoc; +import at.petrak.hexcasting.mixin.accessor.AccessorPotionBrewing; public class HexPotions { public static void register(BiConsumer r) { for (var e : POTIONS.entrySet()) { r.accept(e.getValue(), e.getKey()); } + HexPotions.addRecipes(); } private static final Map POTIONS = new LinkedHashMap<>(); @@ -26,12 +30,24 @@ public static void register(BiConsumer r) { public static final Potion ENLARGE_GRID_STRONG = make("enlarge_grid_strong", new Potion("enlarge_grid_strong", new MobEffectInstance(HexMobEffects.ENLARGE_GRID, 1800, 1))); + public static final Potion SHRINK_GRID = make("shrink_grid", + new Potion("shrink_grid", new MobEffectInstance(HexMobEffects.SHRINK_GRID, 3600))); + public static final Potion SHRINK_GRID_LONG = make("shrink_grid_long", + new Potion("shrink_grid_long", new MobEffectInstance(HexMobEffects.SHRINK_GRID, 9600))); + public static final Potion SHRINK_GRID_STRONG = make("shrink_grid_strong", + new Potion("shrink_grid_strong", new MobEffectInstance(HexMobEffects.SHRINK_GRID, 1800, 1))); + public static void addRecipes() { - /* AccessorPotionBrewing.addMix(Potions.AWKWARD, HexItems.AMETHYST_DUST, ENLARGE_GRID); AccessorPotionBrewing.addMix(ENLARGE_GRID, Items.REDSTONE, ENLARGE_GRID_LONG); AccessorPotionBrewing.addMix(ENLARGE_GRID, Items.GLOWSTONE_DUST, ENLARGE_GRID_STRONG); - */ + + AccessorPotionBrewing.addMix(ENLARGE_GRID, Items.FERMENTED_SPIDER_EYE, SHRINK_GRID); + AccessorPotionBrewing.addMix(ENLARGE_GRID_LONG, Items.FERMENTED_SPIDER_EYE, SHRINK_GRID_LONG); + AccessorPotionBrewing.addMix(ENLARGE_GRID_STRONG, Items.FERMENTED_SPIDER_EYE, SHRINK_GRID_STRONG); + + AccessorPotionBrewing.addMix(SHRINK_GRID, Items.REDSTONE, SHRINK_GRID_LONG); + AccessorPotionBrewing.addMix(SHRINK_GRID, Items.GLOWSTONE_DUST, SHRINK_GRID_STRONG); } private static T make(String id, T potion) { diff --git a/Fabric/src/main/java/at/petrak/hexcasting/fabric/FabricHexInitializer.kt b/Fabric/src/main/java/at/petrak/hexcasting/fabric/FabricHexInitializer.kt index e7d3163458..19e676136c 100644 --- a/Fabric/src/main/java/at/petrak/hexcasting/fabric/FabricHexInitializer.kt +++ b/Fabric/src/main/java/at/petrak/hexcasting/fabric/FabricHexInitializer.kt @@ -132,7 +132,6 @@ object FabricHexInitializer : ModInitializer { HexAttributes.register(bind(BuiltInRegistries.ATTRIBUTE)) HexMobEffects.register(bind(BuiltInRegistries.MOB_EFFECT)) HexPotions.register(bind(BuiltInRegistries.POTION)) - HexPotions.addRecipes() HexRecipeStuffRegistry.registerSerializers(bind(BuiltInRegistries.RECIPE_SERIALIZER)) HexRecipeStuffRegistry.registerTypes(bind(BuiltInRegistries.RECIPE_TYPE)) diff --git a/Forge/src/main/java/at/petrak/hexcasting/forge/ForgeHexInitializer.java b/Forge/src/main/java/at/petrak/hexcasting/forge/ForgeHexInitializer.java index 8fa6affec6..16bc2a0549 100644 --- a/Forge/src/main/java/at/petrak/hexcasting/forge/ForgeHexInitializer.java +++ b/Forge/src/main/java/at/petrak/hexcasting/forge/ForgeHexInitializer.java @@ -131,7 +131,6 @@ private static void initRegistry() { bind(Registries.ATTRIBUTE, HexAttributes::register); bind(Registries.MOB_EFFECT, HexMobEffects::register); bind(Registries.POTION, HexPotions::register); - HexPotions.addRecipes(); bind(Registries.PARTICLE_TYPE, HexParticles::registerParticles); From 2fbae64ccff6c804b254e66b6aa5b14871b4813c Mon Sep 17 00:00:00 2001 From: Robotgiggle Date: Tue, 12 Nov 2024 03:16:24 -0500 Subject: [PATCH 2/4] New effect icons, change color of shrink_grid to match --- .../hexcasting/common/lib/HexMobEffects.java | 2 +- .../textures/mob_effect/enlarge_grid.png | Bin 561 -> 15378 bytes .../textures/mob_effect/shrink_grid.png | Bin 566 -> 14282 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Common/src/main/java/at/petrak/hexcasting/common/lib/HexMobEffects.java b/Common/src/main/java/at/petrak/hexcasting/common/lib/HexMobEffects.java index fe1e0499c4..6398bfea27 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/lib/HexMobEffects.java +++ b/Common/src/main/java/at/petrak/hexcasting/common/lib/HexMobEffects.java @@ -26,7 +26,7 @@ public static void register(BiConsumer r) { .addAttributeModifier(HexAttributes.GRID_ZOOM, "d4afaf0f-df37-4253-9fa7-029e8e4415d9", 0.25, AttributeModifier.Operation.MULTIPLY_TOTAL); public static final MobEffect SHRINK_GRID = make("shrink_grid", - new HexMobEffect(MobEffectCategory.HARMFUL, 0xebad1c)) + new HexMobEffect(MobEffectCategory.HARMFUL, 0xc0e660)) .addAttributeModifier(HexAttributes.GRID_ZOOM, "1ce492a9-8bf5-4091-a482-c6d9399e448a", -0.2, AttributeModifier.Operation.MULTIPLY_TOTAL); diff --git a/Common/src/main/resources/assets/hexcasting/textures/mob_effect/enlarge_grid.png b/Common/src/main/resources/assets/hexcasting/textures/mob_effect/enlarge_grid.png index 58a621a495cd780bc66fcca1127310638cec5013..032d89263b124a97861edbc60edc240e278cbb9d 100644 GIT binary patch literal 15378 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 diff --git a/Common/src/main/resources/assets/hexcasting/textures/mob_effect/shrink_grid.png b/Common/src/main/resources/assets/hexcasting/textures/mob_effect/shrink_grid.png index cf592ff52f2e1294acec5e318be7e85c4b1ac846..21cc17bb2ee2dad74b4bd25bdc5d6a053dc578df 100644 GIT binary patch literal 14282 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 VeVWXS93ZB^q{ZdMsznR~{}-{GoxT77 delta 542 zcmV+(0^$A2Z?*)GBYyw^b5ch_0Itp)=>Px$@JU2LR5*>Tl(B2uKorKmGiMDQMA49H zFl{c-BLd>ip=pW#vnmjiYBFf>;3Z7gKfp$qC zV7iDzgNGRMI>@I;R-Lra2M5P{_kQ=iyL$)xCu4fzHagV#=6^ChPcPE`du=}PZ*$Ul zJRJ-;CjhVj76NFk)G`|^KYhZ^ex4^P=V6JWfO8_lpn!9-r9)lileVt%$(9b;(xJ+; z7qF$1ugGn5$d(R%a2~^U%JG=9uJUQiZIdk>+T4DffdK$)>0lO!RTxGB6GD&>f?5ar zIdwT$2BJ;F41a^h<1u-jw-A+Y;)&1 zn$2del*#r>)T0Q2X~LRLSy(LMZ5SdsBe&6^@ZuDs!4ON2ZPxGkINWV#&P^$W_YWQ+ zFiq5>2w|~EIu}T_NV;hOu!l<)`aPfeJwJiHoBU$dbc(<<7x(6Ujk_qW{e^#l-32e) gweU}gix>W?-$o5-6 Date: Tue, 12 Nov 2024 03:16:47 -0500 Subject: [PATCH 3/4] Book entry & assorted other lang --- .../hexcasting/lang/en_us.flatten.json5 | 48 +++++++++++++++++++ .../en_us/entries/items/potions.json | 21 ++++++++ 2 files changed, 69 insertions(+) create mode 100644 Common/src/main/resources/assets/hexcasting/patchouli_books/thehexbook/en_us/entries/items/potions.json diff --git a/Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5 b/Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5 index 7807a6e802..a942aa8cf8 100644 --- a/Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5 +++ b/Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5 @@ -209,6 +209,47 @@ bricks_small: "Small Quenched Allay Bricks", }, }, + + "effect.hexcasting": { + enlarge_grid: "Clarity", + shrink_grid: "Clouding", + }, + + "item.minecraft.potion.effect": { + enlarge_grid: "Potion of Clarity", + enlarge_grid_long: "Potion of Clarity", + enlarge_grid_strong: "Potion of Clarity", + shrink_grid: "Potion of Clouding", + shrink_grid_long: "Potion of Clouding", + shrink_grid_strong: "Potion of Clouding", + }, + + "item.minecraft.splash_potion.effect": { + enlarge_grid: "Splash Potion of Clarity", + enlarge_grid_long: "Splash Potion of Clarity", + enlarge_grid_strong: "Splash Potion of Clarity", + shrink_grid: "Splash Potion of Clouding", + shrink_grid_long: "Splash Potion of Clouding", + shrink_grid_strong: "Splash Potion of Clouding", + }, + + "item.minecraft.lingering_potion.effect": { + enlarge_grid: "Lingering Potion of Clarity", + enlarge_grid_long: "Lingering Potion of Clarity", + enlarge_grid_strong: "Lingering Potion of Clarity", + shrink_grid: "Lingering Potion of Clouding", + shrink_grid_long: "Lingering Potion of Clouding", + shrink_grid_strong: "Lingering Potion of Clouding", + }, + + "item.minecraft.tipped_arrow.effect": { + enlarge_grid: "Arrow of Clarity", + enlarge_grid_long: "Arrow of Clarity", + enlarge_grid_strong: "Arrow of Clarity", + shrink_grid: "Arrow of Clouding", + shrink_grid_long: "Arrow of Clouding", + shrink_grid_strong: "Arrow of Clouding", + }, "itemGroup.hexcasting": { "": "Hexcasting", @@ -1117,6 +1158,7 @@ // why is this called "hexcasting"? hexcasting: "Casting Items", phials: "Phials of Media", + potions: "Hex Potions", pigments: "Pigments", edified: "Edified Trees", @@ -1461,6 +1503,12 @@ "3": "Unfortunately, the art of actually $(italic)making/$ the things seems to have been lost to time. I've found a $(l:patterns/great_spells/make_battery#hexcasting:craft/battery)$(thing)hint at the pattern used to craft it/$, but the technique is irritatingly elusive, and I can't seem to do it successfully. I suspect I will figure it out with study and practice, though. For now, I will simply deal with the wasted _media...$(br2)But I won't settle for it forever.", desc: "$(italic)Drink the milk./$", }, + + potions: { + "1": "Peering through a $(l:items/lens)$(item)Scrying Lens/$ allows me to fit more patterns onto my casting grid. But what if I want to improve my casting even further? Alchemy has an answer.$(br2)By adding a pinch of Amethyst Dust to an $(item)Awkward Potion/$, I can create a brew that increases the size of my grid in much the same way as the Lens. I can even use both at once for the ultimate grid!", + "2": "The Potion of Clarity can be extended, strengthened, and modified like any other potion.$(br2)It can also be corrupted with a $(item)Fermented Spider Eye/$ to produce a variant with the opposite effect. This may be useful for dealing with enemy casters.", + "effects.header": "Clarity and Clouding", + }, pigments: { "1": "The old practitioners of my art sometimes identified themselves by a color, emblematic of them and their _Hexes. Although their names have faded, their colors remain. It seems a special kind of pigment, offered to Nature in the right way, would \"[...] paint one's thoughts in a manner pleasing to Nature, inducing a miraculous change in personal colour.\"", diff --git a/Common/src/main/resources/assets/hexcasting/patchouli_books/thehexbook/en_us/entries/items/potions.json b/Common/src/main/resources/assets/hexcasting/patchouli_books/thehexbook/en_us/entries/items/potions.json new file mode 100644 index 0000000000..a0db5dd70b --- /dev/null +++ b/Common/src/main/resources/assets/hexcasting/patchouli_books/thehexbook/en_us/entries/items/potions.json @@ -0,0 +1,21 @@ +{ + "name": "hexcasting.entry.potions", + "category": "hexcasting:items", + "icon": "minecraft:potion{Potion:\"hexcasting:enlarge_grid\"}", + "sortnum": 8, + "advancement": "hexcasting:root", + "read_by_default": true, + "pages": [ + { + "type": "patchouli:text", + "text": "hexcasting.page.potions.1" + }, + { + "type": "patchouli:spotlight", + "title": "hexcasting.page.potions.effects.header", + "text": "hexcasting.page.potions.2", + "item": "minecraft:potion{Potion:\"hexcasting:enlarge_grid\"},minecraft:potion{Potion:\"hexcasting:enlarge_grid_long\"},minecraft:potion{Potion:\"hexcasting:enlarge_grid_strong\"},minecraft:potion{Potion:\"hexcasting:shrink_grid\"},minecraft:potion{Potion:\"hexcasting:shrink_grid_long\"},minecraft:potion{Potion:\"hexcasting:shrink_grid_strong\"}" + } + ] + } + \ No newline at end of file From cafb5730900c91e39ac9ebe8f24d323782a919a4 Mon Sep 17 00:00:00 2001 From: Robotgiggle Date: Tue, 12 Nov 2024 03:17:09 -0500 Subject: [PATCH 4/4] Fix broken NBT in phial entry while I'm at it --- .../thehexbook/en_us/entries/items/phials.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Common/src/main/resources/assets/hexcasting/patchouli_books/thehexbook/en_us/entries/items/phials.json b/Common/src/main/resources/assets/hexcasting/patchouli_books/thehexbook/en_us/entries/items/phials.json index f0100e8432..0f930d1ec8 100644 --- a/Common/src/main/resources/assets/hexcasting/patchouli_books/thehexbook/en_us/entries/items/phials.json +++ b/Common/src/main/resources/assets/hexcasting/patchouli_books/thehexbook/en_us/entries/items/phials.json @@ -1,7 +1,7 @@ { "name": "hexcasting.entry.phials", "category": "hexcasting:items", - "icon": "hexcasting:battery{media:10000,max_media:10000}", + "icon": "hexcasting:battery", "sortnum": 7, "advancement": "hexcasting:root", "read_by_default": true, @@ -21,7 +21,7 @@ { "type": "patchouli:spotlight", "text": "hexcasting.page.phials.desc", - "item": "hexcasting:battery{media:10000,max_media:10000}", + "item": "hexcasting:battery{\"hexcasting:media\":640000,\"hexcasting:start_media\":640000}", "link_recipe": true } ]