Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -174,6 +189,7 @@ artifacts {
publishing {
publications {
register('mavenJava', MavenPublication) {
jarJar.component(it)
artifact jar
artifact srcJar
artifact apiJar
Expand Down
17 changes: 0 additions & 17 deletions src/main/java/wayoftime/bloodmagic/mixin/client/MixinEntity.java

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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");
}

Comment on lines +17 to +21
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this needed ? It's an abstract class and won't be instantiated

@ModifyReturnValue(
method = "isCurrentlyGlowing",
at = @At(value = "RETURN")
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/bloodmagic.mixins.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"mixins": [
],
"client": [
"client.MixinEntity",
"client.MixinLivingEntity"
],
"injectors": {
Expand Down