fix: potion effects not working on 1.20.2 (#88)

Author: skyecodes

common/src/main/java/com/github/franckyi/ibeeditor/client/screen/model/category/item/ItemPotionEffectsCategoryModel.java

@@ -6,10 +6,12 @@
 import com.github.franckyi.ibeeditor.client.screen.model.entry.item.PotionEffectEntryModel;
 import com.github.franckyi.ibeeditor.client.screen.model.entry.item.PotionSelectionEntryModel;
 import com.github.franckyi.ibeeditor.common.ModTexts;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.ListTag;
 import net.minecraft.nbt.Tag;
 import net.minecraft.network.chat.MutableComponent;
+import net.minecraft.world.effect.MobEffects;
 
 public class ItemPotionEffectsCategoryModel extends ItemEditorCategoryModel {
     private ListTag potionEffectList;
@@ -23,7 +25,7 @@ protected void setupEntries() {
         getEntries().add(new PotionSelectionEntryModel(this, ModTexts.DEFAULT_POTION,
                 getTag().getString("Potion"), getCustomPotionColor(),
                 p -> getTag().putString("Potion", p), this::setCustomPotionColor));
-        getTag().getList("CustomPotionEffects", Tag.TAG_COMPOUND).stream()
+        getTag().getList("custom_potion_effects", Tag.TAG_COMPOUND).stream()
                 .map(CompoundTag.class::cast)
                 .map(this::createPotionEffectEntry)
                 .forEach(getEntries()::add);
@@ -63,36 +65,36 @@ private void setCustomPotionColor(int color) {
 
     private EntryModel createPotionEffectEntry(CompoundTag tag) {
         if (tag != null) {
-            int id = tag.getInt("Id");
-            int amplifier = tag.getInt("Amplifier"); // defaults to 0
-            int duration = tag.contains("Duration", Tag.TAG_INT) ? tag.getInt("Duration") : 1;
-            boolean ambient = tag.getBoolean("Ambient"); // defaults to false
-            boolean showParticles = !tag.contains("ShowParticles", Tag.TAG_BYTE) || tag.getBoolean("ShowParticles");
-            boolean showIcon = tag.getBoolean("ShowIcon");
+            String id = tag.getString("id");
+            int amplifier = tag.getInt("amplifier"); // defaults to 0
+            int duration = tag.contains("duration", Tag.TAG_INT) ? tag.getInt("duration") : 1;
+            boolean ambient = tag.getBoolean("ambient"); // defaults to false
+            boolean showParticles = !tag.contains("show_particles", Tag.TAG_BYTE) || tag.getBoolean("show_particles");
+            boolean showIcon = tag.getBoolean("show_icon");
             return new PotionEffectEntryModel(this, id, amplifier, duration, ambient, showParticles, showIcon, this::addPotionEffect);
         }
-        return new PotionEffectEntryModel(this, 1, 0, 1, false, true, true, this::addPotionEffect);
+        return new PotionEffectEntryModel(this, BuiltInRegistries.MOB_EFFECT.getKey(MobEffects.MOVEMENT_SPEED).toString(), 0, 1, false, true, true, this::addPotionEffect);
     }
 
     @Override
     public void apply() {
         potionEffectList = new ListTag();
         super.apply();
         if (!potionEffectList.isEmpty()) {
-            getOrCreateTag().put("CustomPotionEffects", potionEffectList);
-        } else if (getOrCreateTag().contains("CustomPotionEffects")) {
-            getOrCreateTag().remove("CustomPotionEffects");
+            getOrCreateTag().put("custom_potion_effects", potionEffectList);
+        } else if (getOrCreateTag().contains("custom_potion_effects")) {
+            getOrCreateTag().remove("custom_potion_effects");
         }
     }
 
-    private void addPotionEffect(int id, int amplifier, int duration, boolean ambient, boolean showParticles, boolean showIcon) {
+    private void addPotionEffect(String id, int amplifier, int duration, boolean ambient, boolean showParticles, boolean showIcon) {
         CompoundTag tag = new CompoundTag();
-        tag.putInt("Id", id);
-        tag.putInt("Amplifier", amplifier);
-        tag.putInt("Duration", duration);
-        tag.putBoolean("Ambient", ambient);
-        tag.putBoolean("ShowParticles", showParticles);
-        tag.putBoolean("ShowIcon", showIcon);
+        tag.putString("id", id);
+        tag.putInt("amplifier", amplifier);
+        tag.putInt("duration", duration);
+        tag.putBoolean("ambient", ambient);
+        tag.putBoolean("show_particles", showParticles);
+        tag.putBoolean("show_icon", showIcon);
         potionEffectList.add(tag);
     }
 }

common/src/main/java/com/github/franckyi/ibeeditor/client/screen/model/entry/item/PotionEffectEntryModel.java

@@ -7,10 +7,7 @@
 import com.github.franckyi.ibeeditor.client.screen.model.entry.SelectionEntryModel;
 import com.github.franckyi.ibeeditor.client.screen.model.selection.element.ListSelectionElementModel;
 import com.github.franckyi.ibeeditor.common.ModTexts;
-import net.minecraft.core.Registry;
-import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.network.chat.MutableComponent;
-import net.minecraft.resources.ResourceLocation;
 
 import java.util.List;
 
@@ -19,8 +16,8 @@ public class PotionEffectEntryModel extends SelectionEntryModel {
     private final BooleanProperty ambientProperty, showParticlesProperty, showIconProperty;
     private final PotionEffectConsumer callback;
 
-    public PotionEffectEntryModel(CategoryModel category, int id, int amplifier, int duration, boolean ambient, boolean showParticles, boolean showIcon, PotionEffectConsumer callback) {
-        super(category, null, BuiltInRegistries.MOB_EFFECT.getKey(BuiltInRegistries.MOB_EFFECT.byId(id)).toString(), s -> {
+    public PotionEffectEntryModel(CategoryModel category, String id, int amplifier, int duration, boolean ambient, boolean showParticles, boolean showIcon, PotionEffectConsumer callback) {
+        super(category, null, id, s -> {
         });
         amplifierProperty = IntegerProperty.create(amplifier);
         durationProperty = IntegerProperty.create(duration);
@@ -32,7 +29,7 @@ public PotionEffectEntryModel(CategoryModel category, int id, int amplifier, int
 
     @Override
     public void apply() {
-        callback.consume(BuiltInRegistries.MOB_EFFECT.getId(BuiltInRegistries.MOB_EFFECT.get(ResourceLocation.tryParse(getValue()))), getAmplifier(), getDuration(), isAmbient(), isShowParticles(), isShowIcon());
+        callback.consume(getValue(), getAmplifier(), getDuration(), isAmbient(), isShowParticles(), isShowIcon());
     }
 
     public int getAmplifier() {
@@ -117,6 +114,6 @@ public List<? extends ListSelectionElementModel> getSelectionItems() {
 
     @FunctionalInterface
     public interface PotionEffectConsumer {
-        void consume(int id, int amplifier, int duration, boolean ambient, boolean showParticles, boolean showIcon);
+        void consume(String id, int amplifier, int duration, boolean ambient, boolean showParticles, boolean showIcon);
     }
 }

forge_update.json

@@ -5,7 +5,7 @@
     "1.20-recommended": "2.2.3",
     "1.20.1-latest": "2.2.3",
     "1.20.1-recommended": "2.2.3",
-    "1.20.2-latest": "2.2.5",
-    "1.20.2-recommended": "2.2.5"
+    "1.20.2-latest": "2.2.6",
+    "1.20.2-recommended": "2.2.6"
   }
 }

gradle.properties

@@ -4,16 +4,16 @@ org.gradle.daemon=false
 # IBE Editor
 minecraft_version=1.20.2
 archives_base_name=IBEEditor
-mod_version=2.2.5
+mod_version=2.2.6
 maven_group=com.github.franckyi.ibeeditor
 # Fabric https://fabricmc.net/develop/
 fabric_loader_version=0.14.24
 fabric_api_version=0.90.7+1.20.2
-modmenu_version=8.0.0-beta.2
+modmenu_version=8.0.0
 # Forge https://files.minecraftforge.net/
-forge_version=48.0.34
+forge_version=48.0.40
 # NeoForge https://neoforged.net/
-neoforge_version=20.2.56-beta
+neoforge_version=20.2.62-beta
 # Build and release info
 java_version=17
 major_minecraft_version=1.20.2

versions.json

@@ -1,4 +1,8 @@
 {
+  "2.2.6": {
+    "type": "release",
+    "changelog": "* fix: potion effects not working on 1.20.2 (#88)"
+  },
   "2.2.5": {
     "type": "release",
     "changelog": "* fix: crash on startup due to Vault (#87)"