diff --git a/build.gradle b/build.gradle index 398c7eeaaa..39dab9904c 100644 --- a/build.gradle +++ b/build.gradle @@ -149,10 +149,25 @@ tasks.named('jar', Jar).configure { "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") ]) } + archiveClassifier = 'slim' finalizedBy 'reobfJar' } - +tasks.named('jarJar', Jar).configure { + manifest { + attributes([ + "Specification-Title": mod_id, + "Specification-Vendor": mod_authors, + "Specification-Version": "1", // We are version 1 of ourselves + "Implementation-Title": project.name, + "Implementation-Version": project.jar.archiveVersion, + "Implementation-Vendor" : mod_authors, + "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") + ]) + } + archiveClassifier = '' + finalizedBy 'reobfJarJar' +} task srcJar(type: Jar) { from(sourceSets.main.java) @@ -174,6 +189,7 @@ artifacts { publishing { publications { register('mavenJava', MavenPublication) { + jarJar.component(it) artifact jar artifact srcJar artifact apiJar diff --git a/src/main/java/wayoftime/bloodmagic/mixin/client/MixinEntity.java b/src/main/java/wayoftime/bloodmagic/mixin/client/MixinEntity.java deleted file mode 100644 index 67eee57479..0000000000 --- a/src/main/java/wayoftime/bloodmagic/mixin/client/MixinEntity.java +++ /dev/null @@ -1,17 +0,0 @@ -package wayoftime.bloodmagic.mixin.client; - -import net.minecraft.world.entity.Entity; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; - - -@Mixin(Entity.class) -public class MixinEntity -{ - - @Shadow - public double distanceToSqr(Entity p_20281_) - { - throw new IllegalStateException("Failed to shadow distanceToSqr()"); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/mixin/client/MixinLivingEntity.java b/src/main/java/wayoftime/bloodmagic/mixin/client/MixinLivingEntity.java index 590e0d6dec..cce6b6a592 100644 --- a/src/main/java/wayoftime/bloodmagic/mixin/client/MixinLivingEntity.java +++ b/src/main/java/wayoftime/bloodmagic/mixin/client/MixinLivingEntity.java @@ -2,15 +2,23 @@ import com.llamalad7.mixinextras.injector.ModifyReturnValue; import net.minecraft.client.Minecraft; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; +import net.minecraft.world.level.Level; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import wayoftime.bloodmagic.potion.BloodMagicPotions; @Mixin(LivingEntity.class) -public abstract class MixinLivingEntity extends MixinEntity +public abstract class MixinLivingEntity extends Entity { + public MixinLivingEntity(EntityType p_19870_, Level p_19871_) { + super(p_19870_, p_19871_); + throw new IllegalStateException("Instantiated MixinLivingEntity"); + } + @ModifyReturnValue( method = "isCurrentlyGlowing", at = @At(value = "RETURN") diff --git a/src/main/resources/bloodmagic.mixins.json b/src/main/resources/bloodmagic.mixins.json index 1c4a6275e1..34bb3486fa 100644 --- a/src/main/resources/bloodmagic.mixins.json +++ b/src/main/resources/bloodmagic.mixins.json @@ -6,7 +6,6 @@ "mixins": [ ], "client": [ - "client.MixinEntity", "client.MixinLivingEntity" ], "injectors": {