From 40580ec50497722588c56fe2c7753294264a6880 Mon Sep 17 00:00:00 2001 From: TheBrokenRail Date: Wed, 22 Jul 2020 19:26:04 -0400 Subject: [PATCH] Tweak Effect Name --- .../energonrelics/block/VeridiumBlockBlock.java | 2 +- .../energonrelics/mixin/MixinLivingEntity.java | 14 +++++++------- .../energonrelics/potion/CustomPotions.java | 8 ++++---- .../assets/energonrelics/lang/en_us.json | 10 +++++----- ...veridium_poisoning.png => veridium_poison.png} | Bin 5 files changed, 17 insertions(+), 17 deletions(-) rename src/main/resources/assets/energonrelics/textures/mob_effect/{veridium_poisoning.png => veridium_poison.png} (100%) diff --git a/src/main/java/com/thebrokenrail/energonrelics/block/VeridiumBlockBlock.java b/src/main/java/com/thebrokenrail/energonrelics/block/VeridiumBlockBlock.java index 326c1cd..c3aa462 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/block/VeridiumBlockBlock.java +++ b/src/main/java/com/thebrokenrail/energonrelics/block/VeridiumBlockBlock.java @@ -8,6 +8,6 @@ import net.minecraft.sound.BlockSoundGroup; public class VeridiumBlockBlock extends SimpleBlock { public VeridiumBlockBlock() { - super(FabricBlockSettings.of(Material.METAL, MaterialColor.PURPLE).requiresTool().strength(3f, 6f).sounds(BlockSoundGroup.METAL).nonOpaque().lightLevel(8).emissiveLighting((state, world, pos) -> true)); + super(FabricBlockSettings.of(Material.METAL, MaterialColor.PURPLE).requiresTool().strength(3f, 6f).sounds(BlockSoundGroup.METAL).nonOpaque().lightLevel(10).emissiveLighting((state, world, pos) -> true)); } } diff --git a/src/main/java/com/thebrokenrail/energonrelics/mixin/MixinLivingEntity.java b/src/main/java/com/thebrokenrail/energonrelics/mixin/MixinLivingEntity.java index 764d073..cd48094 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/mixin/MixinLivingEntity.java +++ b/src/main/java/com/thebrokenrail/energonrelics/mixin/MixinLivingEntity.java @@ -19,7 +19,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(LivingEntity.class) public abstract class MixinLivingEntity { @Unique - private static final TrackedData HAS_VERIDIUM_POISONING = DataTracker.registerData(LivingEntity.class, TrackedDataHandlerRegistry.BOOLEAN); + private static final TrackedData HAS_VERIDIUM_POISON = DataTracker.registerData(LivingEntity.class, TrackedDataHandlerRegistry.BOOLEAN); @Shadow public abstract boolean hasStatusEffect(StatusEffect effect); @@ -32,12 +32,12 @@ public abstract class MixinLivingEntity { @Inject(at = @At("RETURN"), method = "initDataTracker") public void initDataTracker(CallbackInfo info) { - ((LivingEntity) (Object) this).getDataTracker().startTracking(HAS_VERIDIUM_POISONING, false); + ((LivingEntity) (Object) this).getDataTracker().startTracking(HAS_VERIDIUM_POISON, false); } @Inject(at = @At("RETURN"), method = "onTrackedDataSet") public void onTrackedDataSet(TrackedData data, CallbackInfo info) { - if (HAS_VERIDIUM_POISONING.equals(data)) { + if (HAS_VERIDIUM_POISON.equals(data)) { setHealth(getHealth()); } } @@ -45,16 +45,16 @@ public abstract class MixinLivingEntity { @Inject(at = @At("HEAD"), method = "tick") public void tick(CallbackInfo info) { if (!((LivingEntity) (Object) this).getEntityWorld().isClient()) { - boolean hasVeridiumPoisoning = hasStatusEffect(CustomPotions.VERIDIUM_POISONING_EFFECT.statusEffect); - if (((LivingEntity) (Object) this).getDataTracker().get(HAS_VERIDIUM_POISONING) != hasVeridiumPoisoning) { - ((LivingEntity) (Object) this).getDataTracker().set(HAS_VERIDIUM_POISONING, hasVeridiumPoisoning); + boolean hasVeridiumPoison = hasStatusEffect(CustomPotions.VERIDIUM_POISON_EFFECT.statusEffect); + if (((LivingEntity) (Object) this).getDataTracker().get(HAS_VERIDIUM_POISON) != hasVeridiumPoison) { + ((LivingEntity) (Object) this).getDataTracker().set(HAS_VERIDIUM_POISON, hasVeridiumPoison); } } } @Inject(at = @At("HEAD"), method = "getAttributeValue", cancellable = true) public void getAttributeValue(EntityAttribute attribute, CallbackInfoReturnable info) { - if (EntityAttributes.GENERIC_MAX_HEALTH.equals(attribute) && ((LivingEntity) (Object) this).getDataTracker().get(HAS_VERIDIUM_POISONING)) { + if (EntityAttributes.GENERIC_MAX_HEALTH.equals(attribute) && ((LivingEntity) (Object) this).getDataTracker().get(HAS_VERIDIUM_POISON)) { info.setReturnValue(0.5d); } } diff --git a/src/main/java/com/thebrokenrail/energonrelics/potion/CustomPotions.java b/src/main/java/com/thebrokenrail/energonrelics/potion/CustomPotions.java index 427aa35..575e352 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/potion/CustomPotions.java +++ b/src/main/java/com/thebrokenrail/energonrelics/potion/CustomPotions.java @@ -30,10 +30,10 @@ public class CustomPotions { } } - public static CustomPotion VERIDIUM_POISONING_EFFECT; + public static CustomPotion VERIDIUM_POISON_EFFECT; public static void register() { - VERIDIUM_POISONING_EFFECT = registerEffect("veridium_poisoning", 16711909); + VERIDIUM_POISON_EFFECT = registerEffect("veridium_poison", 16711909); registerBrewingRecipes(); } @@ -46,8 +46,8 @@ public class CustomPotions { } private static void registerBrewingRecipes() { - BrewingRecipeRegistryAccessor.callRegisterPotionRecipe(Potions.AWKWARD, EnergonRelics.VERIDIUM_POWDER_ITEM, VERIDIUM_POISONING_EFFECT.potion); - BrewingRecipeRegistryAccessor.callRegisterPotionRecipe(VERIDIUM_POISONING_EFFECT.potion, Items.REDSTONE, VERIDIUM_POISONING_EFFECT.longPotion); + BrewingRecipeRegistryAccessor.callRegisterPotionRecipe(Potions.AWKWARD, EnergonRelics.VERIDIUM_POWDER_ITEM, VERIDIUM_POISON_EFFECT.potion); + BrewingRecipeRegistryAccessor.callRegisterPotionRecipe(VERIDIUM_POISON_EFFECT.potion, Items.REDSTONE, VERIDIUM_POISON_EFFECT.longPotion); } } diff --git a/src/main/resources/assets/energonrelics/lang/en_us.json b/src/main/resources/assets/energonrelics/lang/en_us.json index b5fe736..5de2b12 100644 --- a/src/main/resources/assets/energonrelics/lang/en_us.json +++ b/src/main/resources/assets/energonrelics/lang/en_us.json @@ -29,9 +29,9 @@ "block.energonrelics.research_complex_generator": "Research Complex Generator", "block.energonrelics.block_breaker": "Block Breaker", "item.energonrelics.veridium_powder": "Veridium Powder", - "effect.energonrelics.veridium_poisoning": "Veridium Poisoning", - "item.minecraft.potion.effect.energonrelics.veridium_poisoning": "Potion of Degradation", - "item.minecraft.splash_potion.effect.energonrelics.veridium_poisoning": "Splash Potion of Degradation", - "item.minecraft.lingering_potion.effect.energonrelics.veridium_poisoning": "Lingering Potion of Degradation", - "item.minecraft.tipped_arrow.effect.energonrelics.veridium_poisoning": "Arrow of Degradation" + "effect.energonrelics.veridium_poison": "Veridium Poison", + "item.minecraft.potion.effect.energonrelics.veridium_poison": "Potion of Degradation", + "item.minecraft.splash_potion.effect.energonrelics.veridium_poison": "Splash Potion of Degradation", + "item.minecraft.lingering_potion.effect.energonrelics.veridium_poison": "Lingering Potion of Degradation", + "item.minecraft.tipped_arrow.effect.energonrelics.veridium_poison": "Arrow of Degradation" } \ No newline at end of file diff --git a/src/main/resources/assets/energonrelics/textures/mob_effect/veridium_poisoning.png b/src/main/resources/assets/energonrelics/textures/mob_effect/veridium_poison.png similarity index 100% rename from src/main/resources/assets/energonrelics/textures/mob_effect/veridium_poisoning.png rename to src/main/resources/assets/energonrelics/textures/mob_effect/veridium_poison.png