Port 1.21 part 2

Author: TheidenHD

build.gradle

@@ -3,7 +3,7 @@ plugins {
     id 'eclipse'
     id 'idea'
     id 'maven-publish'
-    id 'net.neoforged.gradle.userdev' version '7.0.145'
+    id 'net.neoforged.gradle.userdev' version '7.0.152'
 }
 
 tasks.named('wrapper', Wrapper).configure {

gradle.properties

@@ -5,24 +5,24 @@ org.gradle.debug=false
 
 #read more on this at https://github.com/neoforged/NeoGradle/blob/NG_7.0/README.md#apply-parchment-mappings
 # you can also find the latest versions at: https://parchmentmc.org/docs/getting-started
-neogradle.subsystems.parchment.minecraftVersion=1.21
-neogradle.subsystems.parchment.mappingsVersion=2024.07.28
+neogradle.subsystems.parchment.minecraftVersion=1.21.1
+neogradle.subsystems.parchment.mappingsVersion=2024.11.17
 # Environment Properties
 # You can find the latest versions here: https://projects.neoforged.net/neoforged/neoforge
 # The Minecraft version must agree with the Neo version to get a valid artifact
-minecraft_version=1.21
+minecraft_version=1.21.1
 # The Minecraft version range can use any release version of Minecraft as bounds.
 # Snapshots, pre-releases, and release candidates are not guaranteed to sort properly
 # as they do not follow standard versioning conventions.
-minecraft_version_range=[1.21,1.21.1)
+minecraft_version_range=[1.21.1,1.21.2)
 # The Neo version must agree with the Minecraft version to get a valid artifact
-neo_version=21.0.143
+neo_version=21.1.4
 # The Neo version range can use any version of Neo as bounds
-neo_version_range=[21.0.143,)
+neo_version_range=[21.1.0,)
 # The loader version range can only use the major version of FML as bounds
 loader_version_range=[4,)
 
-jei_version=19.4.0.28
+jei_version=19.9.0.120
 
 ## Mod Properties
 
@@ -34,12 +34,12 @@ mod_name=Psi
 # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
 mod_license=All Rights Reserved
 # The mod version. See https://semver.org/
-mod_version=1.21
+mod_version=1.21.1
 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
 # This should match the base package used for the mod sources.
 # See https://maven.apache.org/guides/mini/guide-naming-conventions.html
 mod_group_id=com.example.examplemod
 # The authors of the mod. This is a simple text string that is used for display purposes in the mod list.
 mod_authors=YourNameHere, OtherNameHere
 # The description of the mod. This is a simple multiline text string that is used for display purposes in the mod list.
-mod_description=Example mod description.\nNewline characters can be used and will be replaced properly.
+mod_description=Example mod description.\nNewline characters can be used and will be replaced properly.

src/main/java/vazkii/psi/api/PsiAPI.java

@@ -38,7 +38,9 @@
 import vazkii.psi.api.spell.detonator.IDetonationHandler;
 import vazkii.psi.common.item.base.ModItems;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 public final class PsiAPI {

src/main/java/vazkii/psi/api/cad/ICAD.java

@@ -8,42 +8,37 @@
  */
 package vazkii.psi.api.cad;
 
-import net.minecraft.Util;
-import net.minecraft.core.component.DataComponentType;
 import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.Items;
 import net.neoforged.api.distmarker.Dist;
 import net.neoforged.api.distmarker.OnlyIn;
-import net.neoforged.neoforge.capabilities.Capabilities;
-import net.neoforged.neoforge.items.ComponentItemHandler;
-import net.neoforged.neoforge.items.IItemHandler;
-import net.neoforged.neoforge.registries.DeferredHolder;
-import vazkii.psi.api.PsiAPI;
+import org.jetbrains.annotations.Nullable;
 import vazkii.psi.api.internal.Vector3;
 import vazkii.psi.api.spell.SpellRuntimeException;
 import vazkii.psi.api.spell.piece.PieceCraftingTrick;
 import vazkii.psi.common.item.base.ModItems;
 
-import java.util.EnumMap;
-import java.util.EnumSet;
-import java.util.Locale;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * Base interface for a CAD. You probably shouldn't implement this,
  * unless you absolutely know what you are doing.
  */
 public interface ICAD {
-    //TODO add Datafixer
-
     /**
      * Sets the component stack inside the CAD's respective component slot
      */
 
     static void setComponent(ItemStack stack, ItemStack componentStack) {
-        IItemHandler itemHandler = stack.getCapability(Capabilities.ItemHandler.ITEM);
-        if (!componentStack.isEmpty() && componentStack.getItem() instanceof ICADComponent component && itemHandler instanceof ComponentItemHandler componentItemHandler) {
+        @Nullable List<Item> items = stack.getOrDefault(ModItems.COMPONENTS, new ArrayList<>(Collections.nCopies(EnumCADComponent.values().length, Items.AIR)));
+        if (!componentStack.isEmpty() && componentStack.getItem() instanceof ICADComponent component) {
             EnumCADComponent componentType = component.getComponentType(componentStack);
-            componentItemHandler.setStackInSlot(componentType.ordinal(), componentStack);
+            items.set(componentType.ordinal(), componentStack.getItem());
+            stack.set(ModItems.COMPONENTS, items);
         }
     }
 

src/main/java/vazkii/psi/api/cad/ICADData.java

@@ -44,16 +44,6 @@ public interface ICADData extends INBTSerializable<CompoundTag> {
      */
     void setSavedVector(int memorySlot, Vector3 value);
 
-    /**
-     * Checks if the CAD should be updated
-     */
-    boolean isDirty();
-
-    /**
-     * Marks the CAD as ready to be updated
-     */
-    void markDirty(boolean isDirty);
-
     /**
      * Serializes the CAD data to be synchronized
      */

src/main/java/vazkii/psi/api/internal/Vector3.java

@@ -8,9 +8,13 @@
  */
 package vazkii.psi.api.internal;
 
+import com.mojang.serialization.Codec;
+import io.netty.buffer.ByteBuf;
+import net.minecraft.Util;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.core.Vec3i;
+import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.phys.AABB;
@@ -22,6 +26,7 @@
 import java.math.BigDecimal;
 import java.math.MathContext;
 import java.math.RoundingMode;
+import java.util.List;
 
 public class Vector3 {
     public static final Vector3 zero = new Vector3();
@@ -39,6 +44,25 @@ public class Vector3 {
     public double y;
     public double z;
 
+
+    public static final Codec<Vector3> CODEC = Codec.DOUBLE
+            .listOf()
+            .comapFlatMap(
+                    to -> Util.fixedSize((List<Double>)to, 3).map(list -> new Vector3(list.get(0), list.get(1), list.get(2))),
+                    from -> List.of(from.x, from.y, from.z)
+            );
+    public static final StreamCodec<ByteBuf, Vector3> STREAM_CODEC = new StreamCodec<ByteBuf, Vector3>() {
+        public Vector3 decode(ByteBuf buffer) {
+            return new Vector3(buffer.readDouble(), buffer.readDouble(), buffer.readDouble());
+        }
+
+        public void encode(ByteBuf buffer, Vector3 vector3) {
+            buffer.writeDouble(vector3.x);
+            buffer.writeDouble(vector3.y);
+            buffer.writeDouble(vector3.z);
+        }
+    };
+
     public Vector3() {
     }
 

src/main/java/vazkii/psi/api/material/PsimetalArmorMaterial.java

@@ -28,8 +28,7 @@ public class PsimetalArmorMaterial {
             12,
             SoundEvents.ARMOR_EQUIP_IRON,
             () -> Ingredient.of(BuiltInRegistries.ITEM.get(ResourceLocation.fromNamespaceAndPath(PsiAPI.MOD_ID, "psimetal"))),
-            List.of(new ArmorMaterial.Layer(ResourceLocation.withDefaultNamespace(""), "", true),
-                    new ArmorMaterial.Layer(ResourceLocation.withDefaultNamespace(""), "", false)),
+            List.of(new ArmorMaterial.Layer(ResourceLocation.withDefaultNamespace(""), "", true)),
             0.0F,
             0.0F));
 }

src/main/java/vazkii/psi/client/core/handler/ColorHandler.java

@@ -58,13 +58,13 @@ public static int pulseColor(int source, float speed, int magnitude) {
 
     public static int pulseColor(int source, float multiplier, float speed, int magnitude) {
         int add = (int) (Mth.sin(ClientTickHandler.ticksInGame * speed) * magnitude);
-        int red = (0xFF0000 & source) >> 16;
-        int green = (0x00FF00 & source) >> 8;
-        int blue = 0x0000FF & source;
+        int red = (0x00FF0000 & source) >> 16;
+        int green = (0x0000FF00 & source) >> 8;
+        int blue = 0x000000FF & source;
         int addedRed = Mth.clamp((int) (multiplier * (red + add)), 0, 255);
         int addedGreen = Mth.clamp((int) (multiplier * (green + add)), 0, 255);
         int addedBlue = Mth.clamp((int) (multiplier * (blue + add)), 0, 255);
-        return (addedRed << 16) | (addedGreen << 8) | addedBlue;
+        return 0xFF000000 | (addedRed << 16) | (addedGreen << 8) | addedBlue;
     }
 
     public static int slideColorTime(int color, int secondColor, float t) {
@@ -75,17 +75,17 @@ public static int slideColorTime(int color, int secondColor, float t) {
             return secondColor;
         }
 
-        int redA = (0xFF0000 & color) >> 16;
-        int greenA = (0x00FF00 & color) >> 8;
-        int blueA = 0x0000FF & color;
-        int redB = (0xFF0000 & secondColor) >> 16;
-        int greenB = (0x00FF00 & secondColor) >> 8;
-        int blueB = 0x0000FF & secondColor;
+        int redA = (0x00FF0000 & color) >> 16;
+        int greenA = (0x0000FF00 & color) >> 8;
+        int blueA = 0x000000FF & color;
+        int redB = (0x00FF0000 & secondColor) >> 16;
+        int greenB = (0x0000FF00 & secondColor) >> 8;
+        int blueB = 0x000000FF & secondColor;
 
         int newRed = (int) (redA * (1 - shift) + redB * shift);
         int newGreen = (int) (greenA * (1 - shift) + greenB * shift);
         int newBlue = (int) (blueA * (1 - shift) + blueB * shift);
-        return (newRed << 16) | (newGreen << 8) | newBlue;
+        return 0xFF000000 | (newRed << 16) | (newGreen << 8) | newBlue;
     }
 
 }

src/main/java/vazkii/psi/client/fx/ModParticles.java

@@ -10,14 +10,12 @@
 
 import net.minecraft.core.particles.ParticleType;
 import net.minecraft.core.registries.Registries;
-import net.minecraft.resources.ResourceLocation;
 import net.neoforged.api.distmarker.Dist;
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.fml.common.EventBusSubscriber;
 import net.neoforged.neoforge.client.event.RegisterParticleProvidersEvent;
 import net.neoforged.neoforge.registries.DeferredHolder;
 import net.neoforged.neoforge.registries.DeferredRegister;
-import net.neoforged.neoforge.registries.RegisterEvent;
 import vazkii.psi.api.PsiAPI;
 import vazkii.psi.common.lib.LibMisc;
 

src/main/java/vazkii/psi/client/jei/JEICompat.java

@@ -11,7 +11,7 @@
 import mezz.jei.api.IModPlugin;
 import mezz.jei.api.JeiPlugin;
 import mezz.jei.api.helpers.IJeiHelpers;
-import mezz.jei.api.ingredients.subtypes.IIngredientSubtypeInterpreter;
+import mezz.jei.api.ingredients.subtypes.ISubtypeInterpreter;
 import mezz.jei.api.ingredients.subtypes.UidContext;
 import mezz.jei.api.registration.*;
 import net.minecraft.client.Minecraft;
@@ -76,13 +76,13 @@ public void registerItemSubtypes(ISubtypeRegistration registration) {
         registration.registerSubtypeInterpreter(ModItems.cad, Cad.INSTANCE);
     }
 
-    private static class Cad implements IIngredientSubtypeInterpreter<ItemStack> {
+    private static class Cad implements ISubtypeInterpreter<ItemStack> {
         public static final Cad INSTANCE = new Cad();
 
         private Cad() {
         }
 
-        public String apply(ItemStack itemStack, UidContext context) {
+        public String getSubtypeData(ItemStack itemStack, UidContext context) {
             ItemCAD cad = (ItemCAD) itemStack.getItem();
 
             List<String> strings = new ArrayList<>();
@@ -98,5 +98,10 @@ public String apply(ItemStack itemStack, UidContext context) {
             }
             return joiner.toString();
         }
+
+        @Override
+        public String getLegacyStringSubtypeInfo(ItemStack ingredient, UidContext context) {
+            return "";
+        }
     }
 }