xircon/Hbm-s-Nuclear-Tech-GIT
1
0
Fork 0
mirror of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git synced 2026-01-25 10:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up after cherry-picking

Browse Source 
I originally did it in my local clone of NTM-Space,
and the cherry-picking seemingly carried along
a couple of features from there by accident
This commit is contained in:
abel1502 2025-05-18 14:25:52 +03:00
parent 29e69b9c49
commit c475e4f3d3
No known key found for this signature in database
GPG Key ID: 076926596A536338
2 changed files with 4 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/hbm/handler/ability/IToolAreaAbility.java
View File

@ -92,18 +92,8 @@ public interface IToolAreaAbility extends IBaseAbility {
public boolean onDig(int level, World world, int x, int y, int z, EntityPlayer player, ItemToolAbility tool) {
Block b = world.getBlock(x, y, z);
if(!ToolConfig.recursiveStone) {
Item item = Item.getItemFromBlock(b);
List<ItemStack> stone = OreDictionary.getOres(OreDictManager.KEY_STONE);
for(ItemStack stack : stone) {
if(stack.getItem() == item)
return false;
}
List<ItemStack> cobble = OreDictionary.getOres(OreDictManager.KEY_COBBLESTONE);
for(ItemStack stack : cobble) {
if(stack.getItem() == item)
return false;
}
if(b == Blocks.stone && !ToolConfig.recursiveStone) {
return false;
}
if(b == Blocks.netherrack && !ToolConfig.recursiveNetherrack)

51
src/main/java/com/hbm/handler/ability/IWeaponAbility.java
View File

@ -159,53 +159,6 @@ public interface IWeaponAbility extends IBaseAbility {
}
};
public static final IWeaponAbility BLEND = new IWeaponAbility() {
@Override
public String getName() {
return "weapon.ability.blender";
}
public final int[] dividerAtLevel = {12};
@Override
public int levels() {
return dividerAtLevel.length;
}
@Override
public String getExtension(int level) {
return " (1:" + dividerAtLevel[level] + ")";
}
@Override
public int sortOrder() {
return SORT_ORDER_BASE + 4;
}
@Override
public void onHit(int level, World world, EntityPlayer player, Entity victim, Item tool) {
int divider = dividerAtLevel[level];
if(victim instanceof EntityLivingBase) {
EntityLivingBase living = (EntityLivingBase) victim;
if(living.getHealth() <= 0.0F) {
int count = Math.min((int)Math.ceil(living.getMaxHealth() / divider), 250); //safeguard to prevent funnies from bosses with obscene health
world.playSoundEffect(living.posX, living.posY + living.height * 0.5, living.posZ, "mob.zombie.woodbreak", 0.5F, 1.0F);
victim.attackEntityFrom(ModDamageSource.turbofan, 100);
NBTTagCompound data = new NBTTagCompound();
data.setString("type", "giblets");
data.setInteger("count", count * 4);
data.setInteger("ent", victim.getEntityId());
data.setInteger("cDiv", 5);
PacketThreading.createAllAroundThreadedPacket(new AuxParticlePacketNT(data, victim.posX, victim.posY + victim.height * 0.5, victim.posZ), new TargetPoint(victim.dimension, victim.posX, victim.posY + victim.height * 0.5, victim.posZ, 150));
living.entityDropItem(new ItemStack(ModItems.flesh, 10, 0), 0.0F);
}
}
}
};
public static final IWeaponAbility PHOSPHORUS = new IWeaponAbility() {
@Override
public String getName() {
@ -226,7 +179,7 @@ public interface IWeaponAbility extends IBaseAbility {
@Override
public int sortOrder() {
return SORT_ORDER_BASE + 5;
return SORT_ORDER_BASE + 4;
}
@Override
@ -401,7 +354,7 @@ public interface IWeaponAbility extends IBaseAbility {
};
// endregion handlers
static final IWeaponAbility[] abilities = {NONE, RADIATION, VAMPIRE, STUN, BLEND, PHOSPHORUS, FIRE, CHAINSAW, BEHEADER, BOBBLE};
static final IWeaponAbility[] abilities = {NONE, RADIATION, VAMPIRE, STUN, PHOSPHORUS, FIRE, CHAINSAW, BEHEADER, BOBBLE};
static IWeaponAbility getByName(String name) {
for(IWeaponAbility ability : abilities) {