Implement potion recipes

Author: Robotgiggle

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<Potion, ResourceLocation> r) {
         for (var e : POTIONS.entrySet()) {
             r.accept(e.getValue(), e.getKey());
         }
+        HexPotions.addRecipes();
     }
 
     private static final Map<ResourceLocation, Potion> POTIONS = new LinkedHashMap<>();
@@ -26,12 +30,24 @@ public static void register(BiConsumer<Potion, ResourceLocation> 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 extends Potion> T make(String id, T potion) {

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))

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);