1.1.3 not mixin

Author: ekulxam

src/main/java/survivalblock/atmosphere/atmospheric_api/not_mixin/block/NonRegisterableBlock.java

@@ -3,16 +3,17 @@
 import net.minecraft.block.Block;
 import net.minecraft.registry.entry.RegistryEntry;
 import org.jetbrains.annotations.Nullable;
+import survivalblock.atmosphere.atmospheric_api.not_mixin.funny.DangerousAndOrUnstable;
 
 /**
  * Instances of {@link net.minecraft.block.Block} that implement this interface will not
  * have their {@link net.minecraft.registry.entry.RegistryEntry.Reference} created, and as a
  * result, will not crash when not registered. This interface is useful for when an instance of
  * {@link net.minecraft.block.Block} is needed without actually creating the block in-game.<p>
- * This interface is annotated with {@link Deprecated} because of the potential danger, instability,
+ * This interface is annotated with {@link DangerousAndOrUnstable} because of the potential danger, instability,
  * and incompatibility that may arise.
  */
-@Deprecated
+@DangerousAndOrUnstable
 public interface NonRegisterableBlock {
 
     @Nullable

src/main/java/survivalblock/atmosphere/atmospheric_api/not_mixin/compat/AtmosphericAPIMixinPlugin.java

@@ -1,23 +1,9 @@
 package survivalblock.atmosphere.atmospheric_api.not_mixin.compat;
 
 import net.fabricmc.loader.api.FabricLoader;
-import org.objectweb.asm.tree.ClassNode;
-import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
-import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
+import survivalblock.atmosphere.atmospheric_api.mixin.compat.AtmosphericMixinConfigPlugin;
 
-import java.util.List;
-import java.util.Set;
-
-public class AtmosphericAPIMixinPlugin implements IMixinConfigPlugin {
-
-    @Override
-    public void onLoad(String mixinPackage) {
-    }
-
-    @Override
-    public String getRefMapperConfig() {
-        return null;
-    }
+public class AtmosphericAPIMixinPlugin implements AtmosphericMixinConfigPlugin {
 
     @Override
     public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
@@ -28,24 +14,4 @@ public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
         }
         return true;
     }
-
-    @Override
-    public void acceptTargets(Set<String> myTargets, Set<String> otherTargets) {
-
-    }
-
-    @Override
-    public List<String> getMixins() {
-        return null;
-    }
-
-    @Override
-    public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
-
-    }
-
-    @Override
-    public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
-
-    }
 }

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

@@ -1,13 +1,6 @@
 package survivalblock.atmosphere.atmospheric_api.not_mixin.datafixer;
 
 import com.mojang.serialization.Codec;
-import com.mojang.serialization.DataResult;
-import io.netty.buffer.ByteBuf;
-import net.minecraft.network.codec.PacketCodec;
-import net.minecraft.registry.Registries;
-import net.minecraft.registry.Registry;
-import net.minecraft.sound.SoundEvent;
-import net.minecraft.util.Identifier;
 import net.minecraft.util.math.Box;
 import net.minecraft.util.math.Vec3d;
 import survivalblock.atmosphere.atmospheric_api.not_mixin.funny.BadAtProgramming;
