From 401970963f9a6d12c355359ee4b8e3f77dd64b03 Mon Sep 17 00:00:00 2001 From: TheBrokenRail Date: Wed, 12 Aug 2020 16:52:09 -0400 Subject: [PATCH] 0.0.6 --- CHANGELOG.md | 3 +++ gradle.properties | 4 ++-- .../block/entity/DefensiveLaserBlockEntity.java | 3 +-- .../energonrelics/mixin/DamageSourceAccessor.java | 13 ------------- src/main/resources/energonrelics.accesswidener | 1 + src/main/resources/energonrelics.mixins.json | 1 - 6 files changed, 7 insertions(+), 18 deletions(-) delete mode 100644 src/main/java/com/thebrokenrail/energonrelics/mixin/DamageSourceAccessor.java diff --git a/CHANGELOG.md b/CHANGELOG.md index 29f7624..8e6b4b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +**Beta 0.0.6** +* Remove ``DamageSourceAccessor`` + **Beta 0.0.5** * Improve Fabric JSON diff --git a/gradle.properties b/gradle.properties index e35f0d4..0fb3cd9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,11 +6,11 @@ org.gradle.jvmargs = -Xmx1G minecraft_version = 1.16.2 curseforge_id = 398250 simple_minecraft_version = 1.16.2 - yarn_build = 1 + yarn_build = 6 fabric_loader_version = 0.9.0+build.204 # Mod Properties - mod_version = 0.0.5 + mod_version = 0.0.6 maven_group = com.thebrokenrail # Dependencies diff --git a/src/main/java/com/thebrokenrail/energonrelics/block/entity/DefensiveLaserBlockEntity.java b/src/main/java/com/thebrokenrail/energonrelics/block/entity/DefensiveLaserBlockEntity.java index 8a41c56..0bf4638 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/block/entity/DefensiveLaserBlockEntity.java +++ b/src/main/java/com/thebrokenrail/energonrelics/block/entity/DefensiveLaserBlockEntity.java @@ -5,7 +5,6 @@ import com.thebrokenrail.energonrelics.api.energy.Action; import com.thebrokenrail.energonrelics.config.HardcodedConfig; import com.thebrokenrail.energonrelics.EnergonRelics; import com.thebrokenrail.energonrelics.block.DefensiveLaserBlock; -import com.thebrokenrail.energonrelics.mixin.DamageSourceAccessor; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.entity.Entity; @@ -180,7 +179,7 @@ public class DefensiveLaserBlockEntity extends EnergyReceiverBlockEntity { return new ItemEntity(getWorld(), posVec.getX(), posVec.getY(), posVec.getZ()); } - private static final DamageSource DAMAGE_SOURCE = DamageSourceAccessor.createDamageSource(EnergonRelics.NAMESPACE + ".defensive_laser").setScaledWithDifficulty().setExplosive(); + private static final DamageSource DAMAGE_SOURCE = new DamageSource(EnergonRelics.NAMESPACE + ".defensive_laser").setScaledWithDifficulty().setExplosive(); private void fire(World world, BlockPos pos) { List entities = getEntities(entity -> true); diff --git a/src/main/java/com/thebrokenrail/energonrelics/mixin/DamageSourceAccessor.java b/src/main/java/com/thebrokenrail/energonrelics/mixin/DamageSourceAccessor.java deleted file mode 100644 index 344bb11..0000000 --- a/src/main/java/com/thebrokenrail/energonrelics/mixin/DamageSourceAccessor.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.thebrokenrail.energonrelics.mixin; - -import net.minecraft.entity.damage.DamageSource; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Invoker; - -@Mixin(DamageSource.class) -public interface DamageSourceAccessor { - @Invoker - static DamageSource createDamageSource(String name) { - throw new UnsupportedOperationException(); - } -} diff --git a/src/main/resources/energonrelics.accesswidener b/src/main/resources/energonrelics.accesswidener index 38f9695..415f811 100644 --- a/src/main/resources/energonrelics.accesswidener +++ b/src/main/resources/energonrelics.accesswidener @@ -1,2 +1,3 @@ accessWidener v1 named +accessible method net/minecraft/entity/damage/DamageSource (Ljava/lang/String;)V accessible method net/minecraft/server/command/TeleportCommand teleport (Lnet/minecraft/server/command/ServerCommandSource;Lnet/minecraft/entity/Entity;Lnet/minecraft/server/world/ServerWorld;DDDLjava/util/Set;FFLnet/minecraft/server/command/TeleportCommand$LookTarget;)V \ No newline at end of file diff --git a/src/main/resources/energonrelics.mixins.json b/src/main/resources/energonrelics.mixins.json index 17c9cc7..659f58a 100644 --- a/src/main/resources/energonrelics.mixins.json +++ b/src/main/resources/energonrelics.mixins.json @@ -9,7 +9,6 @@ ], "mixins": [ "BrewingRecipeRegistryAccessor", - "DamageSourceAccessor", "MixinDefaultBiomeFeatures", "MixinEntity", "MixinLivingEntity",