1.0.0

Starexify · Oct 28, 2024 · 1f2521c · 1f2521c
1 parent 9653a85
commit 1f2521c
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 3 deletions.
diff --git a/src/main/java/net/nova/nmt/init/NMTItems.java b/src/main/java/net/nova/nmt/init/NMTItems.java
@@ -13,7 +13,9 @@
 public class NMTItems {
     public static final DeferredRegister.Items ITEMS = DeferredRegister.createItems(MODID);
 
+    // Obsidian Bottle
     public static DeferredItem<Item> OBSIDIAN_GLASS_BOTTLE = ITEMS.register("obsidian_glass_bottle", () -> new ObsidianBottleItem(new Item.Properties().fireResistant()));
+    /// Obsidian Potions
     public static DeferredItem<Item> LAVA_BOTTLE = ITEMS.register("lava_bottle", () -> new ObsidianPotionItem(new Item.Properties().stacksTo(1).component(DataComponents.POTION_CONTENTS, new PotionContents(NMTPotions.LAVA)).fireResistant()));
-    public static DeferredItem<Item> AWFULLY_POTION = ITEMS.register("awfully_potion", () -> new ObsidianPotionItem(new Item.Properties().stacksTo(1).fireResistant()));
+    public static DeferredItem<Item> AWFULLY_POTION = ITEMS.register("awfully_potion", () -> new ObsidianPotionItem(new Item.Properties().stacksTo(1).component(DataComponents.POTION_CONTENTS, new PotionContents(NMTPotions.AWFULLY)).fireResistant()));
 }
diff --git a/src/main/java/net/nova/nmt/init/NMTPotions.java b/src/main/java/net/nova/nmt/init/NMTPotions.java
@@ -3,6 +3,7 @@
 import net.minecraft.core.Holder;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.world.effect.MobEffectInstance;
+import net.minecraft.world.flag.FeatureFlagSet;
 import net.minecraft.world.item.alchemy.Potion;
 import net.neoforged.neoforge.registries.DeferredRegister;
 
@@ -11,6 +12,17 @@
 public class NMTPotions {
     public static final DeferredRegister<Potion> POTIONS = DeferredRegister.create(Registries.POTION, MODID);
 
-    public static final Holder<Potion> AWFULLY = POTIONS.register("awfully", () -> new Potion());
-    public static final Holder<Potion> LAVA = POTIONS.register("lava", () -> new Potion(new MobEffectInstance(NMTEffects.BURN, 900)));
+    public static final Holder<Potion> AWFULLY = registerPotion("awfully");
+
+    public static final Holder<Potion> LAVA = registerPotion("lava", new MobEffectInstance(NMTEffects.BURN, 900));
+
+    // Method
+    public static Holder<Potion> registerPotion(String name, MobEffectInstance... effects) {
+        return POTIONS.register(name, () -> new Potion(effects) {
+            @Override
+            public boolean isEnabled(FeatureFlagSet enabledFeatures) {
+                return false;
+            }
+        });
+    }
 }
diff --git a/src/main/java/net/nova/nmt/util/NMTPotion.java b/src/main/java/net/nova/nmt/util/NMTPotion.java
@@ -0,0 +1,11 @@
+package net.nova.nmt.util;
+
+import net.minecraft.world.flag.FeatureFlagSet;
+import net.minecraft.world.item.alchemy.Potion;
+
+public class NMTPotion extends Potion {
+    @Override
+    public boolean isEnabled(FeatureFlagSet enabledFeatures) {
+        return false;
+    }
+}