mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-21 16:12:17 +00:00
Rename to CustomEffectHandler
This commit is contained in:
1 parent
de0e425b87
commit
f2041e855b
12 files changed
+38
-43
No files matched your search
@@ -5,9 +5,8 @@ import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraftforge.common.util.Constants;
|
||||
import noppes.npcs.NoppesUtilServer;
|
||||
import noppes.npcs.api.entity.IPlayer;
|
||||
import noppes.npcs.api.event.IPlayerEvent;
|
||||
import noppes.npcs.api.handler.data.ICustomEffect;
|
||||
import noppes.npcs.controllers.StatusEffectController;
|
||||
import noppes.npcs.controllers.CustomEffectController;
|
||||
import noppes.npcs.scripted.event.PlayerEvent;
|
||||
|
||||
import java.util.function.Consumer;
|
||||
@@ -154,7 +153,7 @@ public class CustomEffect implements ICustomEffect {
|
||||
|
||||
@Override
|
||||
public ICustomEffect save() {
|
||||
return StatusEffectController.getInstance().saveEffect(this);
|
||||
return CustomEffectController.getInstance().saveEffect(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -256,7 +255,7 @@ public class CustomEffect implements ICustomEffect {
|
||||
if (compound.hasKey("ID"))
|
||||
id = compound.getInteger("ID");
|
||||
else
|
||||
id = StatusEffectController.Instance.getUnusedId();
|
||||
id = CustomEffectController.Instance.getUnusedId();
|
||||
name = compound.getString("name");
|
||||
|
||||
if (compound.hasKey("menuName", Constants.NBT.TAG_STRING))
|
||||
@@ -298,10 +297,10 @@ public class CustomEffect implements ICustomEffect {
|
||||
}
|
||||
|
||||
public EffectScriptHandler getScriptHandler() {
|
||||
return StatusEffectController.getInstance().customEffectScriptHandlers.get(this.id);
|
||||
return CustomEffectController.getInstance().customEffectScriptHandlers.get(this.id);
|
||||
}
|
||||
public void setScriptHandler(EffectScriptHandler handler) {
|
||||
StatusEffectController.getInstance().customEffectScriptHandlers.put(this.id, handler);
|
||||
CustomEffectController.getInstance().customEffectScriptHandlers.put(this.id, handler);
|
||||
}
|
||||
|
||||
public EffectScriptHandler getOrCreateScriptHandler() {
|
||||
|
||||
@@ -4,7 +4,7 @@ import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import noppes.npcs.api.entity.IPlayer;
|
||||
import noppes.npcs.api.handler.data.IPlayerEffect;
|
||||
import noppes.npcs.controllers.StatusEffectController;
|
||||
import noppes.npcs.controllers.CustomEffectController;
|
||||
|
||||
public class PlayerEffect implements IPlayerEffect {
|
||||
public int id;
|
||||
@@ -22,7 +22,7 @@ public class PlayerEffect implements IPlayerEffect {
|
||||
int id = nbt.getInteger("Id");
|
||||
int index = nbt.getInteger("Index");
|
||||
if (id > 0) {
|
||||
StatusEffectController controller = StatusEffectController.getInstance();
|
||||
CustomEffectController controller = CustomEffectController.getInstance();
|
||||
boolean found = controller.has(id);
|
||||
// StatusEffectController.getInstance().customEffects.containsKey(id);
|
||||
if (found) {
|
||||
@@ -74,7 +74,7 @@ public class PlayerEffect implements IPlayerEffect {
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
CustomEffect effect = StatusEffectController.getInstance().get(this.id);
|
||||
CustomEffect effect = CustomEffectController.getInstance().get(this.id);
|
||||
if(effect != null)
|
||||
return effect.getName();
|
||||
|
||||
@@ -84,7 +84,7 @@ public class PlayerEffect implements IPlayerEffect {
|
||||
@Override
|
||||
public void performEffect(IPlayer player) {
|
||||
if (player != null && player.getMCEntity() != null && player.getMCEntity() instanceof EntityPlayer) {
|
||||
CustomEffect effect = StatusEffectController.getInstance().get(this.id);
|
||||
CustomEffect effect = CustomEffectController.getInstance().get(this.id);
|
||||
if(effect != null)
|
||||
effect.onTick((EntityPlayer) player.getMCEntity(), this);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user