From fea8dd9628e8f4c25220b1ccb40d48102243f1a6 Mon Sep 17 00:00:00 2001
From: Boblet <hbmmods@gmail.com>
Date: Mon, 29 Aug 2022 10:28:00 +0200
Subject: [PATCH] hakita redemption arc

---
 .../java/com/hbm/items/armor/ItemModV1.java   | 20 -------------------
 .../com/hbm/items/machine/ItemRBMKRod.java    |  3 ---
 src/main/resources/assets/hbm/lang/de_DE.lang |  2 +-
 src/main/resources/assets/hbm/lang/en_US.lang |  2 +-
 4 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/src/main/java/com/hbm/items/armor/ItemModV1.java b/src/main/java/com/hbm/items/armor/ItemModV1.java
index 6d206fca6..bb5d8a3a6 100644
--- a/src/main/java/com/hbm/items/armor/ItemModV1.java
+++ b/src/main/java/com/hbm/items/armor/ItemModV1.java
@@ -7,19 +7,15 @@ import com.google.common.collect.Multimap;
 import com.hbm.handler.ArmorModHandler;
 import com.hbm.interfaces.IArmorModDash;
 
-import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.SharedMonsterAttributes;
 import net.minecraft.entity.ai.attributes.AttributeModifier;
-import net.minecraft.entity.ai.attributes.IAttributeInstance;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
-import net.minecraftforge.event.entity.living.LivingHurtEvent;
 
 public class ItemModV1 extends ItemArmorMod implements IArmorModDash {
 	
 	private static final UUID speed = UUID.fromString("1d11e63e-28c4-4e14-b09f-fe0bd1be708f");
-	public static final UUID its_to_prevent_you_from_healing = UUID.fromString("9b0ff87a-6103-482b-b515-19ef2e6721ce");
 
 	public ItemModV1() {
 		super(ArmorModHandler.extra, false, true, false, false);
@@ -48,20 +44,4 @@ public class ItemModV1 extends ItemArmorMod implements IArmorModDash {
 	public int getDashes() {
 		return 3;
 	}
-
-	@Override
-	public void modDamage(LivingHurtEvent event, ItemStack armor) {
-		
-		EntityLivingBase entity = event.entityLiving;
-		
-		IAttributeInstance attributeinstance = entity.getAttributeMap().getAttributeInstance(SharedMonsterAttributes.maxHealth);
-		
-		float health = entity.getMaxHealth();
-		
-		try {
-			attributeinstance.removeModifier(attributeinstance.getModifier(its_to_prevent_you_from_healing));
-		} catch(Exception ex) { }
-		
-		attributeinstance.applyModifier(new AttributeModifier(its_to_prevent_you_from_healing, "hakita what is this bullshit", -(entity.getMaxHealth() - health + event.ammount * 0.35), 0));
-	}
 }
diff --git a/src/main/java/com/hbm/items/machine/ItemRBMKRod.java b/src/main/java/com/hbm/items/machine/ItemRBMKRod.java
index 557892236..fa33d32ed 100644
--- a/src/main/java/com/hbm/items/machine/ItemRBMKRod.java
+++ b/src/main/java/com/hbm/items/machine/ItemRBMKRod.java
@@ -8,9 +8,6 @@ import com.hbm.tileentity.machine.rbmk.IRBMKFluxReceiver.NType;
 import com.hbm.tileentity.machine.rbmk.RBMKDials;
 import com.hbm.util.I18nUtil;
 
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang
index 20d41b0b0..5cca52ac0 100644
--- a/src/main/resources/assets/hbm/lang/de_DE.lang
+++ b/src/main/resources/assets/hbm/lang/de_DE.lang
@@ -3803,7 +3803,7 @@ trait.rbmk.depletion=Erschöpfung: %s
 trait.rbmk.diffusion=Diffusion: %s
 trait.rbmk.fluxFunc=Flux-Funktion: %s
 trait.rbmk.funcType=Funktionstyp: %s
-trait.rbmk.heat=Hitze pro 100 Flux: %s
+trait.rbmk.heat=Hitze pro Flux: %s
 trait.rbmk.melt=Schmelzpunkt: %s
 trait.rbmk.neutron.any=Alle Neutronen
 trait.rbmk.neutron.fast=Schnelle Neutronen
diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang
index 621753930..fb479e7c5 100644
--- a/src/main/resources/assets/hbm/lang/en_US.lang
+++ b/src/main/resources/assets/hbm/lang/en_US.lang
@@ -4244,7 +4244,7 @@ trait.rbmk.depletion=Depletion: %s
 trait.rbmk.diffusion=Diffusion: %s
 trait.rbmk.fluxFunc=Flux function: %s
 trait.rbmk.funcType=Function type: %s
-trait.rbmk.heat=Heat per 100 flux: %s
+trait.rbmk.heat=Heat per flux: %s
 trait.rbmk.melt=Melting point: %s
 trait.rbmk.neutron.any=All Neutrons
 trait.rbmk.neutron.fast=Fast Neutrons