Update modloader version

IzzelAliz · May 1, 2024 · 6a11551 · 6a11551
1 parent b54ec03
commit 6a11551
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -4,11 +4,11 @@ A Bukkit server implementation utilizing Mixin.
 
 ![Downloads](https://img.shields.io/github/downloads/IzzelAliz/Arclight/total?style=flat-square) ![GitHub](https://img.shields.io/github/license/IzzelAliz/Arclight?style=flat-square)
 
-| Release | Forge | NeoForge | Fabric  | Status | Downloads |
-|:---------------------|:--------|:---------|:--------|:------:|:--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|
-| Whisper (1.20.4) | 49.0.38 | 20.4.215 | 0.96.11 | ACTIVE | [![1.20.4 Status](https://img.shields.io/github/actions/workflow/status/IzzelAliz/Arclight/gradle.yml?branch=Whisper&style=flat-square)](https://github.com/IzzelAliz/Arclight/actions?query=branch%3AWhisper) |
-| Trials (1.20-1.20.1) | 47.2.20 | - | -  | LTS | [![1.20.1 Status](https://img.shields.io/github/actions/workflow/status/IzzelAliz/Arclight/gradle.yml?branch=Trials&style=flat-square)](https://github.com/IzzelAliz/Arclight/actions?query=branch%3ATrials) |
-| Horn (1.19-1.19.2) | 43.3.7 | - | -  | LTS | [![Horn Status](https://img.shields.io/appveyor/build/IzzelAliz/arclight-19?style=flat-square)](https://ci.appveyor.com/project/IzzelAliz/arclight-19) |
+| Release | Forge | NeoForge | Fabric | Status | Downloads |
+|:---------------------|:--------|:---------|:-------|:------:|:--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|
+| Whisper (1.20.4) | 49.0.49 | 20.4.234 | 0.97.0 | ACTIVE | [![1.20.4 Status](https://img.shields.io/github/actions/workflow/status/IzzelAliz/Arclight/gradle.yml?branch=Whisper&style=flat-square)](https://github.com/IzzelAliz/Arclight/actions?query=branch%3AWhisper) |
+| Trials (1.20-1.20.1) | 47.2.20 | - | - | LTS | [![1.20.1 Status](https://img.shields.io/github/actions/workflow/status/IzzelAliz/Arclight/gradle.yml?branch=Trials&style=flat-square)](https://github.com/IzzelAliz/Arclight/actions?query=branch%3ATrials) |
+| Horn (1.19-1.19.2) | 43.3.7 | - | - | LTS | [![Horn Status](https://img.shields.io/appveyor/build/IzzelAliz/arclight-19?style=flat-square)](https://ci.appveyor.com/project/IzzelAliz/arclight-19) |
 
 **Legacy versions**:
 

diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/MobMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/MobMixin.java
@@ -5,7 +5,6 @@
 import io.izzel.arclight.common.bridge.core.entity.MobEntityBridge;
 import io.izzel.arclight.common.bridge.core.world.WorldBridge;
 import io.izzel.arclight.common.mod.server.ArclightServer;
-import io.izzel.arclight.mixin.Eject;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.protocol.game.ClientboundSetEntityLinkPacket;
 import net.minecraft.resources.ResourceLocation;
@@ -325,18 +324,28 @@ public ItemStack equipItemIfPossible(ItemStack stack) {
  Bukkit.getPluginManager().callEvent(new EntityUnleashEvent(this.getBukkitEntity(), EntityUnleashEvent.UnleashReason.UNKNOWN));
  }
 
- @Eject(method = "convertTo", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/Level;addFreshEntity(Lnet/minecraft/world/entity/Entity;)Z"))
- private boolean arclight$copySpawn(net.minecraft.world.level.Level world, Entity entityIn, CallbackInfoReturnable<Mob> cir) {
+ private transient boolean arclight$cancelSpawn;
+
+ @Redirect(method = "convertTo", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/Level;addFreshEntity(Lnet/minecraft/world/entity/Entity;)Z"))
+ private boolean arclight$copySpawn(net.minecraft.world.level.Level world, Entity entityIn) {
  EntityTransformEvent.TransformReason transformReason = arclight$transform == null ? EntityTransformEvent.TransformReason.UNKNOWN : arclight$transform;
  arclight$transform = null;
  if (CraftEventFactory.callEntityTransformEvent((Mob) (Object) this, (LivingEntity) entityIn, transformReason).isCancelled()) {
- cir.setReturnValue(null);
+ arclight$cancelSpawn = true;
  return false;
  } else {
  return world.addFreshEntity(entityIn);
  }
  }
 
+ @Inject(method = "convertTo", cancellable = true, at = @At(value = "INVOKE", shift = At.Shift.AFTER, target = "Lnet/minecraft/world/level/Level;addFreshEntity(Lnet/minecraft/world/entity/Entity;)Z"))
+ private <T extends Mob> void arclight$cancelSpawn(EntityType<T> entityType, boolean bl, CallbackInfoReturnable<T> cir) {
+ if (arclight$cancelSpawn) {
+ cir.setReturnValue(null);
+ }
+ arclight$cancelSpawn = false;
+ }
+
  @Inject(method = "convertTo", at = @At("RETURN"))
  private <T extends Mob> void arclight$cleanReason(EntityType<T> p_233656_1_, boolean p_233656_2_, CallbackInfoReturnable<T> cir) {
  ((WorldBridge) this.level()).bridge$pushAddEntityReason(null);

diff --git a/...ight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/LevelMixin.java b/...ight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/LevelMixin.java
@@ -61,7 +61,6 @@
 import org.spongepowered.asm.mixin.gen.Accessor;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.ModifyArg;
 import org.spongepowered.asm.mixin.injection.ModifyVariable;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@@ -382,8 +381,8 @@ public BlockEntity getBlockEntity(BlockPos pos, boolean validate) {
  return interaction;
  }
 
- @ModifyArg(method = "explode(Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/damagesource/DamageSource;Lnet/minecraft/world/level/ExplosionDamageCalculator;DDDFZLnet/minecraft/world/level/Level$ExplosionInteraction;ZLnet/minecraft/core/particles/ParticleOptions;Lnet/minecraft/core/particles/ParticleOptions;Lnet/minecraft/sounds/SoundEvent;)Lnet/minecraft/world/level/Explosion;",
- at = @At(value = "NEW", target = "(Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/damagesource/DamageSource;Lnet/minecraft/world/level/ExplosionDamageCalculator;DDDFZLnet/minecraft/world/level/Explosion$BlockInteraction;Lnet/minecraft/core/particles/ParticleOptions;Lnet/minecraft/core/particles/ParticleOptions;Lnet/minecraft/sounds/SoundEvent;)Lnet/minecraft/world/level/Explosion;"))
+ @ModifyVariable(method = "explode(Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/damagesource/DamageSource;Lnet/minecraft/world/level/ExplosionDamageCalculator;DDDFZLnet/minecraft/world/level/Level$ExplosionInteraction;ZLnet/minecraft/core/particles/ParticleOptions;Lnet/minecraft/core/particles/ParticleOptions;Lnet/minecraft/sounds/SoundEvent;)Lnet/minecraft/world/level/Explosion;",
+ at = @At(value = "LOAD", ordinal = 0))
  private Explosion.BlockInteraction arclight$standardExplodePost(Explosion.BlockInteraction interaction) {
  try {
  if (arclight$blockInteractionOverride != null) {

diff --git a/...java/io/izzel/arclight/common/mixin/core/world/level/Level_ExplosionInteractionMixin.java b/...java/io/izzel/arclight/common/mixin/core/world/level/Level_ExplosionInteractionMixin.java
@@ -12,5 +12,5 @@
 public class Level_ExplosionInteractionMixin {
 
  @TransformAccess(Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC | Opcodes.ACC_FINAL)
- private static final Level.ExplosionInteraction STANDARD = EnumHelper.addEnum(Level.ExplosionInteraction.class, "STANDARD", List.of(), List.of());
+ private static final Level.ExplosionInteraction STANDARD = EnumHelper.makeEnum(Level.ExplosionInteraction.class, "STANDARD", Level.ExplosionInteraction.values().length, List.of(), List.of());
 }
diff --git a/build.gradle b/build.gradle
@@ -18,10 +18,10 @@ allprojects {
  ext {
  minecraftVersion = '1.20.4'
  supportedPlatforms = ['forge', 'neoforge', 'fabric']
- fabricLoaderVersion = '0.15.6'
- fabricApiVersion = '0.96.11+1.20.4'
- forgeVersion = '49.0.38'
- neoForgeVersion = '20.4.215'
+ fabricLoaderVersion = '0.15.10'
+ fabricApiVersion = '0.97.0+1.20.4'
+ forgeVersion = '49.0.49'
+ neoForgeVersion = '20.4.234'
  apiVersion = '1.6.3'
  toolsVersion = '1.3.0'
  mixinVersion = '0.8.5'

diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -24,5 +24,5 @@ dependencies {
  implementation 'org.cadixdev:lorenz:0.5.8'
  implementation 'org.cadixdev:at:0.1.0-rc1'
  implementation 'net.fabricmc:lorenz-tiny:4.0.2'
- implementation "dev.architectury:architectury-loom:1.5-SNAPSHOT"
+ implementation "dev.architectury:architectury-loom:1.6-SNAPSHOT"
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 #Sun Feb 09 15:27:43 CST 2020
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists