3.3.0

Author: ekulxam

changelog.md

@@ -1,2 +1,15 @@
-Atmospheric API 3.2.3
-- Fix trying to create an identifier of an identifier for block item registration
+Atmospheric API 3.3.0
+- Allow `AutoSendPayload#send` to accept a sync predicate
+- Create `FunctionOperations`
+- Custom Trident API
+  - Create `AtmosphericTridentRegistry` (1.21.1)
+  - Create `AtmosphericTridentModelRenderer` (1.21.4+) which can be accessed in json via `atmospheric_api:trident`
+- Allow `CreativeTabEnchantmentAdder` to accept a key of the enchantment
+  - Make `CreativeTabEnchantmentAdder` final and add a private constructor
+- Prepare for porting to 26+
+- Add spotless
+- Fix issue.yml typos
+- Add `DynamicRegistrant`s
+- Deprecate `RegistryEntryLookupContainer`
+- Add `AtmosphericCodecs$RCB` which provides `tuple` methods to create `MapCodec`s in a similar structure to `PacketCodec.tuple`/`StreamCodec.composite`
+  - Currently, this provides up to `Function4`

gradle.properties

@@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx1G
 org.gradle.parallel=true
 
 # Mod Properties
-mod_version=3.2.3
+mod_version=3.3.0
 maven_group=survivalblock.atmosphere
 archives_base_name=atmospheric_api
 

src/main/java/survivalblock/atmosphere/atmospheric_api/not_mixin/datafixer/AtmosphericCodecs.java

@@ -5,13 +5,20 @@
  */
 package survivalblock.atmosphere.atmospheric_api.not_mixin.datafixer;
 
+import com.mojang.datafixers.util.Function3;
+import com.mojang.datafixers.util.Function4;
 import com.mojang.serialization.Codec;
+import com.mojang.serialization.MapCodec;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.Vec3;
+import org.jetbrains.annotations.ApiStatus;
 import survivalblock.atmosphere.atmospheric_api.not_mixin.funny.BadAtProgramming;
 import survivalblock.atmosphere.atmospheric_api.not_mixin.util.Duo;
 
 import java.util.List;
+import java.util.function.BiFunction;
+import java.util.function.Function;
 
 @SuppressWarnings("unused")
 public interface AtmosphericCodecs {
@@ -25,4 +32,60 @@ public interface AtmosphericCodecs {
     static <E> Codec<Duo<E>> duo(Codec<E> codec) {
         return codec.listOf(2, 2).xmap(Duo::new, List::copyOf);
     }
+
+    @ApiStatus.Experimental
+    interface RCB {
+        static <O, F1> MapCodec<O> tuple(MapCodec<F1> codec, Function<O, F1> from, Function<F1, O> to) {
+            return RecordCodecBuilder.mapCodec(
+                    instance -> instance.group(
+                                    codec.forGetter(from)
+                            ).apply(instance, to)
+            );
+        }
+
+        static <O, F1, F2> MapCodec<O> tuple(
+                MapCodec<F1> codec1, Function<O, F1> from1,
+                MapCodec<F2> codec2, Function<O, F2> from2,
+                BiFunction<F1, F2, O> to
+        ) {
+            return RecordCodecBuilder.mapCodec(
+                    instance -> instance.group(
+                                    codec1.forGetter(from1),
+                                    codec2.forGetter(from2)
+                            ).apply(instance, to)
+            );
+        }
+
+        static <O, F1, F2, F3> MapCodec<O> tuple(
+                MapCodec<F1> codec1, Function<O, F1> from1,
+                MapCodec<F2> codec2, Function<O, F2> from2,
+                MapCodec<F3> codec3, Function<O, F3> from3,
+                Function3<F1, F2, F3, O> to
+        ) {
+            return RecordCodecBuilder.mapCodec(
+                    instance -> instance.group(
+                                    codec1.forGetter(from1),
+                                    codec2.forGetter(from2),
+                                    codec3.forGetter(from3)
+                            ).apply(instance, to)
+            );
+        }
+
+        static <O, F1, F2, F3, F4> MapCodec<O> tuple(
+                MapCodec<F1> codec1, Function<O, F1> from1,
+                MapCodec<F2> codec2, Function<O, F2> from2,
+                MapCodec<F3> codec3, Function<O, F3> from3,
+                MapCodec<F4> codec4, Function<O, F4> from4,
+                Function4<F1, F2, F3, F4, O> to
+        ) {
+            return RecordCodecBuilder.mapCodec(
+                    instance -> instance.group(
+                            codec1.forGetter(from1),
+                            codec2.forGetter(from2),
+                            codec3.forGetter(from3),
+                            codec4.forGetter(from4)
+                    ).apply(instance, to)
+            );
+        }
+    }
 }

src/main/java/survivalblock/atmosphere/atmospheric_api/not_mixin/datagen/RegistryEntryLookupContainer.java

@@ -14,6 +14,7 @@
 import org.jetbrains.annotations.Nullable;
 import survivalblock.atmosphere.atmospheric_api.not_mixin.funny.IsThisEvenNecessary;
 
+@Deprecated(since = "3.3.0")
 @IsThisEvenNecessary(IsThisEvenNecessary.Levels.PROBABLY_NOT)
 @SuppressWarnings("unused")
 public class RegistryEntryLookupContainer {

src/main/java/survivalblock/atmosphere/atmospheric_api/not_mixin/item/CreativeTabEnchantmentAdder.java

@@ -23,7 +23,9 @@
 import java.util.function.Supplier;
 
 @SuppressWarnings("unused")
-public class CreativeTabEnchantmentAdder {
+public final class CreativeTabEnchantmentAdder {
+    private CreativeTabEnchantmentAdder() {
+    }
 
     public static void addEnchantedStack(Item item, CreativeModeTab.ItemDisplayParameters displayContext, String enchantment, CreativeModeTab.Output entries) {
         addEnchantedStack(item, displayContext, enchantment, entries, null);

src/main/java/survivalblock/atmosphere/atmospheric_api/not_mixin/item/client/AtmosphericTridentModelRenderer.java

@@ -29,6 +29,7 @@
 import net.minecraft.world.item.ItemDisplayContext;
 import org.joml.Vector3f;
 import survivalblock.atmosphere.atmospheric_api.not_mixin.AtmosphericAPI;
+import survivalblock.atmosphere.atmospheric_api.not_mixin.datafixer.AtmosphericCodecs;
 
 import java.util.Set;
 
@@ -66,19 +67,15 @@ public void getExtents(Set<Vector3f> output) {
 
     @Environment(EnvType.CLIENT)
     public record Unbaked(ResourceLocation texture, ModelLayerLocation entityModelLayer) implements SpecialModelRenderer.Unbaked {
-        public static final Codec<ModelLayerLocation> MODEL_LAYER_CODEC = RecordCodecBuilder.create(
-                instance -> instance.group(
-                        ResourceLocation.CODEC.fieldOf("model").forGetter(ModelLayerLocation::model),
-                        Codec.STRING.optionalFieldOf("layer", "main").forGetter(ModelLayerLocation::layer)
-                    )
-                    .apply(instance, ModelLayerLocation::new)
-        );
-        public static final MapCodec<Unbaked> MAP_CODEC = RecordCodecBuilder.mapCodec(
-                instance -> instance.group(
-                        ResourceLocation.CODEC.fieldOf("texture").forGetter(unbaked -> unbaked.texture),
-						MODEL_LAYER_CODEC.optionalFieldOf("entityModelLayer", ModelLayers.TRIDENT).forGetter(unbaked -> unbaked.entityModelLayer)
-					)
-                    .apply(instance, Unbaked::new)
+        public static final Codec<ModelLayerLocation> MODEL_LAYER_CODEC = AtmosphericCodecs.RCB.tuple(
+                ResourceLocation.CODEC.fieldOf("model"), ModelLayerLocation::model,
+                Codec.STRING.optionalFieldOf("layer", "main"), ModelLayerLocation::layer,
+                ModelLayerLocation::new
+        ).codec();
+        public static final MapCodec<Unbaked> MAP_CODEC = AtmosphericCodecs.RCB.tuple(
+                ResourceLocation.CODEC.fieldOf("texture"), unbaked -> unbaked.texture,
+                MODEL_LAYER_CODEC.optionalFieldOf("entityModelLayer", ModelLayers.TRIDENT), unbaked -> unbaked.entityModelLayer,
+                Unbaked::new
         );
 
         public MapCodec<Unbaked> type() {

src/main/java/survivalblock/atmosphere/atmospheric_api/not_mixin/util/FunctionOperations.java

@@ -9,6 +9,7 @@
 import net.minecraft.world.entity.SpawnPlacements.SpawnPredicate;
 
 import java.util.function.BiFunction;
+import java.util.function.Consumer;
 import java.util.function.Predicate;
 
 @SuppressWarnings("unused")
@@ -42,4 +43,9 @@ public static <T extends Entity> SpawnPredicate<T> combine(SpawnPredicate<T> one
         return (type, world, spawnReason, blockPos, random) ->
                 operator.apply(one.test(type, world, spawnReason, blockPos, random), two.test(type, world, spawnReason, blockPos, random));
     }
+
+    public static <T> T consumeAndReturn(T obj, Consumer<T> consumer) {
+        consumer.accept(obj);
+        return obj;
+    }
 }