mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-16 19:55:06 +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
@@ -161,7 +161,7 @@ public class SyncController {
|
||||
public static NBTTagCompound customEffectsNBT(){
|
||||
NBTTagList list = new NBTTagList();
|
||||
NBTTagCompound compound = new NBTTagCompound();
|
||||
for (CustomEffect effect : StatusEffectController.getInstance().customEffects.values()) {
|
||||
for (CustomEffect effect : CustomEffectController.getInstance().customEffects.values()) {
|
||||
list.appendTag(effect.writeToNBT(false));
|
||||
}
|
||||
compound.setTag("Data", list);
|
||||
@@ -395,11 +395,12 @@ public class SyncController {
|
||||
for (int i = 0; i < list.tagCount(); i++) {
|
||||
CustomEffect effect = new CustomEffect();
|
||||
effect.readFromNBT(list.getCompoundTagAt(i));
|
||||
StatusEffectController.getInstance().customEffectsSync.put(effect.id, effect);
|
||||
ClientCacheHandler.getImageData(effect.icon);
|
||||
CustomEffectController.getInstance().customEffectsSync.put(effect.id, effect);
|
||||
}
|
||||
|
||||
StatusEffectController.getInstance().customEffects = StatusEffectController.getInstance().customEffectsSync;
|
||||
StatusEffectController.getInstance().customEffectsSync = new HashMap<>();
|
||||
CustomEffectController.getInstance().customEffects = CustomEffectController.getInstance().customEffectsSync;
|
||||
CustomEffectController.getInstance().customEffectsSync = new HashMap<>();
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -480,7 +481,7 @@ public class SyncController {
|
||||
effect.readFromNBT(compound);
|
||||
ClientCacheHandler.getImageData(effect.icon);
|
||||
|
||||
StatusEffectController.Instance.customEffects.put(effect.id, effect);
|
||||
CustomEffectController.Instance.customEffects.put(effect.id, effect);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -553,7 +554,7 @@ public class SyncController {
|
||||
case MAGIC:
|
||||
break;
|
||||
case CUSTOM_EFFECTS:
|
||||
StatusEffectController.Instance.customEffects.remove(id);
|
||||
CustomEffectController.Instance.customEffects.remove(id);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@ import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import noppes.npcs.controllers.StatusEffectController;
|
||||
import noppes.npcs.controllers.CustomEffectController;
|
||||
import noppes.npcs.controllers.data.CustomEffect;
|
||||
|
||||
import java.io.IOException;
|
||||
@@ -44,8 +44,8 @@ public final class EffectGetPacket extends AbstractPacket {
|
||||
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
|
||||
effectID = in.readInt();
|
||||
NBTTagCompound compound = new NBTTagCompound();
|
||||
if (effectID != -1 && StatusEffectController.getInstance().has(effectID)) {
|
||||
CustomEffect Effect = (CustomEffect) StatusEffectController.getInstance().get(effectID);
|
||||
if (effectID != -1 && CustomEffectController.getInstance().has(effectID)) {
|
||||
CustomEffect Effect = (CustomEffect) CustomEffectController.getInstance().get(effectID);
|
||||
if (Effect != null) {
|
||||
compound = Effect.writeToNBT(false);
|
||||
compound.setString("Type", "ViewEffect");
|
||||
|
||||
@@ -10,7 +10,7 @@ import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import noppes.npcs.NoppesUtilServer;
|
||||
import noppes.npcs.controllers.StatusEffectController;
|
||||
import noppes.npcs.controllers.CustomEffectController;
|
||||
import noppes.npcs.controllers.data.CustomEffect;
|
||||
|
||||
import java.io.IOException;
|
||||
@@ -44,7 +44,7 @@ public class EffectRemovePacket extends AbstractPacket {
|
||||
@Override
|
||||
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
|
||||
effectID = in.readInt();
|
||||
StatusEffectController.getInstance().delete(effectID);
|
||||
CustomEffectController.getInstance().delete(effectID);
|
||||
NoppesUtilServer.sendCustomEffectDataAll((EntityPlayerMP) player);
|
||||
NBTTagCompound compound = (new CustomEffect()).writeToNBT(false);
|
||||
GuiDataPacket.sendGuiData((EntityPlayerMP) player, compound);
|
||||
|
||||
@@ -10,7 +10,7 @@ import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import noppes.npcs.NoppesUtilServer;
|
||||
import noppes.npcs.controllers.StatusEffectController;
|
||||
import noppes.npcs.controllers.CustomEffectController;
|
||||
import noppes.npcs.controllers.data.CustomEffect;
|
||||
|
||||
import java.io.IOException;
|
||||
@@ -51,10 +51,10 @@ public class EffectSavePacket extends AbstractPacket {
|
||||
CustomEffect effect = new CustomEffect();
|
||||
effect.readFromNBT(ByteBufUtils.readNBT(in));
|
||||
|
||||
StatusEffectController.getInstance().saveEffect(effect);
|
||||
CustomEffectController.getInstance().saveEffect(effect);
|
||||
|
||||
if(!prevName.isEmpty() && !prevName.equals(effect.name)){
|
||||
StatusEffectController.getInstance().deleteEffectFile(prevName);
|
||||
CustomEffectController.getInstance().deleteEffectFile(prevName);
|
||||
}
|
||||
|
||||
NoppesUtilServer.sendCustomEffectDataAll((EntityPlayerMP) player);
|
||||
|
||||
@@ -10,7 +10,7 @@ import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import noppes.npcs.NoppesUtilServer;
|
||||
import noppes.npcs.controllers.StatusEffectController;
|
||||
import noppes.npcs.controllers.CustomEffectController;
|
||||
import noppes.npcs.controllers.data.CustomEffect;
|
||||
|
||||
import java.io.IOException;
|
||||
@@ -45,7 +45,7 @@ public final class EffectsGetPacket extends AbstractPacket {
|
||||
this.effectID = in.readInt();
|
||||
|
||||
if (effectID != -1) {
|
||||
CustomEffect effect = (CustomEffect) StatusEffectController.getInstance().get(effectID);
|
||||
CustomEffect effect = (CustomEffect) CustomEffectController.getInstance().get(effectID);
|
||||
if (effect != null) {
|
||||
NBTTagCompound compound = effect.writeToNBT(false);
|
||||
compound.setString("PACKETTYPE", "Effect");
|
||||
|
||||
@@ -5,7 +5,6 @@ import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import kamkeel.npcs.network.*;
|
||||
import kamkeel.npcs.network.enums.EnumItemPacketType;
|
||||
import kamkeel.npcs.network.enums.EnumRequestPacket;
|
||||
import kamkeel.npcs.util.ByteBufUtils;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -15,12 +14,10 @@ import noppes.npcs.CustomNpcsPermissions;
|
||||
import noppes.npcs.LogWriter;
|
||||
import noppes.npcs.config.ConfigDebug;
|
||||
import noppes.npcs.config.ConfigScript;
|
||||
import noppes.npcs.controllers.ScriptController;
|
||||
import noppes.npcs.controllers.StatusEffectController;
|
||||
import noppes.npcs.controllers.CustomEffectController;
|
||||
import noppes.npcs.controllers.data.CustomEffect;
|
||||
import noppes.npcs.controllers.data.EffectScriptHandler;
|
||||
import noppes.npcs.controllers.data.IScriptHandler;
|
||||
import noppes.npcs.controllers.data.PlayerDataScript;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
@@ -80,7 +77,7 @@ public final class EffectScriptPacket extends AbstractPacket {
|
||||
return;
|
||||
|
||||
Action requestedAction = Action.values()[in.readInt()];
|
||||
CustomEffect effect = StatusEffectController.getInstance().get(in.readInt());
|
||||
CustomEffect effect = CustomEffectController.getInstance().get(in.readInt());
|
||||
if(effect == null)
|
||||
return;
|
||||
|
||||
|
||||
@@ -658,7 +658,7 @@ public class NoppesUtilServer {
|
||||
|
||||
public static void sendCustomEffectDataAll(EntityPlayerMP player) {
|
||||
Map<String, Integer> map = new HashMap<String, Integer>();
|
||||
for (CustomEffect effect : StatusEffectController.getInstance().customEffects.values()) {
|
||||
for (CustomEffect effect : CustomEffectController.getInstance().customEffects.values()) {
|
||||
map.put(effect.name, effect.id);
|
||||
}
|
||||
ScrollDataPacket.sendScrollData(player, map);
|
||||
|
||||
@@ -18,7 +18,7 @@ import noppes.npcs.client.NoppesUtil;
|
||||
import noppes.npcs.client.gui.SubGuiEffectGeneral;
|
||||
import noppes.npcs.client.gui.util.*;
|
||||
import noppes.npcs.client.renderer.ImageData;
|
||||
import noppes.npcs.controllers.StatusEffectController;
|
||||
import noppes.npcs.controllers.CustomEffectController;
|
||||
import noppes.npcs.controllers.data.CustomEffect;
|
||||
import noppes.npcs.entity.EntityNPCInterface;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
@@ -112,7 +112,7 @@ public class GuiNPCManageEffects extends GuiNPCInterface2 implements ICustomScro
|
||||
effect.readFromNBT(compound);
|
||||
setSelected(effect.name);
|
||||
if (effect.id != -1) {
|
||||
StatusEffectController.getInstance().customEffects.replace(effect.id, effect);
|
||||
CustomEffectController.getInstance().customEffects.replace(effect.id, effect);
|
||||
}
|
||||
initGui();
|
||||
}
|
||||
|
||||
+6
-8
@@ -1,7 +1,6 @@
|
||||
package noppes.npcs.controllers;
|
||||
|
||||
import kamkeel.npcs.controllers.SyncController;
|
||||
import kamkeel.npcs.network.PacketClient;
|
||||
import kamkeel.npcs.network.enums.EnumSyncType;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -12,13 +11,12 @@ import noppes.npcs.CustomNpcs;
|
||||
import noppes.npcs.LogWriter;
|
||||
import noppes.npcs.NoppesUtilServer;
|
||||
import noppes.npcs.api.entity.IPlayer;
|
||||
import noppes.npcs.api.handler.IStatusEffectHandler;
|
||||
import noppes.npcs.api.handler.ICustomEffectHandler;
|
||||
import noppes.npcs.api.handler.data.ICustomEffect;
|
||||
import noppes.npcs.controllers.data.CustomEffect;
|
||||
import noppes.npcs.controllers.data.EffectKey;
|
||||
import noppes.npcs.controllers.data.EffectScriptHandler;
|
||||
import noppes.npcs.controllers.data.PlayerEffect;
|
||||
import noppes.npcs.scripted.event.PlayerEvent;
|
||||
import noppes.npcs.util.NBTJsonUtil;
|
||||
|
||||
import java.io.*;
|
||||
@@ -31,9 +29,9 @@ import java.util.zip.GZIPInputStream;
|
||||
|
||||
import static noppes.npcs.scripted.event.PlayerEvent.EffectEvent.ExpirationType;
|
||||
|
||||
public class StatusEffectController implements IStatusEffectHandler {
|
||||
public class CustomEffectController implements ICustomEffectHandler {
|
||||
|
||||
public static StatusEffectController Instance = new StatusEffectController();
|
||||
public static CustomEffectController Instance = new CustomEffectController();
|
||||
public HashMap<Integer, HashMap<Integer, CustomEffect>> indexMapper = new HashMap<>();
|
||||
|
||||
public HashMap<Integer, CustomEffect> customEffectsSync = new HashMap<>();
|
||||
@@ -45,9 +43,9 @@ public class StatusEffectController implements IStatusEffectHandler {
|
||||
private int lastUsedID = 0;
|
||||
public ConcurrentHashMap<UUID, Map<EffectKey, PlayerEffect>> playerEffects = new ConcurrentHashMap<>();
|
||||
|
||||
public StatusEffectController() {}
|
||||
public CustomEffectController() {}
|
||||
|
||||
public static StatusEffectController getInstance() {
|
||||
public static CustomEffectController getInstance() {
|
||||
return Instance;
|
||||
}
|
||||
|
||||
@@ -402,7 +400,7 @@ public class StatusEffectController implements IStatusEffectHandler {
|
||||
if (effect.duration == -100)
|
||||
continue;
|
||||
if (effect.duration <= 0) {
|
||||
CustomEffect parent = StatusEffectController.Instance.get(effect.id);
|
||||
CustomEffect parent = CustomEffectController.Instance.get(effect.id);
|
||||
if (parent != null) {
|
||||
parent.onRemoved(player, effect, ExpirationType.RUN_OUT);
|
||||
}
|
||||
@@ -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