@@ -18,17 +11,11 @@
 @SuppressWarnings("unused")
 public interface AtmosphericCodecs {
 
-    Codec<SoundEvent> SOUND_EVENT_BY_ID = viaRegistry(Registries.SOUND_EVENT);
-
     // a codec for boxes, but I don't know why you would need to use this
     // I feel like at this point I'm just making codecs for the sake of making codecs
     Codec<Box> BOX = duo(Vec3d.CODEC).xmap(duo -> new Box(duo.getFirst(), duo.getLast()),
             box -> new Duo<>(box.getMinPos(), box.getMaxPos()));
 
-    static <S> Codec<S> viaRegistry(Registry<S> registry) {
-        return Identifier.CODEC.xmap(registry::get, registry::getId);
-    }
-
     @BadAtProgramming
     static <E> Codec<Duo<E>> duo(Codec<E> codec) {
         return codec.listOf(2, 2).xmap(Duo::new, List::copyOf);

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

@@ -21,7 +21,7 @@
 @SuppressWarnings("unused")
 public interface AtmosphericPacketCodecs {
 
-    PacketCodec<ByteBuf, SoundEvent> SOUND_EVENT_BY_ID = viaRegistry(Registries.SOUND_EVENT);
+    PacketCodec<ByteBuf, SoundEvent> SOUND_EVENT_BY_ID = viaId(Registries.SOUND_EVENT);
 
     PacketCodec<ByteBuf, Vec3d> VEC3D = new PacketCodec<>() {
         public Vec3d decode(ByteBuf byteBuf) {
@@ -39,7 +39,7 @@ public void encode(ByteBuf byteBuf, Vec3d vec3d) {
             .xmap(vec3ds -> new Box(vec3ds.getFirst(), vec3ds.getSecond()),
                     box -> new Duo<>(box.getMinPos(), box.getMaxPos()));
 
-    static <V> PacketCodec<ByteBuf, V> viaRegistry(Registry<V> registry) {
+    static <V> PacketCodec<ByteBuf, V> viaId(Registry<V> registry) {
         return Identifier.PACKET_CODEC.xmap(registry::get, registry::getId);
     }
 

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

@@ -5,7 +5,7 @@
 import org.jetbrains.annotations.Nullable;
 import survivalblock.atmosphere.atmospheric_api.not_mixin.funny.IsThisEvenNecessary;
 
-@IsThisEvenNecessary(IsThisEvenNecessary.LevelsOfUnnecessity.PROBABLY_NOT)
+@IsThisEvenNecessary(IsThisEvenNecessary.Levels.PROBABLY_NOT)
 @SuppressWarnings("unused")
 public class RegistryEntryLookupContainer {
 

src/main/java/survivalblock/atmosphere/atmospheric_api/not_mixin/funny/IsThisEvenNecessary.java

@@ -7,10 +7,10 @@
 @Retention(RetentionPolicy.SOURCE)
 public @interface IsThisEvenNecessary {
 
-    LevelsOfUnnecessity value() default LevelsOfUnnecessity.NORMAL;
+    Levels value() default Levels.NORMAL;
 
     @SuppressWarnings("unused")
-    enum LevelsOfUnnecessity {
+    enum Levels {
         NORMAL,
         PROBABLY_NOT,
         BASCIALLY_DEPRECATED,

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

@@ -3,42 +3,43 @@
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import net.minecraft.advancement.criterion.UsedTotemCriterion;
 import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.damage.DamageSource;
 import net.minecraft.item.ItemStack;
 import net.minecraft.server.network.ServerPlayerEntity;
 
 @SuppressWarnings("unused")
 public interface ItemOfUndying {
 
-    default boolean canUse(LivingEntity living, ItemStack stack) {
+    default boolean canUse(LivingEntity living, ItemStack stack, DamageSource source) {
         return true;
     }
 
-    default boolean shouldSendPacket(LivingEntity living, ItemStack stack) {
+    default boolean shouldSendPacket(LivingEntity living, ItemStack stack, DamageSource source) {
         return false;
     }
 
-    default ItemStackOfUndyingS2CPayload getPacket(LivingEntity living, ItemStack stack) {
+    default ItemStackOfUndyingS2CPayload getPacket(LivingEntity living, ItemStack stack, DamageSource source) {
         return new ItemStackOfUndyingS2CPayload(stack, living.getId());
     }
 
-    default boolean shouldDecrementOnDeathCancel(LivingEntity living, ItemStack stack, int amount) {
+    default boolean shouldDecrementOnDeathCancel(LivingEntity living, ItemStack stack, int amount, DamageSource source) {
         return true;
     }
 
-    default boolean shouldIncrementStatAndTriggerCriteria(LivingEntity living, ItemStack stack) {
+    default boolean shouldIncrementStatAndTriggerCriteria(LivingEntity living, ItemStack stack, DamageSource source) {
         return true;
     }
 
     // probably not a great idea to pass an Operation here
-    default void triggerCriterion(UsedTotemCriterion instance, ServerPlayerEntity player, ItemStack stack, Operation<Void> original) {
+    default void triggerCriterion(UsedTotemCriterion instance, ServerPlayerEntity player, ItemStack stack, Operation<Void> original, DamageSource source) {
         original.call(instance, player, stack);
     }
 
-    default boolean shouldEmitGameEvent(LivingEntity living, ItemStack stack) {
+    default boolean shouldEmitGameEvent(LivingEntity living, ItemStack stack, DamageSource source) {
         return true;
     }
 
-    default void activate(LivingEntity living, ItemStack stack) {
+    default void activate(LivingEntity living, ItemStack stack, DamageSource source) {
         living.setHealth(1.0F);
         living.clearStatusEffects();
     }

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

@@ -83,7 +83,7 @@ public record SoundEventHolder(boolean shouldPlaySound, Optional<SoundEvent> sou
 
         public static final PacketCodec<RegistryByteBuf, SoundEventHolder> PACKET_CODEC = PacketCodec.tuple(
                 PacketCodecs.BOOL, (holder) -> holder.shouldPlaySound,
-                AtmosphericPacketCodecs.SOUND_EVENT_BY_ID.collect(PacketCodecs::optional), (holder) -> holder.soundEvent, // alternatively, use the PacketCodec in the SoundEvent class
+                SoundEvent.PACKET_CODEC.collect(PacketCodecs::optional), (holder) -> holder.soundEvent, // alternatively, use the PacketCodec in the SoundEvent class
                 PacketCodecs.FLOAT, (holder) -> holder.volume,
                 PacketCodecs.FLOAT, (holder) -> holder.pitch,
                 PacketCodecs.BOOL, (holder) -> holder.useDistance,

src/main/java/survivalblock/atmosphere/atmospheric_api/not_mixin/render/overlay/client/AtmosphericOverlayRegistryImpl.java

@@ -19,5 +19,6 @@ public final class AtmosphericOverlayRegistryImpl {
 
     public static void register(OverlayHolder overlayHolder) {
         OVERLAY_HOLDERS.add(overlayHolder);
+        OVERLAY_HOLDERS.sort(null);
     }
 }

src/main/java/survivalblock/atmosphere/atmospheric_api/not_mixin/render/overlay/client/OverlayHolder.java

@@ -5,18 +5,25 @@
 import net.minecraft.util.Identifier;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.Comparator;
 import java.util.function.BiFunction;
 
-public class OverlayHolder {
+public class OverlayHolder implements Comparable<OverlayHolder> {
 
     protected final Identifier texture;
     protected final BiFunction<MinecraftClient, ClientPlayerEntity, Float> opacityProvider;
     protected final boolean bypassable;
+    protected final int priority;
 
     public OverlayHolder(Identifier texture, BiFunction<MinecraftClient, ClientPlayerEntity, Float> opacityProvider, boolean bypassable) {
+        this(texture, opacityProvider, bypassable, 1000);
+    }
+
+    public OverlayHolder(Identifier texture, BiFunction<MinecraftClient, ClientPlayerEntity, Float> opacityProvider, boolean bypassable, int priority) {
         this.texture = texture;
         this.opacityProvider = opacityProvider;
         this.bypassable = bypassable;
+        this.priority = priority;
     }
 
     public Identifier getTexture() {
@@ -30,4 +37,8 @@ public boolean isBypassable() {
     public Float getOpacity(@NotNull MinecraftClient client, @NotNull ClientPlayerEntity player) {
         return this.opacityProvider.apply(client, player);
     }
+    @Override
+    public int compareTo(@NotNull OverlayHolder other) {
+        return other.priority - this.priority;
+    }
 }