Skip to content

Commit

Permalink
[Feature] Flammability override (#131)
Browse files Browse the repository at this point in the history
* add flammability override feature

* remove debug message

* remove debug comment

* refactoring

* update comments

* begin unified block override class

* unified class for block overrides

* call new class

* delete old individual classes

* it helps initializing fields...

* use apache methods => scans superclasses recursively

* move to feature package

* change NMS instance and map to private

* make final

* remove blastRes vanilla fields

* use Optional.of, will never return null at this point

* add type args to map

* &= and Nullable and lambda as well as comments

* updat test comment

* add example entry for obsidian

* update test comment and add nicer parsing logic together with example
  • Loading branch information
DerToaster98 authored Jul 28, 2024
1 parent b65c3be commit a723438
Show file tree
Hide file tree
Showing 4 changed files with 435 additions and 172 deletions.
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
package net.countercraft.movecraft.combat;

import net.countercraft.movecraft.combat.features.AddFiresToHitbox;
import net.countercraft.movecraft.combat.features.AntiRadar;
import net.countercraft.movecraft.combat.features.BlastResistanceOverride;
import net.countercraft.movecraft.combat.features.ContactExplosives;
import net.countercraft.movecraft.combat.features.DurabilityOverride;
import net.countercraft.movecraft.combat.features.FireballLifespan;
import net.countercraft.movecraft.combat.features.FireballPenetration;
import net.countercraft.movecraft.combat.features.ReImplementTNTTranslocation;
import net.countercraft.movecraft.combat.features.*;
import net.countercraft.movecraft.combat.features.combat.CombatRelease;
import net.countercraft.movecraft.combat.features.directors.AADirectors;
import net.countercraft.movecraft.combat.features.directors.ArrowDirectors;
Expand All @@ -19,6 +12,7 @@
import net.countercraft.movecraft.combat.features.tracers.commands.TNTTracerModeCommand;
import net.countercraft.movecraft.combat.features.tracers.commands.TNTTracerSettingCommand;
import net.countercraft.movecraft.combat.features.tracers.config.PlayerManager;
import net.countercraft.movecraft.combat.features.BlockBehaviorOverride;
import net.countercraft.movecraft.combat.features.tracking.DamageTracking;
import net.countercraft.movecraft.combat.features.tracking.FireballTracking;
import net.countercraft.movecraft.combat.features.tracking.TNTTracking;
Expand Down Expand Up @@ -90,7 +84,7 @@ public void onEnable() {
FireballLifespan.load(getConfig());
FireballPenetration.load(getConfig());
ReImplementTNTTranslocation.load(getConfig());
BlastResistanceOverride.load(getConfig());
BlockBehaviorOverride.load(getConfig());


// Register event translation listeners
Expand Down Expand Up @@ -146,11 +140,11 @@ public void onEnable() {
getCommand("movementtracersetting").setExecutor(new MovementTracerSettingCommand(playerManager));

// Modify blast resistances
BlastResistanceOverride.enable();
BlockBehaviorOverride.enable();
}

@Override
public void onDisable() {
BlastResistanceOverride.disable(); // Revert to vanilla
BlockBehaviorOverride.disable(); // Revert to vanilla
}
}

This file was deleted.

Loading

0 comments on commit a723438

Please sign in to comment.