diff --git a/README.md b/README.md index c4634d53e..001657d95 100644 --- a/README.md +++ b/README.md @@ -38,6 +38,15 @@ This mod is an ***update*** to CustomNPC and not an add-on. Do not install Custo - Markov Name Generator - Dark Mode GUI (Link Below) - 1.12 Scripting Features (Details below) +- Profile System (Multiple Character Slots) +- Quest Party System +- Item and Armor Attributes +- Magic System with Elemental Cycles +- Custom Effect Engine +- Scripted Blocks & Particles +- Compass Marks for Waypoints +- Custom Model Support +- Gecko & Dragon Block C Addons #### Scripting: - CustomNPC+ Api: [API](https://github.com/KAMKEEL/CustomNPC-Plus-API) diff --git a/build.gradle b/build.gradle index 2c7b271e8..dc3a7dd3b 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { id 'idea' } -version = "1.10.1" +version = "1.10.2" group= "kamkeel.customnpc-plus" archivesBaseName = "CustomNPC-Plus" @@ -22,10 +22,13 @@ tasks.create('updateAPI', Exec) { } // No Mixin Build Task +def gradleWrapper = System.getProperty('os.name').toLowerCase().contains('windows') ? 'gradlew.bat' : './gradlew' + tasks.create('buildNoMixin', Exec) { description 'Builds mod without embed' group 'CustomNPC+' - commandLine 'build', '-Pnomixin' + workingDir project.rootDir + commandLine gradleWrapper, 'build', '-Pnomixin' } sourceSets { diff --git a/gradle.properties b/gradle.properties index 83a8d5e6c..39f2d510a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -200,3 +200,7 @@ disableCheckstyle = true # Non-GTNH properties modVersion = 1.10 + +# Increase Gradle's JVM memory usage to avoid daemon expiration due to +# insufficient heap space on CI builds. +org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=1g diff --git a/src/api b/src/api index bbbea878f..bd03e27c4 160000 --- a/src/api +++ b/src/api @@ -1 +1 @@ -Subproject commit bbbea878fe30ea033112b0c5f1604417d4197447 +Subproject commit bd03e27c472f27d6054df40bd0c7a03a73f051d3 diff --git a/src/main/java/foxz/command/CmdNoppes.java b/src/main/java/foxz/command/CmdNoppes.java index a60d1dd8f..cd562f7e1 100644 --- a/src/main/java/foxz/command/CmdNoppes.java +++ b/src/main/java/foxz/command/CmdNoppes.java @@ -27,7 +27,12 @@ import noppes.npcs.controllers.FactionController; import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.entity.EntityNPCInterface; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; @Command( name = "noppes", diff --git a/src/main/java/foxz/commandhelper/AbstractCommandHelper.java b/src/main/java/foxz/commandhelper/AbstractCommandHelper.java index c2d62a229..f075c2ee2 100644 --- a/src/main/java/foxz/commandhelper/AbstractCommandHelper.java +++ b/src/main/java/foxz/commandhelper/AbstractCommandHelper.java @@ -19,7 +19,11 @@ import noppes.npcs.controllers.data.PlayerData; import java.lang.reflect.Constructor; import java.lang.reflect.Method; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/src/main/java/foxz/commandhelper/annotations/SubCommand.java b/src/main/java/foxz/commandhelper/annotations/SubCommand.java index 1daa73882..769f64b3c 100644 --- a/src/main/java/foxz/commandhelper/annotations/SubCommand.java +++ b/src/main/java/foxz/commandhelper/annotations/SubCommand.java @@ -1,6 +1,10 @@ package foxz.commandhelper.annotations; -import java.lang.annotation.*; +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; @Documented @Retention(value = RetentionPolicy.RUNTIME) diff --git a/src/main/java/kamkeel/npcs/command/CloneCommand.java b/src/main/java/kamkeel/npcs/command/CloneCommand.java index ac3d29606..027ff228e 100644 --- a/src/main/java/kamkeel/npcs/command/CloneCommand.java +++ b/src/main/java/kamkeel/npcs/command/CloneCommand.java @@ -17,7 +17,9 @@ import noppes.npcs.entity.EntityNPCInterface; import java.util.List; -import static kamkeel.npcs.util.ColorUtil.*; +import static kamkeel.npcs.util.ColorUtil.sendError; +import static kamkeel.npcs.util.ColorUtil.sendMessage; +import static kamkeel.npcs.util.ColorUtil.sendResult; public class CloneCommand extends CommandKamkeelBase { diff --git a/src/main/java/kamkeel/npcs/command/CommandKamkeel.java b/src/main/java/kamkeel/npcs/command/CommandKamkeel.java index 306176669..76bc80b94 100644 --- a/src/main/java/kamkeel/npcs/command/CommandKamkeel.java +++ b/src/main/java/kamkeel/npcs/command/CommandKamkeel.java @@ -13,7 +13,11 @@ import noppes.npcs.config.ConfigMain; import noppes.npcs.scripted.CustomNPCsException; import java.lang.reflect.Method; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import static kamkeel.npcs.command.EffectCommand.getSortedEffectNames; diff --git a/src/main/java/kamkeel/npcs/command/EffectCommand.java b/src/main/java/kamkeel/npcs/command/EffectCommand.java index 3cca5305e..8a6a2e669 100644 --- a/src/main/java/kamkeel/npcs/command/EffectCommand.java +++ b/src/main/java/kamkeel/npcs/command/EffectCommand.java @@ -8,7 +8,12 @@ import noppes.npcs.controllers.data.CustomEffect; import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.scripted.event.player.PlayerEvent.EffectEvent.ExpirationType; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import static kamkeel.npcs.util.ColorUtil.sendError; import static kamkeel.npcs.util.ColorUtil.sendResult; diff --git a/src/main/java/kamkeel/npcs/command/SlayCommand.java b/src/main/java/kamkeel/npcs/command/SlayCommand.java index 260ef99c8..dd60e2099 100644 --- a/src/main/java/kamkeel/npcs/command/SlayCommand.java +++ b/src/main/java/kamkeel/npcs/command/SlayCommand.java @@ -18,7 +18,11 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.util.AxisAlignedBB; import noppes.npcs.entity.EntityNPCInterface; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; import static kamkeel.npcs.util.ColorUtil.sendResult; diff --git a/src/main/java/kamkeel/npcs/command/profile/CommandProfileAdmin.java b/src/main/java/kamkeel/npcs/command/profile/CommandProfileAdmin.java index 94c7d4b50..9fac5f0fd 100644 --- a/src/main/java/kamkeel/npcs/command/profile/CommandProfileAdmin.java +++ b/src/main/java/kamkeel/npcs/command/profile/CommandProfileAdmin.java @@ -12,7 +12,9 @@ import java.io.File; import java.util.Map; import java.util.UUID; -import static kamkeel.npcs.util.ColorUtil.*; +import static kamkeel.npcs.util.ColorUtil.sendError; +import static kamkeel.npcs.util.ColorUtil.sendMessage; +import static kamkeel.npcs.util.ColorUtil.sendResult; public class CommandProfileAdmin extends CommandProfileBase { diff --git a/src/main/java/kamkeel/npcs/command/profile/CommandProfileRegion.java b/src/main/java/kamkeel/npcs/command/profile/CommandProfileRegion.java index 4c6e9ff1e..8f5a1b39c 100644 --- a/src/main/java/kamkeel/npcs/command/profile/CommandProfileRegion.java +++ b/src/main/java/kamkeel/npcs/command/profile/CommandProfileRegion.java @@ -7,7 +7,9 @@ import noppes.npcs.config.ConfigMain; import java.util.ArrayList; import java.util.List; -import static kamkeel.npcs.util.ColorUtil.*; +import static kamkeel.npcs.util.ColorUtil.sendError; +import static kamkeel.npcs.util.ColorUtil.sendMessage; +import static kamkeel.npcs.util.ColorUtil.sendResult; public class CommandProfileRegion extends CommandProfileBase { @@ -76,7 +78,7 @@ public class CommandProfileRegion extends CommandProfileBase { for (List region : ConfigMain.RestrictedProfileRegions) { StringBuilder sb = new StringBuilder(); for (int i = 0; i < region.size(); i++) { - if (i > 0) sb.append(" "); + if (i > 0) sb.append(", "); sb.append(region.get(i)); } regionStrings.add(sb.toString()); diff --git a/src/main/java/kamkeel/npcs/controllers/ProfileController.java b/src/main/java/kamkeel/npcs/controllers/ProfileController.java index 7a3a7d8e4..ceb138285 100644 --- a/src/main/java/kamkeel/npcs/controllers/ProfileController.java +++ b/src/main/java/kamkeel/npcs/controllers/ProfileController.java @@ -1,10 +1,21 @@ package kamkeel.npcs.controllers; -import kamkeel.npcs.controllers.data.profile.*; +import kamkeel.npcs.controllers.AttributeController; +import kamkeel.npcs.controllers.data.profile.CNPCData; +import kamkeel.npcs.controllers.data.profile.EnumProfileOperation; +import kamkeel.npcs.controllers.data.profile.IProfileData; +import kamkeel.npcs.controllers.data.profile.Profile; +import kamkeel.npcs.controllers.data.profile.ProfileInfoEntry; +import kamkeel.npcs.controllers.data.profile.ProfileOperation; +import kamkeel.npcs.controllers.data.profile.Slot; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.*; +import noppes.npcs.CustomNpcs; +import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.EventHooks; +import noppes.npcs.LogWriter; +import noppes.npcs.NoppesUtilServer; import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.handler.IPlayerData; import noppes.npcs.api.handler.IProfileHandler; @@ -20,13 +31,27 @@ import noppes.npcs.scripted.NpcAPI; import noppes.npcs.util.CustomNPCsThreader; import noppes.npcs.util.NBTJsonUtil; -import java.io.*; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStreamReader; import java.net.HttpURLConnection; import java.net.URL; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Comparator; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; -import static noppes.npcs.CustomNpcsPermissions.*; +import static noppes.npcs.CustomNpcsPermissions.PROFILE_MAX; +import static noppes.npcs.CustomNpcsPermissions.PROFILE_REGION_BYPASS; +import static noppes.npcs.CustomNpcsPermissions.hasCustomPermission; public class ProfileController implements IProfileHandler { @@ -110,10 +135,20 @@ public class ProfileController implements IProfileHandler { profile.currentSlotId = 0; saveSlotData(player); } + if (!profile.getSlots().containsKey(profile.currentSlotId)) { + profile.currentSlotId = 0; + } + profile.player = player; activeProfiles.put(player.getUniqueID(), profile); + + PlayerData pdata = PlayerData.get(player); + if (profile.getSlots().containsKey(pdata.profileSlot)) { + profile.currentSlotId = pdata.profileSlot; + } + + saveSlotData(player); verifySlotQuests(profile.player); - save(player, profile); } } @@ -147,9 +182,9 @@ public class ProfileController implements IProfileHandler { public synchronized void saveOffline(Profile profile, UUID uuid) { profile.setLocked(true); + final NBTTagCompound compound = profile.writeToNBT(); + final String filename = uuid.toString() + ".dat"; CustomNPCsThreader.customNPCThread.execute(() -> { - final NBTTagCompound compound = profile.writeToNBT(); - final String filename = uuid.toString() + ".dat"; try { File saveDir = getProfileDir(); File fileNew = new File(saveDir, filename + "_new"); @@ -170,9 +205,9 @@ public class ProfileController implements IProfileHandler { public synchronized void save(EntityPlayer player, Profile profile) { profile.setLocked(true); + final NBTTagCompound compound = profile.writeToNBT(); + final String filename = player.getUniqueID() + ".dat"; CustomNPCsThreader.customNPCThread.execute(() -> { - final NBTTagCompound compound = profile.writeToNBT(); - final String filename = player.getUniqueID() + ".dat"; try { File saveDir = getProfileDir(); File fileNew = new File(saveDir, filename + "_new"); @@ -243,8 +278,10 @@ public class ProfileController implements IProfileHandler { } public synchronized void logout(EntityPlayer player) { - if (player != null) { - activeProfiles.remove(player.getUniqueID()); + if (player != null && activeProfiles.containsKey(player.getUniqueID())) { + saveSlotData(player); + Profile profile = activeProfiles.get(player.getUniqueID()); + save(player, profile); } } @@ -616,10 +653,11 @@ public class ProfileController implements IProfileHandler { ISlot slot = profile.getSlots().get(profile.getCurrentSlotId()); if (slot == null) return; + for (IProfileData profileData : profileTypes.values()) { NBTTagCompound data; if (slot.getComponents().containsKey(profileData.getTagName())) - data = slot.getComponentData(profileData.getTagName()); + data = (NBTTagCompound) slot.getComponentData(profileData.getTagName()).copy(); else data = new NBTTagCompound(); profileData.setNBT(player, data); @@ -656,7 +694,7 @@ public class ProfileController implements IProfileHandler { ISlot slot = profile.getSlots().get(slotId); for (IProfileData pd : dataList) { if (slot.getComponents().containsKey(pd.getTagName())) { - NBTTagCompound sub = slot.getComponentData(pd.getTagName()); + NBTTagCompound sub = (NBTTagCompound) slot.getComponentData(pd.getTagName()).copy(); List subInfo = pd.getInfo(player, sub); infoList.addAll(subInfo); } @@ -770,6 +808,8 @@ public class ProfileController implements IProfileHandler { NBTTagCompound compound = slot.getComponentData(new CNPCData().getTagName()); if (compound == null) compound = new NBTTagCompound(); + else + compound = (NBTTagCompound) compound.copy(); playerData.setNBT(compound); return playerData; } diff --git a/src/main/java/kamkeel/npcs/controllers/SyncController.java b/src/main/java/kamkeel/npcs/controllers/SyncController.java index 03a923485..02830966c 100644 --- a/src/main/java/kamkeel/npcs/controllers/SyncController.java +++ b/src/main/java/kamkeel/npcs/controllers/SyncController.java @@ -9,13 +9,31 @@ import kamkeel.npcs.network.enums.EnumSyncType; import kamkeel.npcs.network.packets.data.LoginPacket; import kamkeel.npcs.network.packets.data.large.SyncEffectPacket; import kamkeel.npcs.network.packets.data.large.SyncPacket; +import kamkeel.npcs.network.packets.request.party.PartyInfoPacket; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import noppes.npcs.client.ClientCacheHandler; -import noppes.npcs.controllers.*; -import noppes.npcs.controllers.data.*; +import noppes.npcs.controllers.CustomEffectController; +import noppes.npcs.controllers.DialogController; +import noppes.npcs.controllers.FactionController; +import noppes.npcs.controllers.MagicController; +import noppes.npcs.controllers.QuestController; +import noppes.npcs.controllers.RecipeController; +import noppes.npcs.controllers.data.CustomEffect; +import noppes.npcs.controllers.data.Dialog; +import noppes.npcs.controllers.data.DialogCategory; +import noppes.npcs.controllers.data.EffectKey; +import noppes.npcs.controllers.data.Faction; +import noppes.npcs.controllers.data.Magic; +import noppes.npcs.controllers.data.MagicCycle; +import noppes.npcs.controllers.data.PlayerData; +import noppes.npcs.controllers.data.PlayerEffect; +import noppes.npcs.controllers.data.Quest; +import noppes.npcs.controllers.data.QuestCategory; +import noppes.npcs.controllers.data.RecipeAnvil; +import noppes.npcs.controllers.data.RecipeCarpentry; import java.util.HashMap; import java.util.concurrent.ConcurrentHashMap; @@ -97,6 +115,9 @@ public class SyncController { DBCAddon.instance.syncPlayer(player); syncPlayerData(player, false); + + // Send party information to the player on login + PartyInfoPacket.sendPartyData(player); } public static NBTTagCompound workbenchNBT() { @@ -104,7 +125,7 @@ public class SyncController { NBTTagList list = new NBTTagList(); NBTTagCompound compound = new NBTTagCompound(); for (RecipeCarpentry recipe : controller.globalRecipes.values()) { - list.appendTag(recipe.writeNBT()); + list.appendTag(recipe.writeNBT(false)); } compound.setTag("recipes", list); return compound; @@ -115,7 +136,7 @@ public class SyncController { NBTTagList list = new NBTTagList(); NBTTagCompound compound = new NBTTagCompound(); for (RecipeCarpentry recipe : controller.carpentryRecipes.values()) { - list.appendTag(recipe.writeNBT()); + list.appendTag(recipe.writeNBT(false)); } compound.setTag("recipes", list); return compound; @@ -126,7 +147,7 @@ public class SyncController { NBTTagList list = new NBTTagList(); NBTTagCompound compound = new NBTTagCompound(); for (RecipeAnvil recipe : controller.anvilRecipes.values()) { - list.appendTag(recipe.writeNBT()); + list.appendTag(recipe.writeNBT(false)); } compound.setTag("recipes", list); return compound; @@ -426,7 +447,9 @@ public class SyncController { return; for (int i = 0; i < list.tagCount(); i++) { - RecipeCarpentry recipe = RecipeCarpentry.read(list.getCompoundTagAt(i)); + NBTTagCompound recipeCompound = list.getCompoundTagAt(i); + RecipeCarpentry recipe = RecipeCarpentry.create(recipeCompound); + recipe.readNBT(recipeCompound); RecipeController.syncRecipes.put(recipe.id, recipe); } @@ -440,7 +463,9 @@ public class SyncController { return; for (int i = 0; i < list.tagCount(); i++) { - RecipeCarpentry recipe = RecipeCarpentry.read(list.getCompoundTagAt(i)); + NBTTagCompound recipeCompound = list.getCompoundTagAt(i); + RecipeCarpentry recipe = RecipeCarpentry.create(recipeCompound); + recipe.readNBT(recipeCompound); RecipeController.syncRecipes.put(recipe.id, recipe); } @@ -454,7 +479,8 @@ public class SyncController { return; for (int i = 0; i < list.tagCount(); i++) { - RecipeAnvil recipe = RecipeAnvil.read(list.getCompoundTagAt(i)); + RecipeAnvil recipe = new RecipeAnvil(); + recipe.readNBT(list.getCompoundTagAt(i)); RecipeController.syncAnvilRecipes.put(recipe.id, recipe); } diff --git a/src/main/java/kamkeel/npcs/controllers/data/attribute/requirement/types/SoulbindRequirement.java b/src/main/java/kamkeel/npcs/controllers/data/attribute/requirement/types/SoulbindRequirement.java index a8ceb2031..c23be055e 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/attribute/requirement/types/SoulbindRequirement.java +++ b/src/main/java/kamkeel/npcs/controllers/data/attribute/requirement/types/SoulbindRequirement.java @@ -3,6 +3,7 @@ package kamkeel.npcs.controllers.data.attribute.requirement.types; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; +import kamkeel.npcs.controllers.ProfileController; import kamkeel.npcs.controllers.data.attribute.requirement.IRequirementChecker; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; @@ -83,7 +84,25 @@ public class SoulbindRequirement implements IRequirementChecker { @Override public void apply(NBTTagCompound nbt, Object value) { if (value instanceof String) { - nbt.setString(getKey(), (String) value); + String entry = (String) value; + if (entry.isEmpty()) + return; + + // Check if the provided value is already a valid UUID + UUID uuid = null; + try { + uuid = UUID.fromString(entry); + } catch (Exception ignored) { + } + + // If not a UUID, attempt to treat the value as a username + if (uuid == null) { + uuid = ProfileController.Instance.getUUIDFromUsername(entry); + } + + if (uuid != null) { + nbt.setString(getKey(), uuid.toString()); + } } } diff --git a/src/main/java/kamkeel/npcs/controllers/data/profile/Profile.java b/src/main/java/kamkeel/npcs/controllers/data/profile/Profile.java index 857d169f6..04ce9b66c 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/profile/Profile.java +++ b/src/main/java/kamkeel/npcs/controllers/data/profile/Profile.java @@ -81,7 +81,8 @@ public class Profile implements IProfile { compound.setInteger("CurrentSlotId", currentSlotId); NBTTagCompound slotsCompound = new NBTTagCompound(); for (Map.Entry entry : slots.entrySet()) { - // Save only non-temporary slots. + // Temporary slots (typically using negative IDs) are kept in memory + // only and skipped here so they never persist to disk. if (entry.getValue().isTemporary()) continue; slotsCompound.setTag(String.valueOf(entry.getKey()), entry.getValue().toNBT()); diff --git a/src/main/java/kamkeel/npcs/network/PacketHandler.java b/src/main/java/kamkeel/npcs/network/PacketHandler.java index d1a5df29b..dfb8a39a9 100644 --- a/src/main/java/kamkeel/npcs/network/PacketHandler.java +++ b/src/main/java/kamkeel/npcs/network/PacketHandler.java @@ -8,14 +8,59 @@ import cpw.mods.fml.common.network.internal.FMLProxyPacket; import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; import kamkeel.npcs.network.enums.EnumChannelType; -import kamkeel.npcs.network.packets.data.*; -import kamkeel.npcs.network.packets.data.gui.*; -import kamkeel.npcs.network.packets.data.large.*; -import kamkeel.npcs.network.packets.data.npc.*; +import kamkeel.npcs.network.packets.data.AchievementPacket; +import kamkeel.npcs.network.packets.data.ChatAlertPacket; +import kamkeel.npcs.network.packets.data.ChatBubblePacket; +import kamkeel.npcs.network.packets.data.ClonerPacket; +import kamkeel.npcs.network.packets.data.ConfigCommandPacket; +import kamkeel.npcs.network.packets.data.DisableMouseInputPacket; +import kamkeel.npcs.network.packets.data.LoginPacket; +import kamkeel.npcs.network.packets.data.MarkDataPacket; +import kamkeel.npcs.network.packets.data.OverlayQuestTrackingPacket; +import kamkeel.npcs.network.packets.data.ParticlePacket; +import kamkeel.npcs.network.packets.data.PlayerDataInfoPacket; +import kamkeel.npcs.network.packets.data.PlayerUpdateSkinOverlaysPacket; +import kamkeel.npcs.network.packets.data.QuestCompletionPacket; +import kamkeel.npcs.network.packets.data.ScrollSelectedPacket; +import kamkeel.npcs.network.packets.data.SoundManagementPacket; +import kamkeel.npcs.network.packets.data.SwingPlayerArmPacket; +import kamkeel.npcs.network.packets.data.UpdateAnimationsPacket; +import kamkeel.npcs.network.packets.data.VillagerListPacket; +import kamkeel.npcs.network.packets.data.gui.GuiClosePacket; +import kamkeel.npcs.network.packets.data.gui.GuiErrorPacket; +import kamkeel.npcs.network.packets.data.gui.GuiOpenBookPacket; +import kamkeel.npcs.network.packets.data.gui.GuiOpenPacket; +import kamkeel.npcs.network.packets.data.gui.GuiRedstonePacket; +import kamkeel.npcs.network.packets.data.gui.GuiTeleporterPacket; +import kamkeel.npcs.network.packets.data.gui.GuiWaypointPacket; +import kamkeel.npcs.network.packets.data.gui.IsGuiOpenPacket; +import kamkeel.npcs.network.packets.data.large.GuiDataPacket; +import kamkeel.npcs.network.packets.data.large.PartyDataPacket; +import kamkeel.npcs.network.packets.data.large.ScrollDataPacket; +import kamkeel.npcs.network.packets.data.large.ScrollListPacket; +import kamkeel.npcs.network.packets.data.large.SyncEffectPacket; +import kamkeel.npcs.network.packets.data.large.SyncPacket; +import kamkeel.npcs.network.packets.data.npc.DeleteNpcPacket; +import kamkeel.npcs.network.packets.data.npc.DialogPacket; +import kamkeel.npcs.network.packets.data.npc.EditNpcPacket; +import kamkeel.npcs.network.packets.data.npc.RolePacket; +import kamkeel.npcs.network.packets.data.npc.UpdateNpcPacket; +import kamkeel.npcs.network.packets.data.npc.WeaponNpcPacket; import kamkeel.npcs.network.packets.data.script.ScriptOverlayClosePacket; import kamkeel.npcs.network.packets.data.script.ScriptOverlayDataPacket; import kamkeel.npcs.network.packets.data.script.ScriptedParticlePacket; -import kamkeel.npcs.network.packets.player.*; +import kamkeel.npcs.network.packets.player.BankActionPacket; +import kamkeel.npcs.network.packets.player.CheckPlayerValue; +import kamkeel.npcs.network.packets.player.CompanionActionPacket; +import kamkeel.npcs.network.packets.player.DialogSelectPacket; +import kamkeel.npcs.network.packets.player.FollowerPacket; +import kamkeel.npcs.network.packets.player.GetNPCRole; +import kamkeel.npcs.network.packets.player.InputDevicePacket; +import kamkeel.npcs.network.packets.player.MailActionPacket; +import kamkeel.npcs.network.packets.player.SaveBookPacket; +import kamkeel.npcs.network.packets.player.SaveSignPacket; +import kamkeel.npcs.network.packets.player.ScreenSizePacket; +import kamkeel.npcs.network.packets.player.TransportPacket; import kamkeel.npcs.network.packets.player.customgui.CustomGuiButtonPacket; import kamkeel.npcs.network.packets.player.customgui.CustomGuiClosePacket; import kamkeel.npcs.network.packets.player.customgui.CustomGuiUnfocusedPacket; @@ -23,8 +68,21 @@ import kamkeel.npcs.network.packets.player.customgui.CustomScrollClickPacket; import kamkeel.npcs.network.packets.player.item.GuiMagicBookPacket; import kamkeel.npcs.network.packets.player.item.GuiPaintbrushPacket; import kamkeel.npcs.network.packets.player.item.MagicCyclesPacket; -import kamkeel.npcs.network.packets.player.profile.*; -import kamkeel.npcs.network.packets.request.*; +import kamkeel.npcs.network.packets.player.profile.ProfileChangePacket; +import kamkeel.npcs.network.packets.player.profile.ProfileCreatePacket; +import kamkeel.npcs.network.packets.player.profile.ProfileGetInfoPacket; +import kamkeel.npcs.network.packets.player.profile.ProfileGetPacket; +import kamkeel.npcs.network.packets.player.profile.ProfileRemovePacket; +import kamkeel.npcs.network.packets.player.profile.ProfileRenamePacket; +import kamkeel.npcs.network.packets.request.DimensionsGetPacket; +import kamkeel.npcs.network.packets.request.GuiRequestPacket; +import kamkeel.npcs.network.packets.request.IsGuiOpenInform; +import kamkeel.npcs.network.packets.request.MailOpenSetupPacket; +import kamkeel.npcs.network.packets.request.MerchantUpdatePacket; +import kamkeel.npcs.network.packets.request.MountPacket; +import kamkeel.npcs.network.packets.request.TileEntityGetPacket; +import kamkeel.npcs.network.packets.request.TileEntitySavePacket; +import kamkeel.npcs.network.packets.request.TraderMarketSavePacket; import kamkeel.npcs.network.packets.request.animation.AnimationGetPacket; import kamkeel.npcs.network.packets.request.animation.AnimationRemovePacket; import kamkeel.npcs.network.packets.request.animation.AnimationSavePacket; @@ -33,13 +91,35 @@ import kamkeel.npcs.network.packets.request.bank.BankGetPacket; import kamkeel.npcs.network.packets.request.bank.BankRemovePacket; import kamkeel.npcs.network.packets.request.bank.BankSavePacket; import kamkeel.npcs.network.packets.request.bank.BanksGetPacket; -import kamkeel.npcs.network.packets.request.clone.*; -import kamkeel.npcs.network.packets.request.dialog.*; +import kamkeel.npcs.network.packets.request.clone.CloneAllTagsPacket; +import kamkeel.npcs.network.packets.request.clone.CloneAllTagsShortPacket; +import kamkeel.npcs.network.packets.request.clone.CloneListPacket; +import kamkeel.npcs.network.packets.request.clone.ClonePreSavePacket; +import kamkeel.npcs.network.packets.request.clone.CloneRemovePacket; +import kamkeel.npcs.network.packets.request.clone.CloneSavePacket; +import kamkeel.npcs.network.packets.request.clone.CloneTagListPacket; +import kamkeel.npcs.network.packets.request.clone.MobSpawnerPacket; +import kamkeel.npcs.network.packets.request.clone.SpawnMobPacket; +import kamkeel.npcs.network.packets.request.dialog.DialogCategoriesGetPacket; +import kamkeel.npcs.network.packets.request.dialog.DialogCategoryGetPacket; +import kamkeel.npcs.network.packets.request.dialog.DialogCategoryRemovePacket; +import kamkeel.npcs.network.packets.request.dialog.DialogCategorySavePacket; +import kamkeel.npcs.network.packets.request.dialog.DialogGetPacket; +import kamkeel.npcs.network.packets.request.dialog.DialogNpcGetPacket; +import kamkeel.npcs.network.packets.request.dialog.DialogNpcRemovePacket; +import kamkeel.npcs.network.packets.request.dialog.DialogNpcSetPacket; +import kamkeel.npcs.network.packets.request.dialog.DialogRemovePacket; +import kamkeel.npcs.network.packets.request.dialog.DialogSavePacket; +import kamkeel.npcs.network.packets.request.dialog.DialogsGetPacket; import kamkeel.npcs.network.packets.request.effects.EffectGetPacket; import kamkeel.npcs.network.packets.request.effects.EffectRemovePacket; import kamkeel.npcs.network.packets.request.effects.EffectSavePacket; import kamkeel.npcs.network.packets.request.effects.EffectsGetPacket; -import kamkeel.npcs.network.packets.request.faction.*; +import kamkeel.npcs.network.packets.request.faction.FactionGetPacket; +import kamkeel.npcs.network.packets.request.faction.FactionRemovePacket; +import kamkeel.npcs.network.packets.request.faction.FactionSavePacket; +import kamkeel.npcs.network.packets.request.faction.FactionSetPacket; +import kamkeel.npcs.network.packets.request.faction.FactionsGetPacket; import kamkeel.npcs.network.packets.request.feather.DimensionTeleportPacket; import kamkeel.npcs.network.packets.request.item.ColorBrushPacket; import kamkeel.npcs.network.packets.request.item.ColorSetPacket; @@ -48,19 +128,79 @@ import kamkeel.npcs.network.packets.request.jobs.JobGetPacket; import kamkeel.npcs.network.packets.request.jobs.JobSavePacket; import kamkeel.npcs.network.packets.request.jobs.JobSpawnerAddPacket; import kamkeel.npcs.network.packets.request.jobs.JobSpawnerRemovePacket; -import kamkeel.npcs.network.packets.request.linked.*; -import kamkeel.npcs.network.packets.request.magic.*; -import kamkeel.npcs.network.packets.request.mainmenu.*; +import kamkeel.npcs.network.packets.request.linked.LinkedGetAllPacket; +import kamkeel.npcs.network.packets.request.linked.LinkedGetPacket; +import kamkeel.npcs.network.packets.request.linked.LinkedItemBuildPacket; +import kamkeel.npcs.network.packets.request.linked.LinkedItemRemovePacket; +import kamkeel.npcs.network.packets.request.linked.LinkedItemSavePacket; +import kamkeel.npcs.network.packets.request.linked.LinkedNPCAddPacket; +import kamkeel.npcs.network.packets.request.linked.LinkedNPCRemovePacket; +import kamkeel.npcs.network.packets.request.linked.LinkedSetPacket; +import kamkeel.npcs.network.packets.request.magic.MagicCycleRemovePacket; +import kamkeel.npcs.network.packets.request.magic.MagicCycleSavePacket; +import kamkeel.npcs.network.packets.request.magic.MagicGetAllPacket; +import kamkeel.npcs.network.packets.request.magic.MagicGetPacket; +import kamkeel.npcs.network.packets.request.magic.MagicNpcGetPacket; +import kamkeel.npcs.network.packets.request.magic.MagicNpcSavePacket; +import kamkeel.npcs.network.packets.request.magic.MagicRemovePacket; +import kamkeel.npcs.network.packets.request.magic.MagicSavePacket; +import kamkeel.npcs.network.packets.request.mainmenu.MainmenuAIGetPacket; +import kamkeel.npcs.network.packets.request.mainmenu.MainmenuAISavePacket; +import kamkeel.npcs.network.packets.request.mainmenu.MainmenuAdvancedGetPacket; +import kamkeel.npcs.network.packets.request.mainmenu.MainmenuAdvancedMarkDataPacket; +import kamkeel.npcs.network.packets.request.mainmenu.MainmenuAdvancedSavePacket; +import kamkeel.npcs.network.packets.request.mainmenu.MainmenuDisplayGetPacket; +import kamkeel.npcs.network.packets.request.mainmenu.MainmenuDisplaySavePacket; +import kamkeel.npcs.network.packets.request.mainmenu.MainmenuInvGetPacket; +import kamkeel.npcs.network.packets.request.mainmenu.MainmenuInvSavePacket; +import kamkeel.npcs.network.packets.request.mainmenu.MainmenuStatsGetPacket; +import kamkeel.npcs.network.packets.request.mainmenu.MainmenuStatsSavePacket; import kamkeel.npcs.network.packets.request.naturalspawns.NaturalSpawnGetAllPacket; import kamkeel.npcs.network.packets.request.naturalspawns.NaturalSpawnGetPacket; import kamkeel.npcs.network.packets.request.naturalspawns.NaturalSpawnRemovePacket; import kamkeel.npcs.network.packets.request.naturalspawns.NaturalSpawnSavePacket; -import kamkeel.npcs.network.packets.request.npc.*; -import kamkeel.npcs.network.packets.request.party.*; +import kamkeel.npcs.network.packets.request.npc.ModelDataSavePacket; +import kamkeel.npcs.network.packets.request.npc.NpcClosePacket; +import kamkeel.npcs.network.packets.request.npc.NpcDeletePacket; +import kamkeel.npcs.network.packets.request.npc.RemoteDeletePacket; +import kamkeel.npcs.network.packets.request.npc.RemoteFreezeGetPacket; +import kamkeel.npcs.network.packets.request.npc.RemoteFreezePacket; +import kamkeel.npcs.network.packets.request.npc.RemoteGlobalMenuPacket; +import kamkeel.npcs.network.packets.request.npc.RemoteMainMenuPacket; +import kamkeel.npcs.network.packets.request.npc.RemoteNpcsGetPacket; +import kamkeel.npcs.network.packets.request.npc.RemoteResetPacket; +import kamkeel.npcs.network.packets.request.npc.RemoteTpToNpcPacket; +import kamkeel.npcs.network.packets.request.party.PartyAcceptInvitePacket; +import kamkeel.npcs.network.packets.request.party.PartyDisbandPacket; +import kamkeel.npcs.network.packets.request.party.PartyIgnoreInvitePacket; +import kamkeel.npcs.network.packets.request.party.PartyInfoPacket; +import kamkeel.npcs.network.packets.request.party.PartyInvitePacket; +import kamkeel.npcs.network.packets.request.party.PartyKickPacket; +import kamkeel.npcs.network.packets.request.party.PartyLeavePacket; +import kamkeel.npcs.network.packets.request.party.PartyLogToServerPacket; +import kamkeel.npcs.network.packets.request.party.PartySavePacket; +import kamkeel.npcs.network.packets.request.party.PartySetLeaderPacket; +import kamkeel.npcs.network.packets.request.party.PartySetQuestPacket; import kamkeel.npcs.network.packets.request.pather.MovingPathGetPacket; import kamkeel.npcs.network.packets.request.pather.MovingPathSavePacket; -import kamkeel.npcs.network.packets.request.playerdata.*; -import kamkeel.npcs.network.packets.request.quest.*; +import kamkeel.npcs.network.packets.request.playerdata.PlayerDataDeleteInfoPacket; +import kamkeel.npcs.network.packets.request.playerdata.PlayerDataGetInfoPacket; +import kamkeel.npcs.network.packets.request.playerdata.PlayerDataGetNamesPacket; +import kamkeel.npcs.network.packets.request.playerdata.PlayerDataMapRegenPacket; +import kamkeel.npcs.network.packets.request.playerdata.PlayerDataRemovePacket; +import kamkeel.npcs.network.packets.request.playerdata.PlayerDataSaveInfoPacket; +import kamkeel.npcs.network.packets.request.quest.QuestCategoriesGetPacket; +import kamkeel.npcs.network.packets.request.quest.QuestCategoryGetPacket; +import kamkeel.npcs.network.packets.request.quest.QuestCategoryRemovePacket; +import kamkeel.npcs.network.packets.request.quest.QuestCategorySavePacket; +import kamkeel.npcs.network.packets.request.quest.QuestDialogGetTitlePacket; +import kamkeel.npcs.network.packets.request.quest.QuestGetPacket; +import kamkeel.npcs.network.packets.request.quest.QuestLogToServerPacket; +import kamkeel.npcs.network.packets.request.quest.QuestOpenGuiPacket; +import kamkeel.npcs.network.packets.request.quest.QuestRemovePacket; +import kamkeel.npcs.network.packets.request.quest.QuestSavePacket; +import kamkeel.npcs.network.packets.request.quest.QuestUntrackPacket; +import kamkeel.npcs.network.packets.request.quest.QuestsGetPacket; import kamkeel.npcs.network.packets.request.recipe.RecipeGetPacket; import kamkeel.npcs.network.packets.request.recipe.RecipeRemovePacket; import kamkeel.npcs.network.packets.request.recipe.RecipeSavePacket; @@ -68,15 +208,34 @@ import kamkeel.npcs.network.packets.request.recipe.RecipesGetPacket; import kamkeel.npcs.network.packets.request.role.RoleCompanionUpdatePacket; import kamkeel.npcs.network.packets.request.role.RoleGetPacket; import kamkeel.npcs.network.packets.request.role.RoleSavePacket; -import kamkeel.npcs.network.packets.request.script.*; +import kamkeel.npcs.network.packets.request.script.BlockScriptPacket; +import kamkeel.npcs.network.packets.request.script.EffectScriptPacket; +import kamkeel.npcs.network.packets.request.script.EventScriptPacket; +import kamkeel.npcs.network.packets.request.script.ForgeScriptPacket; +import kamkeel.npcs.network.packets.request.script.GlobalNPCScriptPacket; +import kamkeel.npcs.network.packets.request.script.NPCScriptPacket; +import kamkeel.npcs.network.packets.request.script.PlayerScriptPacket; +import kamkeel.npcs.network.packets.request.script.RecipeScriptPacket; +import kamkeel.npcs.network.packets.request.script.ScriptInfoPacket; import kamkeel.npcs.network.packets.request.script.item.ItemScriptErrorPacket; import kamkeel.npcs.network.packets.request.script.item.ItemScriptPacket; import kamkeel.npcs.network.packets.request.script.item.LinkedItemScriptPacket; -import kamkeel.npcs.network.packets.request.tags.*; +import kamkeel.npcs.network.packets.request.tags.TagGetPacket; +import kamkeel.npcs.network.packets.request.tags.TagRemovePacket; +import kamkeel.npcs.network.packets.request.tags.TagSavePacket; +import kamkeel.npcs.network.packets.request.tags.TagSetPacket; +import kamkeel.npcs.network.packets.request.tags.TagsGetPacket; +import kamkeel.npcs.network.packets.request.tags.TagsNpcGetPacket; import kamkeel.npcs.network.packets.request.transform.TransformGetPacket; import kamkeel.npcs.network.packets.request.transform.TransformLoadPacket; import kamkeel.npcs.network.packets.request.transform.TransformSavePacket; -import kamkeel.npcs.network.packets.request.transport.*; +import kamkeel.npcs.network.packets.request.transport.TransportCategoriesGetPacket; +import kamkeel.npcs.network.packets.request.transport.TransportCategoryRemovePacket; +import kamkeel.npcs.network.packets.request.transport.TransportCategorySavePacket; +import kamkeel.npcs.network.packets.request.transport.TransportGetLocationPacket; +import kamkeel.npcs.network.packets.request.transport.TransportRemovePacket; +import kamkeel.npcs.network.packets.request.transport.TransportSavePacket; +import kamkeel.npcs.network.packets.request.transport.TransportsGetPacket; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -173,6 +332,7 @@ public class PacketHandler { REQUEST_PACKET.registerPacket(new RecipeGetPacket()); REQUEST_PACKET.registerPacket(new RecipeRemovePacket()); REQUEST_PACKET.registerPacket(new RecipeSavePacket()); + REQUEST_PACKET.registerPacket(new RecipeScriptPacket()); // Natural Spawn Packets REQUEST_PACKET.registerPacket(new NaturalSpawnGetAllPacket()); diff --git a/src/main/java/kamkeel/npcs/network/enums/EnumRequestPacket.java b/src/main/java/kamkeel/npcs/network/enums/EnumRequestPacket.java index 5503a8d24..0159fe719 100644 --- a/src/main/java/kamkeel/npcs/network/enums/EnumRequestPacket.java +++ b/src/main/java/kamkeel/npcs/network/enums/EnumRequestPacket.java @@ -192,5 +192,8 @@ public enum EnumRequestPacket { MagicGet, MagicSave, NpcMagicGet, - NpcMagicSave, Hammer, + NpcMagicSave, + Hammer, + + RecipeScript, } diff --git a/src/main/java/kamkeel/npcs/network/packets/player/MailActionPacket.java b/src/main/java/kamkeel/npcs/network/packets/player/MailActionPacket.java index eb5e12d97..769709c23 100644 --- a/src/main/java/kamkeel/npcs/network/packets/player/MailActionPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/player/MailActionPacket.java @@ -4,7 +4,11 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; -import kamkeel.npcs.network.*; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.LargeAbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; import kamkeel.npcs.network.enums.EnumPlayerPacket; import kamkeel.npcs.network.packets.data.large.GuiDataPacket; import kamkeel.npcs.util.ByteBufUtils; @@ -168,7 +172,6 @@ public class MailActionPacket extends AbstractPacket { } @Override - @SideOnly(Side.SERVER) protected void handleCompleteData(ByteBuf data, EntityPlayer player) throws IOException { if (!(player instanceof EntityPlayerMP)) return; diff --git a/src/main/java/kamkeel/npcs/network/packets/player/customgui/CustomGuiClosePacket.java b/src/main/java/kamkeel/npcs/network/packets/player/customgui/CustomGuiClosePacket.java index a94b6c4a3..27862b15c 100644 --- a/src/main/java/kamkeel/npcs/network/packets/player/customgui/CustomGuiClosePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/player/customgui/CustomGuiClosePacket.java @@ -12,7 +12,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.EventHooks; import noppes.npcs.api.entity.IPlayer; -import noppes.npcs.containers.ContainerCustomGui; import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.gui.ScriptGui; diff --git a/src/main/java/kamkeel/npcs/network/packets/player/item/MagicCyclesPacket.java b/src/main/java/kamkeel/npcs/network/packets/player/item/MagicCyclesPacket.java index 2e9ec537e..bbb6a9f62 100644 --- a/src/main/java/kamkeel/npcs/network/packets/player/item/MagicCyclesPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/player/item/MagicCyclesPacket.java @@ -3,7 +3,11 @@ package kamkeel.npcs.network.packets.player.item; 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.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumPlayerPacket; import kamkeel.npcs.network.packets.data.large.GuiDataPacket; diff --git a/src/main/java/kamkeel/npcs/network/packets/player/profile/ProfileChangePacket.java b/src/main/java/kamkeel/npcs/network/packets/player/profile/ProfileChangePacket.java index 983e5e990..1c319753a 100644 --- a/src/main/java/kamkeel/npcs/network/packets/player/profile/ProfileChangePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/player/profile/ProfileChangePacket.java @@ -10,8 +10,10 @@ import kamkeel.npcs.network.PacketChannel; import kamkeel.npcs.network.PacketHandler; import kamkeel.npcs.network.enums.EnumPlayerPacket; import kamkeel.npcs.network.packets.data.ChatAlertPacket; +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.CustomNpcsPermissions; import noppes.npcs.config.ConfigMain; @@ -60,8 +62,13 @@ public final class ProfileChangePacket extends AbstractPacket { int slot = in.readInt(); ProfileOperation operation = ProfileController.Instance.changeSlot(player, slot); - ProfileGetPacket.sendProfileNBT(player); - ProfileGetInfoPacket.sendProfileInfo(player); + + NBTTagCompound compound = new NBTTagCompound(); + compound.setBoolean("CHANGE_PACKET", true); + compound.setTag("PROFILE", ProfileGetPacket.profileNBTPayload(player)); + compound.setTag("PROFILE_INFO", ProfileGetInfoPacket.profileInfoPayload(player)); + GuiDataPacket.sendGuiData((EntityPlayerMP) player, compound); + ChatAlertPacket.sendChatAlert((EntityPlayerMP) player, operation.getMessage()); } } diff --git a/src/main/java/kamkeel/npcs/network/packets/player/profile/ProfileGetInfoPacket.java b/src/main/java/kamkeel/npcs/network/packets/player/profile/ProfileGetInfoPacket.java index c4d92d674..25cb641a0 100644 --- a/src/main/java/kamkeel/npcs/network/packets/player/profile/ProfileGetInfoPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/player/profile/ProfileGetInfoPacket.java @@ -57,6 +57,10 @@ public final class ProfileGetInfoPacket extends AbstractPacket { } public static void sendProfileInfo(EntityPlayer player) { + GuiDataPacket.sendGuiData((EntityPlayerMP) player, profileInfoPayload(player)); + } + + public static NBTTagCompound profileInfoPayload(EntityPlayer player) { NBTTagCompound compound = new NBTTagCompound(); compound.setBoolean("PROFILE_INFO", true); NBTTagList slotList = new NBTTagList(); @@ -75,7 +79,7 @@ public final class ProfileGetInfoPacket extends AbstractPacket { } compound.setTag("SLOTS", slotList); } - GuiDataPacket.sendGuiData((EntityPlayerMP) player, compound); + return compound; } public static HashMap> readProfileInfo(NBTTagCompound compound) { diff --git a/src/main/java/kamkeel/npcs/network/packets/player/profile/ProfileGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/player/profile/ProfileGetPacket.java index 6ef9cdefe..2b7e9801f 100644 --- a/src/main/java/kamkeel/npcs/network/packets/player/profile/ProfileGetPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/player/profile/ProfileGetPacket.java @@ -50,9 +50,13 @@ public final class ProfileGetPacket extends AbstractPacket { } public static void sendProfileNBT(EntityPlayer player) { + GuiDataPacket.sendGuiData((EntityPlayerMP) player, profileNBTPayload(player)); + } + + public static NBTTagCompound profileNBTPayload(EntityPlayer player) { Profile profile = ProfileController.Instance.getProfile(player); NBTTagCompound compound = profile.writeToNBT(); compound.setBoolean("PROFILE", true); - GuiDataPacket.sendGuiData((EntityPlayerMP) player, compound); + return compound; } } diff --git a/src/main/java/kamkeel/npcs/network/packets/request/MountPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/MountPacket.java index 0fa6fea87..991184cb7 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/MountPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/MountPacket.java @@ -3,7 +3,11 @@ package kamkeel.npcs.network.packets.request; 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.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.util.ByteBufUtils; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/clone/MobSpawnerPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/clone/MobSpawnerPacket.java index d5440f82e..cc4dfb3ed 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/clone/MobSpawnerPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/clone/MobSpawnerPacket.java @@ -3,7 +3,11 @@ package kamkeel.npcs.network.packets.request.clone; 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.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.util.ByteBufUtils; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/clone/SpawnMobPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/clone/SpawnMobPacket.java index 7af87fd07..b83fb9286 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/clone/SpawnMobPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/clone/SpawnMobPacket.java @@ -4,7 +4,11 @@ import cpw.mods.fml.common.FMLCommonHandler; 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.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.util.ByteBufUtils; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogGetPacket.java index 44a59246f..f3609a7ac 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogGetPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogGetPacket.java @@ -3,7 +3,11 @@ package kamkeel.npcs.network.packets.request.dialog; 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.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.network.packets.data.large.GuiDataPacket; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/faction/FactionGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/faction/FactionGetPacket.java index d7bf394a7..c432ca47d 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/faction/FactionGetPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/faction/FactionGetPacket.java @@ -3,7 +3,11 @@ package kamkeel.npcs.network.packets.request.faction; 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.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.network.packets.data.large.GuiDataPacket; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/feather/DimensionTeleportPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/feather/DimensionTeleportPacket.java index 65f18be9f..1104f837a 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/feather/DimensionTeleportPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/feather/DimensionTeleportPacket.java @@ -46,7 +46,6 @@ public final class DimensionTeleportPacket extends AbstractPacket { out.writeInt(dimensionID); } - @SideOnly(Side.SERVER) @Override public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { if (!(player instanceof EntityPlayerMP)) diff --git a/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobSavePacket.java index 88595b60b..fa3175c0f 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobSavePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobSavePacket.java @@ -3,7 +3,11 @@ package kamkeel.npcs.network.packets.request.jobs; 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.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.util.ByteBufUtils; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedGetAllPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedGetAllPacket.java index 3825f8c82..e05715577 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedGetAllPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedGetAllPacket.java @@ -3,7 +3,11 @@ package kamkeel.npcs.network.packets.request.linked; 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.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.network.packets.data.ScrollSelectedPacket; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedGetPacket.java index 40cad7db5..c562ac8d4 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedGetPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedGetPacket.java @@ -3,7 +3,11 @@ package kamkeel.npcs.network.packets.request.linked; 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.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.network.packets.data.large.GuiDataPacket; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/magic/MagicGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/magic/MagicGetPacket.java index b2181c6ba..3498f32aa 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/magic/MagicGetPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/magic/MagicGetPacket.java @@ -3,7 +3,11 @@ package kamkeel.npcs.network.packets.request.magic; 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.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.network.packets.data.large.GuiDataPacket; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/party/PartySavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/party/PartySavePacket.java index f4f0987fd..94f97a980 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/party/PartySavePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/party/PartySavePacket.java @@ -51,6 +51,7 @@ public final class PartySavePacket extends AbstractPacket { if (playerData.partyUUID != null) { Party party = PartyController.Instance().getParty(playerData.partyUUID); party.readClientNBT(ByteBufUtils.readNBT(in)); + PartyController.Instance().pingPartyUpdate(party); } } } diff --git a/src/main/java/kamkeel/npcs/network/packets/request/playerdata/PlayerDataRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/playerdata/PlayerDataRemovePacket.java index fbe8c7991..59c07f110 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/playerdata/PlayerDataRemovePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/playerdata/PlayerDataRemovePacket.java @@ -24,22 +24,12 @@ public final class PlayerDataRemovePacket extends AbstractPacket { private EnumPlayerData playerData; private String name; - private int type; - private String selected; - public PlayerDataRemovePacket() { } - public PlayerDataRemovePacket(EnumPlayerData playerData, String name, String selected) { + public PlayerDataRemovePacket(EnumPlayerData playerData, String name) { this.playerData = playerData; this.name = name; - this.selected = selected; - } - - public PlayerDataRemovePacket(EnumPlayerData playerData, String name, int selectedType) { - this.playerData = playerData; - this.name = name; - this.type = selectedType; } @Override @@ -62,11 +52,6 @@ public final class PlayerDataRemovePacket extends AbstractPacket { public void sendData(ByteBuf out) throws IOException { out.writeInt(playerData.ordinal()); ByteBufUtils.writeString(out, this.name); - if (playerData == EnumPlayerData.Players) { - ByteBufUtils.writeString(out, this.selected); - } else { - out.writeInt(this.type); - } } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestGetPacket.java index 979f21f47..4f309c011 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestGetPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestGetPacket.java @@ -3,7 +3,11 @@ package kamkeel.npcs.network.packets.request.quest; 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.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.network.packets.data.large.GuiDataPacket; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/role/RoleGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/role/RoleGetPacket.java index 762a34ca4..46accdce7 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/role/RoleGetPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/role/RoleGetPacket.java @@ -55,6 +55,7 @@ public final class RoleGetPacket extends AbstractPacket { NBTTagCompound compound = new NBTTagCompound(); compound.setBoolean("RoleData", true); + compound.setInteger("RoleOrdinal", npc.advanced.role.ordinal()); GuiDataPacket.sendGuiData((EntityPlayerMP) player, npc.roleInterface.writeToNBT(compound)); } } diff --git a/src/main/java/kamkeel/npcs/network/packets/request/script/EffectScriptPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/script/EffectScriptPacket.java index 66da65d8f..8171f085d 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/script/EffectScriptPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/script/EffectScriptPacket.java @@ -4,7 +4,11 @@ import cpw.mods.fml.common.FMLCommonHandler; 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.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/script/EventScriptPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/script/EventScriptPacket.java index 72d3c66bc..69f660a2c 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/script/EventScriptPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/script/EventScriptPacket.java @@ -4,7 +4,11 @@ import cpw.mods.fml.common.FMLCommonHandler; 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.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.util.ByteBufUtils; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/script/ForgeScriptPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/script/ForgeScriptPacket.java index 11d625988..86584a766 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/script/ForgeScriptPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/script/ForgeScriptPacket.java @@ -3,7 +3,11 @@ package kamkeel.npcs.network.packets.request.script; 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.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.util.ByteBufUtils; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/script/GlobalNPCScriptPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/script/GlobalNPCScriptPacket.java index bb07fac73..ae9e44a3d 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/script/GlobalNPCScriptPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/script/GlobalNPCScriptPacket.java @@ -3,7 +3,11 @@ package kamkeel.npcs.network.packets.request.script; 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.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.util.ByteBufUtils; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/script/NPCScriptPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/script/NPCScriptPacket.java index c2dc13165..7d5e0d3ed 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/script/NPCScriptPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/script/NPCScriptPacket.java @@ -4,7 +4,11 @@ import cpw.mods.fml.common.FMLCommonHandler; 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.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.network.packets.data.large.GuiDataPacket; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/script/PlayerScriptPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/script/PlayerScriptPacket.java index 93b7cc387..242e7d092 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/script/PlayerScriptPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/script/PlayerScriptPacket.java @@ -3,7 +3,11 @@ package kamkeel.npcs.network.packets.request.script; 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.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.util.ByteBufUtils; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/script/RecipeScriptPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/script/RecipeScriptPacket.java new file mode 100644 index 000000000..3627631eb --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/script/RecipeScriptPacket.java @@ -0,0 +1,124 @@ +package kamkeel.npcs.network.packets.request.script; + +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.util.ByteBufUtils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.config.ConfigDebug; +import noppes.npcs.config.ConfigScript; +import noppes.npcs.controllers.RecipeController; +import noppes.npcs.controllers.data.RecipeAnvil; +import noppes.npcs.controllers.data.RecipeCarpentry; +import noppes.npcs.controllers.data.RecipeScript; + +import java.io.IOException; + +public final class RecipeScriptPacket extends AbstractPacket { + public static String packetName = "Request|RecipeScript"; + + private Action type; + private boolean anvil; + private int id; + private int tab; + private int maxSize; + private NBTTagCompound compound; + + public RecipeScriptPacket() { + } + + public RecipeScriptPacket(Action type, boolean anvil, int id, int tab, int maxSize, NBTTagCompound compound) { + this.type = type; + this.anvil = anvil; + this.id = id; + this.tab = tab; + this.maxSize = maxSize; + this.compound = compound; + } + + @Override + public Enum getType() { + return EnumRequestPacket.RecipeScript; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.GLOBAL_RECIPE; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + out.writeInt(type.ordinal()); + out.writeBoolean(anvil); + out.writeInt(id); + if (type == Action.SAVE) { + out.writeInt(tab); + out.writeInt(maxSize); + ByteBufUtils.writeNBT(out, compound); + } + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) + return; + if (!ConfigScript.canScript(player, CustomNpcsPermissions.SCRIPT)) + return; + + Action action = Action.values()[in.readInt()]; + boolean isAnvil = in.readBoolean(); + int recipeId = in.readInt(); + + if (isAnvil) { + RecipeAnvil recipe = RecipeController.Instance.getAnvilRecipe(recipeId); + if (recipe == null) + return; + handle(action, recipe.getOrCreateScriptHandler(), in, (EntityPlayerMP) player); + } else { + RecipeCarpentry recipe = RecipeController.Instance.getRecipe(recipeId); + if (recipe == null) + return; + handle(action, recipe.getOrCreateScriptHandler(), in, (EntityPlayerMP) player); + } + } + + private void handle(Action action, RecipeScript script, ByteBuf in, EntityPlayerMP player) throws IOException { + if (action == Action.GET) { + PacketUtil.getScripts(script, player); + } else { + script.saveScript(in); + if (ConfigDebug.PlayerLogging && FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER) { + // TODO: Log Recipe Script Saving + } + } + } + + public static void Save(boolean anvil, int id, int tab, int maxSize, NBTTagCompound compound) { + PacketClient.sendClient(new RecipeScriptPacket(Action.SAVE, anvil, id, tab, maxSize, compound)); + } + + public static void Get(boolean anvil, int id) { + PacketClient.sendClient(new RecipeScriptPacket(Action.GET, anvil, id, -1, -1, new NBTTagCompound())); + } + + private enum Action { + GET, + SAVE + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/script/ScriptInfoPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/script/ScriptInfoPacket.java index 337522882..d0f7089c9 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/script/ScriptInfoPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/script/ScriptInfoPacket.java @@ -3,7 +3,11 @@ package kamkeel.npcs.network.packets.request.script; 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.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.network.packets.data.large.GuiDataPacket; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/script/item/LinkedItemScriptPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/script/item/LinkedItemScriptPacket.java index 8b5ec164f..c62a36553 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/script/item/LinkedItemScriptPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/script/item/LinkedItemScriptPacket.java @@ -4,7 +4,11 @@ import cpw.mods.fml.common.FMLCommonHandler; 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.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/kamkeel/npcs/util/AttributeAttackUtil.java b/src/main/java/kamkeel/npcs/util/AttributeAttackUtil.java index ffce538ef..f2fd8bf44 100644 --- a/src/main/java/kamkeel/npcs/util/AttributeAttackUtil.java +++ b/src/main/java/kamkeel/npcs/util/AttributeAttackUtil.java @@ -10,7 +10,11 @@ import noppes.npcs.controllers.data.MagicEntry; import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.entity.EntityNPCInterface; -import java.util.*; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Random; +import java.util.Set; import static kamkeel.npcs.controllers.AttributeController.getTracker; diff --git a/src/main/java/kamkeel/npcs/util/AttributeItemUtil.java b/src/main/java/kamkeel/npcs/util/AttributeItemUtil.java index f896c39c7..9cc361b5d 100644 --- a/src/main/java/kamkeel/npcs/util/AttributeItemUtil.java +++ b/src/main/java/kamkeel/npcs/util/AttributeItemUtil.java @@ -19,7 +19,12 @@ import noppes.npcs.controllers.MagicController; import noppes.npcs.controllers.data.Magic; import org.lwjgl.input.Keyboard; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.regex.Pattern; /** diff --git a/src/main/java/nikedemos/markovnames/Main.java b/src/main/java/nikedemos/markovnames/Main.java index 8fa76ec7b..25ab664e4 100644 --- a/src/main/java/nikedemos/markovnames/Main.java +++ b/src/main/java/nikedemos/markovnames/Main.java @@ -1,6 +1,14 @@ package nikedemos.markovnames; -import nikedemos.markovnames.generators.*; +import nikedemos.markovnames.generators.MarkovAncientGreek; +import nikedemos.markovnames.generators.MarkovAztec; +import nikedemos.markovnames.generators.MarkovGenerator; +import nikedemos.markovnames.generators.MarkovJapanese; +import nikedemos.markovnames.generators.MarkovOldNorse; +import nikedemos.markovnames.generators.MarkovRoman; +import nikedemos.markovnames.generators.MarkovSaami; +import nikedemos.markovnames.generators.MarkovSlavic; +import nikedemos.markovnames.generators.MarkovWelsh; import java.util.HashMap; import java.util.Iterator; diff --git a/src/main/java/noppes/npcs/AnimationMixinFunctions.java b/src/main/java/noppes/npcs/AnimationMixinFunctions.java index f5f01b2dc..4a6eb1db5 100644 --- a/src/main/java/noppes/npcs/AnimationMixinFunctions.java +++ b/src/main/java/noppes/npcs/AnimationMixinFunctions.java @@ -8,7 +8,11 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityClientPlayerMP; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelRenderer; -import net.minecraft.client.renderer.*; +import net.minecraft.client.renderer.ItemRenderer; +import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.renderer.texture.TextureUtil; import net.minecraft.entity.Entity; diff --git a/src/main/java/noppes/npcs/CommonProxy.java b/src/main/java/noppes/npcs/CommonProxy.java index e8e879dd3..58f931ab8 100644 --- a/src/main/java/noppes/npcs/CommonProxy.java +++ b/src/main/java/noppes/npcs/CommonProxy.java @@ -14,7 +14,28 @@ import net.minecraftforge.common.util.FakePlayer; import noppes.npcs.api.IWorld; import noppes.npcs.blocks.tiles.TileNpcContainer; import noppes.npcs.constants.EnumGuiType; -import noppes.npcs.containers.*; +import noppes.npcs.containers.ContainerAnvilRepair; +import noppes.npcs.containers.ContainerCarpentryBench; +import noppes.npcs.containers.ContainerCrate; +import noppes.npcs.containers.ContainerCustomGui; +import noppes.npcs.containers.ContainerMail; +import noppes.npcs.containers.ContainerManageBanks; +import noppes.npcs.containers.ContainerManageRecipes; +import noppes.npcs.containers.ContainerMerchantAdd; +import noppes.npcs.containers.ContainerNPCBankLarge; +import noppes.npcs.containers.ContainerNPCBankSmall; +import noppes.npcs.containers.ContainerNPCBankUnlock; +import noppes.npcs.containers.ContainerNPCBankUpgrade; +import noppes.npcs.containers.ContainerNPCCompanion; +import noppes.npcs.containers.ContainerNPCFollower; +import noppes.npcs.containers.ContainerNPCFollowerHire; +import noppes.npcs.containers.ContainerNPCFollowerSetup; +import noppes.npcs.containers.ContainerNPCInv; +import noppes.npcs.containers.ContainerNPCTrader; +import noppes.npcs.containers.ContainerNPCTraderSetup; +import noppes.npcs.containers.ContainerNpcItemGiver; +import noppes.npcs.containers.ContainerNpcQuestReward; +import noppes.npcs.containers.ContainerNpcQuestTypeItem; import noppes.npcs.controllers.data.AnimationData; import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/CustomItems.java b/src/main/java/noppes/npcs/CustomItems.java index 1b1bfed67..e9e481fa9 100644 --- a/src/main/java/noppes/npcs/CustomItems.java +++ b/src/main/java/noppes/npcs/CustomItems.java @@ -7,17 +7,129 @@ import net.minecraft.dispenser.BehaviorDefaultDispenseItem; import net.minecraft.dispenser.IBlockSource; import net.minecraft.init.Blocks; import net.minecraft.init.Items; -import net.minecraft.item.*; +import net.minecraft.item.Item; import net.minecraft.item.Item.ToolMaterial; +import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemArmor.ArmorMaterial; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemFlintAndSteel; +import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.oredict.OreDictionary; -import noppes.npcs.blocks.*; -import noppes.npcs.blocks.tiles.*; +import noppes.npcs.blocks.BlockBanner; +import noppes.npcs.blocks.BlockBarrel; +import noppes.npcs.blocks.BlockBeam; +import noppes.npcs.blocks.BlockBigSign; +import noppes.npcs.blocks.BlockBlood; +import noppes.npcs.blocks.BlockBook; +import noppes.npcs.blocks.BlockBorder; +import noppes.npcs.blocks.BlockCampfire; +import noppes.npcs.blocks.BlockCandle; +import noppes.npcs.blocks.BlockCarpentryBench; +import noppes.npcs.blocks.BlockChair; +import noppes.npcs.blocks.BlockCouchWood; +import noppes.npcs.blocks.BlockCouchWool; +import noppes.npcs.blocks.BlockCrate; +import noppes.npcs.blocks.BlockCrystal; +import noppes.npcs.blocks.BlockLantern; +import noppes.npcs.blocks.BlockMailbox; +import noppes.npcs.blocks.BlockNpcRedstone; +import noppes.npcs.blocks.BlockPedestal; +import noppes.npcs.blocks.BlockPlaceholder; +import noppes.npcs.blocks.BlockScripted; +import noppes.npcs.blocks.BlockShelf; +import noppes.npcs.blocks.BlockShortLamp; +import noppes.npcs.blocks.BlockSign; +import noppes.npcs.blocks.BlockStool; +import noppes.npcs.blocks.BlockTable; +import noppes.npcs.blocks.BlockTallLamp; +import noppes.npcs.blocks.BlockTombstone; +import noppes.npcs.blocks.BlockWallBanner; +import noppes.npcs.blocks.BlockWaypoint; +import noppes.npcs.blocks.BlockWeaponRack; +import noppes.npcs.blocks.tiles.TileBanner; +import noppes.npcs.blocks.tiles.TileBarrel; +import noppes.npcs.blocks.tiles.TileBeam; +import noppes.npcs.blocks.tiles.TileBigSign; +import noppes.npcs.blocks.tiles.TileBlockAnvil; +import noppes.npcs.blocks.tiles.TileBook; +import noppes.npcs.blocks.tiles.TileBorder; +import noppes.npcs.blocks.tiles.TileCampfire; +import noppes.npcs.blocks.tiles.TileCandle; +import noppes.npcs.blocks.tiles.TileChair; +import noppes.npcs.blocks.tiles.TileCouchWood; +import noppes.npcs.blocks.tiles.TileCouchWool; +import noppes.npcs.blocks.tiles.TileCrate; +import noppes.npcs.blocks.tiles.TileLamp; +import noppes.npcs.blocks.tiles.TileMailbox; +import noppes.npcs.blocks.tiles.TilePedestal; +import noppes.npcs.blocks.tiles.TileRedstoneBlock; +import noppes.npcs.blocks.tiles.TileScripted; +import noppes.npcs.blocks.tiles.TileShelf; +import noppes.npcs.blocks.tiles.TileShortLamp; +import noppes.npcs.blocks.tiles.TileSign; +import noppes.npcs.blocks.tiles.TileStool; +import noppes.npcs.blocks.tiles.TileTable; +import noppes.npcs.blocks.tiles.TileTallLamp; +import noppes.npcs.blocks.tiles.TileTombstone; +import noppes.npcs.blocks.tiles.TileWallBanner; +import noppes.npcs.blocks.tiles.TileWaypoint; +import noppes.npcs.blocks.tiles.TileWeaponRack; import noppes.npcs.config.ConfigItem; import noppes.npcs.constants.EnumNpcToolMaterial; -import noppes.npcs.items.*; +import noppes.npcs.items.ItemBattleAxe; +import noppes.npcs.items.ItemBroadSword; +import noppes.npcs.items.ItemBullet; +import noppes.npcs.items.ItemClaw; +import noppes.npcs.items.ItemCrossbow; +import noppes.npcs.items.ItemDagger; +import noppes.npcs.items.ItemDaggerReversed; +import noppes.npcs.items.ItemElementalStaff; +import noppes.npcs.items.ItemExcalibur; +import noppes.npcs.items.ItemGlaive; +import noppes.npcs.items.ItemGun; +import noppes.npcs.items.ItemGunChainsaw; +import noppes.npcs.items.ItemKunai; +import noppes.npcs.items.ItemKunaiReversed; +import noppes.npcs.items.ItemLeafBlade; +import noppes.npcs.items.ItemLinked; +import noppes.npcs.items.ItemMachineGun; +import noppes.npcs.items.ItemMounter; +import noppes.npcs.items.ItemMusic; +import noppes.npcs.items.ItemMusicBanjo; +import noppes.npcs.items.ItemMusicClarinet; +import noppes.npcs.items.ItemMusicOracina; +import noppes.npcs.items.ItemMusicViolin; +import noppes.npcs.items.ItemMusket; +import noppes.npcs.items.ItemNpcArmor; +import noppes.npcs.items.ItemNpcArmorColorable; +import noppes.npcs.items.ItemNpcBlock; +import noppes.npcs.items.ItemNpcCloner; +import noppes.npcs.items.ItemNpcColored; +import noppes.npcs.items.ItemNpcInterface; +import noppes.npcs.items.ItemNpcMovingPath; +import noppes.npcs.items.ItemNpcScripter; +import noppes.npcs.items.ItemNpcTool; +import noppes.npcs.items.ItemNpcWand; +import noppes.npcs.items.ItemNpcWeaponInterface; +import noppes.npcs.items.ItemOrb; +import noppes.npcs.items.ItemPlaceholder; +import noppes.npcs.items.ItemRotatedShield; +import noppes.npcs.items.ItemScripted; +import noppes.npcs.items.ItemScythe; +import noppes.npcs.items.ItemShield; +import noppes.npcs.items.ItemSkirt; +import noppes.npcs.items.ItemSlingshot; +import noppes.npcs.items.ItemSoulstoneEmpty; +import noppes.npcs.items.ItemSoulstoneFilled; +import noppes.npcs.items.ItemSpear; +import noppes.npcs.items.ItemStaff; +import noppes.npcs.items.ItemTeleporter; +import noppes.npcs.items.ItemThrowingShuriken; +import noppes.npcs.items.ItemThrowingWeapon; +import noppes.npcs.items.ItemWand; +import noppes.npcs.items.ItemWarhammer; public class CustomItems { diff --git a/src/main/java/noppes/npcs/CustomNpcs.java b/src/main/java/noppes/npcs/CustomNpcs.java index f4c2947ac..3cfcd18e4 100644 --- a/src/main/java/noppes/npcs/CustomNpcs.java +++ b/src/main/java/noppes/npcs/CustomNpcs.java @@ -4,7 +4,12 @@ import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.event.*; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.event.FMLServerAboutToStartEvent; +import cpw.mods.fml.common.event.FMLServerStartedEvent; +import cpw.mods.fml.common.event.FMLServerStartingEvent; +import cpw.mods.fml.common.event.FMLServerStoppedEvent; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.EntityRegistry; import cpw.mods.fml.relauncher.Side; @@ -27,21 +32,74 @@ import net.minecraft.entity.EntityList; import net.minecraft.server.MinecraftServer; import net.minecraftforge.common.ForgeChunkManager; import net.minecraftforge.common.MinecraftForge; -import nikedemos.markovnames.generators.*; +import nikedemos.markovnames.generators.MarkovAncientGreek; +import nikedemos.markovnames.generators.MarkovAztec; +import nikedemos.markovnames.generators.MarkovCustomNPCsClassic; +import nikedemos.markovnames.generators.MarkovGenerator; +import nikedemos.markovnames.generators.MarkovJapanese; +import nikedemos.markovnames.generators.MarkovOldNorse; +import nikedemos.markovnames.generators.MarkovRoman; +import nikedemos.markovnames.generators.MarkovSaami; +import nikedemos.markovnames.generators.MarkovSlavic; +import nikedemos.markovnames.generators.MarkovSpanish; +import nikedemos.markovnames.generators.MarkovWelsh; import noppes.npcs.compat.PixelmonHelper; import noppes.npcs.config.ConfigMain; import noppes.npcs.config.LoadConfiguration; import noppes.npcs.config.legacy.LegacyConfig; -import noppes.npcs.controllers.*; +import noppes.npcs.controllers.AnimationController; +import noppes.npcs.controllers.BankController; +import noppes.npcs.controllers.ChunkController; +import noppes.npcs.controllers.CustomEffectController; +import noppes.npcs.controllers.DialogController; +import noppes.npcs.controllers.FactionController; +import noppes.npcs.controllers.GlobalDataController; +import noppes.npcs.controllers.LinkedItemController; +import noppes.npcs.controllers.LinkedNpcController; +import noppes.npcs.controllers.MagicController; +import noppes.npcs.controllers.PlayerDataController; +import noppes.npcs.controllers.QuestController; +import noppes.npcs.controllers.RecipeController; +import noppes.npcs.controllers.ScriptController; +import noppes.npcs.controllers.ServerCloneController; +import noppes.npcs.controllers.ServerTagMapController; +import noppes.npcs.controllers.SpawnController; +import noppes.npcs.controllers.TagController; +import noppes.npcs.controllers.TransportController; import noppes.npcs.enchants.EnchantInterface; -import noppes.npcs.entity.*; -import noppes.npcs.entity.old.*; +import noppes.npcs.entity.EntityChairMount; +import noppes.npcs.entity.EntityCustomNpc; +import noppes.npcs.entity.EntityMagicProjectile; +import noppes.npcs.entity.EntityNPCGolem; +import noppes.npcs.entity.EntityNpcCrystal; +import noppes.npcs.entity.EntityNpcDragon; +import noppes.npcs.entity.EntityNpcPony; +import noppes.npcs.entity.EntityNpcSlime; +import noppes.npcs.entity.EntityProjectile; +import noppes.npcs.entity.old.EntityNPCDwarfFemale; +import noppes.npcs.entity.old.EntityNPCDwarfMale; +import noppes.npcs.entity.old.EntityNPCElfFemale; +import noppes.npcs.entity.old.EntityNPCElfMale; +import noppes.npcs.entity.old.EntityNPCEnderman; +import noppes.npcs.entity.old.EntityNPCFurryFemale; +import noppes.npcs.entity.old.EntityNPCFurryMale; +import noppes.npcs.entity.old.EntityNPCHumanFemale; +import noppes.npcs.entity.old.EntityNPCHumanMale; +import noppes.npcs.entity.old.EntityNPCOrcFemale; +import noppes.npcs.entity.old.EntityNPCOrcMale; +import noppes.npcs.entity.old.EntityNPCVillager; +import noppes.npcs.entity.old.EntityNpcEnderchibi; +import noppes.npcs.entity.old.EntityNpcMonsterFemale; +import noppes.npcs.entity.old.EntityNpcMonsterMale; +import noppes.npcs.entity.old.EntityNpcNagaFemale; +import noppes.npcs.entity.old.EntityNpcNagaMale; +import noppes.npcs.entity.old.EntityNpcSkeleton; import noppes.npcs.scripted.NpcAPI; import java.io.File; import java.util.Set; -@Mod(modid = "customnpcs", name = "CustomNPC+", version = "1.10.1") +@Mod(modid = "customnpcs", name = "CustomNPC+", version = "1.10.2") public class CustomNpcs { @SidedProxy(clientSide = "noppes.npcs.client.ClientProxy", serverSide = "noppes.npcs.CommonProxy") diff --git a/src/main/java/noppes/npcs/DataAI.java b/src/main/java/noppes/npcs/DataAI.java index 386807a50..8d280e557 100644 --- a/src/main/java/noppes/npcs/DataAI.java +++ b/src/main/java/noppes/npcs/DataAI.java @@ -3,7 +3,11 @@ package noppes.npcs; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.MathHelper; -import noppes.npcs.constants.*; +import noppes.npcs.constants.EnumAnimation; +import noppes.npcs.constants.EnumCombatPolicy; +import noppes.npcs.constants.EnumMovingType; +import noppes.npcs.constants.EnumNavType; +import noppes.npcs.constants.EnumStandingType; import noppes.npcs.entity.EntityNPCInterface; import java.util.ArrayList; diff --git a/src/main/java/noppes/npcs/DataAdvanced.java b/src/main/java/noppes/npcs/DataAdvanced.java index cc0e67f2f..cc9e08614 100644 --- a/src/main/java/noppes/npcs/DataAdvanced.java +++ b/src/main/java/noppes/npcs/DataAdvanced.java @@ -10,7 +10,20 @@ import noppes.npcs.controllers.data.FactionOptions; import noppes.npcs.controllers.data.Line; import noppes.npcs.controllers.data.Lines; import noppes.npcs.entity.EntityNPCInterface; -import noppes.npcs.roles.*; +import noppes.npcs.roles.JobBard; +import noppes.npcs.roles.JobChunkLoader; +import noppes.npcs.roles.JobConversation; +import noppes.npcs.roles.JobFollower; +import noppes.npcs.roles.JobGuard; +import noppes.npcs.roles.JobHealer; +import noppes.npcs.roles.JobItemGiver; +import noppes.npcs.roles.JobSpawner; +import noppes.npcs.roles.RoleBank; +import noppes.npcs.roles.RoleCompanion; +import noppes.npcs.roles.RoleFollower; +import noppes.npcs.roles.RolePostman; +import noppes.npcs.roles.RoleTrader; +import noppes.npcs.roles.RoleTransporter; import java.util.HashMap; import java.util.HashSet; diff --git a/src/main/java/noppes/npcs/DataDisplay.java b/src/main/java/noppes/npcs/DataDisplay.java index 09b45913d..c17649754 100644 --- a/src/main/java/noppes/npcs/DataDisplay.java +++ b/src/main/java/noppes/npcs/DataDisplay.java @@ -25,7 +25,11 @@ import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.entity.data.DataSkinOverlays; import noppes.npcs.util.ValueUtil; -import java.util.*; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Objects; +import java.util.Random; +import java.util.UUID; public class DataDisplay { public EntityNPCInterface npc; diff --git a/src/main/java/noppes/npcs/EventHooks.java b/src/main/java/noppes/npcs/EventHooks.java index 17f9e2dd6..7a18879ab 100644 --- a/src/main/java/noppes/npcs/EventHooks.java +++ b/src/main/java/noppes/npcs/EventHooks.java @@ -1,6 +1,7 @@ package noppes.npcs; import cpw.mods.fml.common.eventhandler.Event; +import kamkeel.npcs.network.packets.data.AchievementPacket; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; @@ -15,11 +16,16 @@ import net.minecraft.world.WorldServer; import net.minecraftforge.event.entity.EntityEvent; import net.minecraftforge.event.world.WorldEvent; import noppes.npcs.api.IWorld; -import noppes.npcs.api.entity.*; +import noppes.npcs.api.entity.IAnimatable; +import noppes.npcs.api.entity.ICustomNpc; +import noppes.npcs.api.entity.IEntity; +import noppes.npcs.api.entity.IPlayer; +import noppes.npcs.api.entity.IProjectile; import noppes.npcs.api.event.IAnimationEvent; import noppes.npcs.api.gui.ICustomGui; import noppes.npcs.api.gui.IItemSlot; import noppes.npcs.api.handler.data.IAnimation; +import noppes.npcs.api.handler.data.IAnvilRecipe; import noppes.npcs.api.handler.data.IFrame; import noppes.npcs.api.handler.data.IPlayerEffect; import noppes.npcs.api.handler.data.IProfile; @@ -30,13 +36,45 @@ import noppes.npcs.constants.EnumScriptType; import noppes.npcs.controllers.CustomGuiController; import noppes.npcs.controllers.ScriptContainer; import noppes.npcs.controllers.ScriptController; -import noppes.npcs.controllers.data.*; +import noppes.npcs.controllers.data.Dialog; +import noppes.npcs.controllers.data.EffectScript; +import noppes.npcs.controllers.data.ForgeDataScript; +import noppes.npcs.controllers.data.INpcScriptHandler; +import noppes.npcs.controllers.data.IScriptBlockHandler; +import noppes.npcs.controllers.data.IScriptHandler; +import noppes.npcs.controllers.data.Party; +import noppes.npcs.controllers.data.PlayerData; +import noppes.npcs.controllers.data.PlayerDataScript; +import noppes.npcs.controllers.data.Quest; +import noppes.npcs.controllers.data.RecipeScript; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.entity.EntityProjectile; import noppes.npcs.scripted.NpcAPI; -import noppes.npcs.scripted.event.*; -import noppes.npcs.scripted.event.player.*; -import noppes.npcs.scripted.event.player.PlayerEvent.*; +import noppes.npcs.scripted.event.AnimationEvent; +import noppes.npcs.scripted.event.BlockEvent; +import noppes.npcs.scripted.event.CustomNPCsEvent; +import noppes.npcs.scripted.event.ForgeEvent; +import noppes.npcs.scripted.event.ItemEvent; +import noppes.npcs.scripted.event.LinkedItemEvent; +import noppes.npcs.scripted.event.NpcEvent; +import noppes.npcs.scripted.event.PartyEvent; +import noppes.npcs.scripted.event.ProjectileEvent; +import noppes.npcs.scripted.event.RecipeScriptEvent; +import noppes.npcs.scripted.event.player.CustomGuiEvent; +import noppes.npcs.scripted.event.player.DialogEvent; +import noppes.npcs.scripted.event.player.FactionEvent; +import noppes.npcs.scripted.event.player.PlayerEvent; +import noppes.npcs.scripted.event.player.PlayerEvent.ChatEvent; +import noppes.npcs.scripted.event.player.PlayerEvent.ContainerOpen; +import noppes.npcs.scripted.event.player.PlayerEvent.DamagedEntityEvent; +import noppes.npcs.scripted.event.player.PlayerEvent.DropEvent; +import noppes.npcs.scripted.event.player.PlayerEvent.EffectEvent; +import noppes.npcs.scripted.event.player.PlayerEvent.KeyPressedEvent; +import noppes.npcs.scripted.event.player.PlayerEvent.LoginEvent; +import noppes.npcs.scripted.event.player.PlayerEvent.LogoutEvent; +import noppes.npcs.scripted.event.player.PlayerEvent.PickUpEvent; +import noppes.npcs.scripted.event.player.QuestEvent; +import noppes.npcs.scripted.item.ScriptItemStack; import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; @@ -168,6 +206,40 @@ public class EventHooks { NpcAPI.EVENT_BUS.post(event); } + + public static RecipeScriptEvent.Pre onRecipeScriptPre(EntityPlayer player, RecipeScript script, Object recipe, ItemStack[] items) { + IItemStack[] iitems = new IItemStack[items.length]; + for (int i = 0; i < items.length; i++) { + iitems[i] = items[i] == null ? null : NpcAPI.Instance().getIItemStack(items[i]); + } + RecipeScriptEvent.Pre event = new RecipeScriptEvent.Pre(NoppesUtilServer.getIPlayer(player), recipe, recipe instanceof IAnvilRecipe, iitems); + if (script != null) { + script.callScript(RecipeScript.ScriptType.PRE.function, event); + } + NpcAPI.EVENT_BUS.post(event); + if (!player.worldObj.isRemote) { + String msg = event.getMessage(); + if (msg != null && !msg.isEmpty()) { + AchievementPacket.sendAchievement((EntityPlayerMP) player, false, "", msg); + } + } + return event; + } + + public static ItemStack onRecipeScriptPost(EntityPlayer player, RecipeScript script, Object recipe, ItemStack[] items, ItemStack result) { + IItemStack[] iitems = new IItemStack[items.length]; + for (int i = 0; i < items.length; i++) { + iitems[i] = items[i] == null ? null : NpcAPI.Instance().getIItemStack(items[i]); + } + RecipeScriptEvent.Post event = new RecipeScriptEvent.Post(NoppesUtilServer.getIPlayer(player), recipe, recipe instanceof IAnvilRecipe, iitems, NpcAPI.Instance().getIItemStack(result)); + if (script != null) { + script.callScript(RecipeScript.ScriptType.POST.function, event); + } + NpcAPI.EVENT_BUS.post(event); + return event.getResult() == null ? null : ((ScriptItemStack) event.getCraft()).getMCItemStack(); + } + + public static void onLinkedItemVersionChange(IItemLinked item, int version, int prevVersion) { INpcScriptHandler handler = (INpcScriptHandler) item.getScriptHandler(); LinkedItemEvent.VersionChangeEvent event = new LinkedItemEvent.VersionChangeEvent(item, version, prevVersion); diff --git a/src/main/java/noppes/npcs/LogWriter.java b/src/main/java/noppes/npcs/LogWriter.java index 2c14af3a6..4aa393b4a 100644 --- a/src/main/java/noppes/npcs/LogWriter.java +++ b/src/main/java/noppes/npcs/LogWriter.java @@ -3,13 +3,23 @@ package noppes.npcs; import noppes.npcs.config.ConfigDebug; import noppes.npcs.constants.EnumScriptType; -import java.io.*; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.PrintWriter; +import java.io.StringWriter; import java.text.SimpleDateFormat; import java.util.Date; import java.util.UUID; import java.util.WeakHashMap; import java.util.concurrent.TimeUnit; -import java.util.logging.*; +import java.util.logging.ConsoleHandler; +import java.util.logging.Formatter; +import java.util.logging.Handler; +import java.util.logging.Level; +import java.util.logging.LogRecord; +import java.util.logging.Logger; +import java.util.logging.StreamHandler; public class LogWriter { private final static String name = "CustomNPCs"; diff --git a/src/main/java/noppes/npcs/NBTTags.java b/src/main/java/noppes/npcs/NBTTags.java index d8771caf5..ebf30ab94 100644 --- a/src/main/java/noppes/npcs/NBTTags.java +++ b/src/main/java/noppes/npcs/NBTTags.java @@ -1,11 +1,23 @@ package noppes.npcs; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.*; +import net.minecraft.nbt.NBTBase; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagDouble; +import net.minecraft.nbt.NBTTagInt; +import net.minecraft.nbt.NBTTagList; import noppes.npcs.controllers.ScriptContainer; import noppes.npcs.controllers.data.IScriptHandler; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeMap; +import java.util.Vector; public class NBTTags { diff --git a/src/main/java/noppes/npcs/NPCSpawning.java b/src/main/java/noppes/npcs/NPCSpawning.java index 28b8c320c..ef143024c 100644 --- a/src/main/java/noppes/npcs/NPCSpawning.java +++ b/src/main/java/noppes/npcs/NPCSpawning.java @@ -26,7 +26,12 @@ import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.event.CustomNPCsEvent; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.Random; +import java.util.Set; public class NPCSpawning { private static Set eligibleChunksForSpawning = Sets.newHashSet(); diff --git a/src/main/java/noppes/npcs/NoppesStringUtils.java b/src/main/java/noppes/npcs/NoppesStringUtils.java index f0e2a76f9..cd7031ef0 100644 --- a/src/main/java/noppes/npcs/NoppesStringUtils.java +++ b/src/main/java/noppes/npcs/NoppesStringUtils.java @@ -5,7 +5,12 @@ import net.minecraft.util.StatCollector; import noppes.npcs.entity.EntityNPCInterface; import java.awt.*; -import java.awt.datatransfer.*; +import java.awt.datatransfer.Clipboard; +import java.awt.datatransfer.ClipboardOwner; +import java.awt.datatransfer.DataFlavor; +import java.awt.datatransfer.StringSelection; +import java.awt.datatransfer.Transferable; +import java.awt.datatransfer.UnsupportedFlavorException; import java.io.IOException; import java.util.Arrays; diff --git a/src/main/java/noppes/npcs/NoppesUtilPlayer.java b/src/main/java/noppes/npcs/NoppesUtilPlayer.java index bbfda9523..2c9c3b647 100644 --- a/src/main/java/noppes/npcs/NoppesUtilPlayer.java +++ b/src/main/java/noppes/npcs/NoppesUtilPlayer.java @@ -3,7 +3,11 @@ package noppes.npcs; import io.netty.buffer.ByteBuf; import kamkeel.npcs.network.PacketHandler; import kamkeel.npcs.network.enums.EnumSoundOperation; -import kamkeel.npcs.network.packets.data.*; +import kamkeel.npcs.network.packets.data.DisableMouseInputPacket; +import kamkeel.npcs.network.packets.data.OverlayQuestTrackingPacket; +import kamkeel.npcs.network.packets.data.QuestCompletionPacket; +import kamkeel.npcs.network.packets.data.SoundManagementPacket; +import kamkeel.npcs.network.packets.data.SwingPlayerArmPacket; import kamkeel.npcs.network.packets.data.gui.GuiClosePacket; import kamkeel.npcs.network.packets.data.gui.IsGuiOpenPacket; import kamkeel.npcs.network.packets.data.large.GuiDataPacket; @@ -24,12 +28,37 @@ import net.minecraftforge.oredict.OreDictionary; import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.handler.data.IQuestObjective; import noppes.npcs.api.item.IItemStack; -import noppes.npcs.constants.*; +import noppes.npcs.constants.EnumOptionType; +import noppes.npcs.constants.EnumPartyExchange; +import noppes.npcs.constants.EnumPartyObjectives; +import noppes.npcs.constants.EnumQuestCompletion; +import noppes.npcs.constants.EnumQuestType; +import noppes.npcs.constants.EnumRoleType; import noppes.npcs.containers.ContainerNPCBankInterface; import noppes.npcs.containers.ContainerNPCFollower; import noppes.npcs.containers.ContainerNPCFollowerHire; -import noppes.npcs.controllers.*; -import noppes.npcs.controllers.data.*; +import noppes.npcs.controllers.BankController; +import noppes.npcs.controllers.DialogController; +import noppes.npcs.controllers.PartyController; +import noppes.npcs.controllers.PlayerDataController; +import noppes.npcs.controllers.PlayerQuestController; +import noppes.npcs.controllers.QuestController; +import noppes.npcs.controllers.TransportController; +import noppes.npcs.controllers.data.Bank; +import noppes.npcs.controllers.data.BankData; +import noppes.npcs.controllers.data.Dialog; +import noppes.npcs.controllers.data.DialogOption; +import noppes.npcs.controllers.data.Line; +import noppes.npcs.controllers.data.Party; +import noppes.npcs.controllers.data.PartyOptions; +import noppes.npcs.controllers.data.PlayerBankData; +import noppes.npcs.controllers.data.PlayerData; +import noppes.npcs.controllers.data.PlayerQuestData; +import noppes.npcs.controllers.data.PlayerTransportData; +import noppes.npcs.controllers.data.Quest; +import noppes.npcs.controllers.data.QuestCategory; +import noppes.npcs.controllers.data.QuestData; +import noppes.npcs.controllers.data.TransportLocation; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.RoleFollower; import noppes.npcs.scripted.NpcAPI; @@ -39,7 +68,11 @@ import noppes.npcs.scripted.event.player.DialogEvent; import noppes.npcs.scripted.event.player.QuestEvent; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; public class NoppesUtilPlayer { diff --git a/src/main/java/noppes/npcs/NoppesUtilServer.java b/src/main/java/noppes/npcs/NoppesUtilServer.java index 98c01d373..7d06d4e52 100644 --- a/src/main/java/noppes/npcs/NoppesUtilServer.java +++ b/src/main/java/noppes/npcs/NoppesUtilServer.java @@ -48,8 +48,45 @@ import noppes.npcs.constants.EnumRoleType; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.containers.ContainerManageBanks; import noppes.npcs.containers.ContainerManageRecipes; -import noppes.npcs.controllers.*; -import noppes.npcs.controllers.data.*; +import noppes.npcs.controllers.AnimationController; +import noppes.npcs.controllers.BankController; +import noppes.npcs.controllers.CustomEffectController; +import noppes.npcs.controllers.DialogController; +import noppes.npcs.controllers.FactionController; +import noppes.npcs.controllers.LinkedItemController; +import noppes.npcs.controllers.MagicController; +import noppes.npcs.controllers.PlayerDataController; +import noppes.npcs.controllers.PlayerQuestController; +import noppes.npcs.controllers.QuestController; +import noppes.npcs.controllers.RecipeController; +import noppes.npcs.controllers.ServerCloneController; +import noppes.npcs.controllers.TagController; +import noppes.npcs.controllers.TransportController; +import noppes.npcs.controllers.data.Animation; +import noppes.npcs.controllers.data.Bank; +import noppes.npcs.controllers.data.CustomEffect; +import noppes.npcs.controllers.data.Dialog; +import noppes.npcs.controllers.data.DialogCategory; +import noppes.npcs.controllers.data.DialogOption; +import noppes.npcs.controllers.data.Faction; +import noppes.npcs.controllers.data.LinkedItem; +import noppes.npcs.controllers.data.Magic; +import noppes.npcs.controllers.data.MagicCycle; +import noppes.npcs.controllers.data.MagicData; +import noppes.npcs.controllers.data.PlayerBankData; +import noppes.npcs.controllers.data.PlayerData; +import noppes.npcs.controllers.data.PlayerDialogData; +import noppes.npcs.controllers.data.PlayerFactionData; +import noppes.npcs.controllers.data.PlayerQuestData; +import noppes.npcs.controllers.data.PlayerTransportData; +import noppes.npcs.controllers.data.Quest; +import noppes.npcs.controllers.data.QuestCategory; +import noppes.npcs.controllers.data.QuestData; +import noppes.npcs.controllers.data.RecipeAnvil; +import noppes.npcs.controllers.data.RecipeCarpentry; +import noppes.npcs.controllers.data.Tag; +import noppes.npcs.controllers.data.TransportCategory; +import noppes.npcs.controllers.data.TransportLocation; import noppes.npcs.entity.EntityDialogNpc; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.RoleTransporter; @@ -60,7 +97,11 @@ import noppes.npcs.scripted.event.player.DialogEvent; import java.io.File; import java.io.IOException; import java.text.DecimalFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; import static kamkeel.npcs.network.packets.data.large.ScrollDataPacket.sendScrollData; @@ -544,7 +585,11 @@ public class NoppesUtilServer { PlayerDataController.Instance.nameUUIDs.remove(name); PlayerDataController.Instance.savePlayerDataMap(); + int currentSlot = playerdata.profileSlot; + playerdata.setNBT(new NBTTagCompound()); + playerdata.profileSlot = currentSlot; + sendPlayerData(type, player, name); playerdata.save(); return; diff --git a/src/main/java/noppes/npcs/ScriptItemEventHandler.java b/src/main/java/noppes/npcs/ScriptItemEventHandler.java index 7aa6b8a45..ea02d2556 100644 --- a/src/main/java/noppes/npcs/ScriptItemEventHandler.java +++ b/src/main/java/noppes/npcs/ScriptItemEventHandler.java @@ -2,8 +2,6 @@ package noppes.npcs; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent; -import kamkeel.npcs.network.PacketClient; -import kamkeel.npcs.network.packets.request.item.ColorBrushPacket; import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -15,7 +13,11 @@ import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.event.entity.EntityJoinWorldEvent; import net.minecraftforge.event.entity.item.ItemTossEvent; import net.minecraftforge.event.entity.living.LivingEvent; -import net.minecraftforge.event.entity.player.*; +import net.minecraftforge.event.entity.player.AnvilRepairEvent; +import net.minecraftforge.event.entity.player.EntityInteractEvent; +import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent; +import net.minecraftforge.event.entity.player.PlayerInteractEvent; +import net.minecraftforge.event.entity.player.PlayerUseItemEvent; import noppes.npcs.api.IWorld; import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.item.IItemCustomizable; diff --git a/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java b/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java index 8f8ffbb2f..cb445bb7f 100644 --- a/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java +++ b/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java @@ -20,25 +20,45 @@ import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.event.entity.EntityStruckByLightningEvent; import net.minecraftforge.event.entity.PlaySoundAtEntityEvent; import net.minecraftforge.event.entity.item.ItemTossEvent; -import net.minecraftforge.event.entity.living.*; -import net.minecraftforge.event.entity.player.*; +import net.minecraftforge.event.entity.living.LivingAttackEvent; +import net.minecraftforge.event.entity.living.LivingDeathEvent; +import net.minecraftforge.event.entity.living.LivingEvent; +import net.minecraftforge.event.entity.living.LivingFallEvent; +import net.minecraftforge.event.entity.living.LivingHurtEvent; +import net.minecraftforge.event.entity.player.AchievementEvent; +import net.minecraftforge.event.entity.player.ArrowLooseEvent; +import net.minecraftforge.event.entity.player.ArrowNockEvent; +import net.minecraftforge.event.entity.player.BonemealEvent; +import net.minecraftforge.event.entity.player.EntityInteractEvent; +import net.minecraftforge.event.entity.player.FillBucketEvent; +import net.minecraftforge.event.entity.player.PlayerDropsEvent; +import net.minecraftforge.event.entity.player.PlayerInteractEvent; +import net.minecraftforge.event.entity.player.PlayerOpenContainerEvent; +import net.minecraftforge.event.entity.player.PlayerPickupXpEvent; +import net.minecraftforge.event.entity.player.PlayerSleepInBedEvent; +import net.minecraftforge.event.entity.player.PlayerUseItemEvent; +import net.minecraftforge.event.entity.player.PlayerWakeUpEvent; +import net.minecraftforge.event.entity.player.UseHoeEvent; import net.minecraftforge.event.world.BlockEvent; import noppes.npcs.api.IWorld; import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.item.IItemCustomizable; import noppes.npcs.config.ConfigMain; +import noppes.npcs.config.ConfigScript; import noppes.npcs.constants.EnumQuestType; import noppes.npcs.controllers.CustomEffectController; import noppes.npcs.controllers.PartyController; import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.controllers.ScriptController; -import noppes.npcs.controllers.data.*; +import noppes.npcs.controllers.data.Party; +import noppes.npcs.controllers.data.PlayerData; +import noppes.npcs.controllers.data.PlayerDataScript; +import noppes.npcs.controllers.data.PlayerQuestData; +import noppes.npcs.controllers.data.Quest; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.items.ItemNpcTool; -import noppes.npcs.items.ItemScripted; import noppes.npcs.quests.QuestItem; import noppes.npcs.scripted.NpcAPI; -import noppes.npcs.scripted.event.ItemEvent; import static noppes.npcs.config.ConfigMain.TrackedQuestUpdateFrequency; @@ -73,7 +93,7 @@ public class ScriptPlayerEventHandler { if (PlayerDataController.Instance != null) { PlayerData playerData = PlayerData.get(player); - playerData.actionManager.tick(player.ticksExisted); + playerData.actionManager.tick(); if (playerData.updateClient) { SyncController.syncPlayerData((EntityPlayerMP) player, true); @@ -143,7 +163,7 @@ public class ScriptPlayerEventHandler { if (event.entityPlayer == null || event.entityPlayer.worldObj == null || event.entityPlayer.worldObj.isRemote || !(event.entityPlayer instanceof EntityPlayerMP)) return; - if(event.action == PlayerInteractEvent.Action.LEFT_CLICK_BLOCK) + if (event.action == PlayerInteractEvent.Action.LEFT_CLICK_BLOCK) return; IPlayer ip = NoppesUtilServer.getIPlayer(event.entityPlayer); @@ -153,14 +173,14 @@ public class ScriptPlayerEventHandler { return; } - if (event.action == PlayerInteractEvent.Action.RIGHT_CLICK_AIR){ + if (event.action == PlayerInteractEvent.Action.RIGHT_CLICK_AIR) { if (pd.hadInteract) { pd.hadInteract = false; return; } noppes.npcs.scripted.event.player.PlayerEvent.RightClickEvent rightClickEvent = new noppes.npcs.scripted.event.player.PlayerEvent.RightClickEvent(ip, 0, null); event.setCanceled(EventHooks.onPlayerRightClick(handler, rightClickEvent)); - } else if (event.action == PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK){ + } else if (event.action == PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) { pd.hadInteract = true; IWorld iw = (IWorld) NpcAPI.Instance().getIWorld(event.world); Object blockCtx = NpcAPI.Instance().getIBlock(iw, event.x, event.y, event.z); @@ -496,7 +516,8 @@ public class ScriptPlayerEventHandler { EntityPlayer player = (EntityPlayer) event.entityLiving; PlayerData playerData = PlayerData.get(player); - playerData.actionManager.clear(); + if (ConfigScript.ClearActionsOnDeath) + playerData.actionManager.clear(); } if (event.source.getEntity() instanceof EntityPlayerMP) { diff --git a/src/main/java/noppes/npcs/ServerEventsHandler.java b/src/main/java/noppes/npcs/ServerEventsHandler.java index f8333cc2b..acc72a56c 100644 --- a/src/main/java/noppes/npcs/ServerEventsHandler.java +++ b/src/main/java/noppes/npcs/ServerEventsHandler.java @@ -48,7 +48,15 @@ import noppes.npcs.constants.EnumQuestType; import noppes.npcs.constants.EnumRoleType; import noppes.npcs.controllers.PartyController; import noppes.npcs.controllers.ServerCloneController; -import noppes.npcs.controllers.data.*; +import noppes.npcs.controllers.data.Animation; +import noppes.npcs.controllers.data.AnimationData; +import noppes.npcs.controllers.data.Line; +import noppes.npcs.controllers.data.MarkData; +import noppes.npcs.controllers.data.Party; +import noppes.npcs.controllers.data.PlayerData; +import noppes.npcs.controllers.data.PlayerQuestData; +import noppes.npcs.controllers.data.Quest; +import noppes.npcs.controllers.data.QuestData; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.items.ItemExcalibur; import noppes.npcs.items.ItemShield; @@ -285,6 +293,16 @@ public class ServerEventsHandler { } } + @SubscribeEvent + public void onPlayerRespawn(cpw.mods.fml.common.gameevent.PlayerEvent.PlayerRespawnEvent event) { + if (event.player == null || event.player.worldObj == null || event.player.worldObj.isRemote) + return; + + PlayerData data = PlayerData.get(event.player); + data.setGUIOpen(false); + data.editingNpc = null; + } + private void doExcalibur(EntityPlayer player, EntityLivingBase entity) { ItemStack item = player.getCurrentEquippedItem(); if (item == null || item.getItem() != CustomItems.excalibur) diff --git a/src/main/java/noppes/npcs/ServerTickHandler.java b/src/main/java/noppes/npcs/ServerTickHandler.java index c73874df5..ef2ba0847 100644 --- a/src/main/java/noppes/npcs/ServerTickHandler.java +++ b/src/main/java/noppes/npcs/ServerTickHandler.java @@ -11,13 +11,22 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.world.WorldServer; import noppes.npcs.client.AnalyticsTracking; import noppes.npcs.controllers.data.PlayerData; +import noppes.npcs.controllers.data.action.ActionManager; import java.net.InetAddress; import java.net.UnknownHostException; public class ServerTickHandler { + @SubscribeEvent - public void onServerTick(TickEvent.WorldTickEvent event) { + public void onServerTick(TickEvent.ServerTickEvent event) { + if (event.phase == Phase.END) { + ActionManager.GLOBAL.tick(); + } + } + + @SubscribeEvent + public void onWorldTick(TickEvent.WorldTickEvent event) { if (event.phase == Phase.START) { NPCSpawning.findChunksForSpawning((WorldServer) event.world); } @@ -28,32 +37,33 @@ public class ServerTickHandler { @SubscribeEvent public void playerLogin(PlayerEvent.PlayerLoggedInEvent event) { EntityPlayerMP player = (EntityPlayerMP) event.player; - if (serverName == null) { - String e = "local"; - MinecraftServer server = MinecraftServer.getServer(); - if (server.isDedicatedServer()) { - try { - e = InetAddress.getByName(server.getServerHostname()).getCanonicalHostName(); - } catch (UnknownHostException e1) { - e = MinecraftServer.getServer().getServerHostname(); - } - if (server.getPort() != 25565) - e += ":" + server.getPort(); - } - if (e == null || e.startsWith("192.168") || e.contains("127.0.0.1") || e.startsWith("localhost")) - e = "local"; - serverName = e; - } - AnalyticsTracking.sendData(event.player, "join", serverName); + // Temporary Disabled +// if (serverName == null) { +// String e = "local"; +// MinecraftServer server = MinecraftServer.getServer(); +// if (server.isDedicatedServer()) { +// try { +// e = InetAddress.getByName(server.getServerHostname()).getCanonicalHostName(); +// } catch (UnknownHostException e1) { +// e = MinecraftServer.getServer().getServerHostname(); +// } +// if (server.getPort() != 25565) +// e += ":" + server.getPort(); +// } +// if (e == null || e.startsWith("192.168") || e.contains("127.0.0.1") || e.startsWith("localhost")) +// e = "local"; +// serverName = e; +// } +// AnalyticsTracking.sendData(event.player, "join", serverName); PlayerData playerData = PlayerData.get(event.player); if (playerData != null) { playerData.onLogin(); } + ProfileController.Instance.login(player); SyncController.syncPlayer(player); SyncController.syncEffects(player); - ProfileController.Instance.login(player); } @SubscribeEvent @@ -62,5 +72,8 @@ public class ServerTickHandler { if (playerData != null) { playerData.onLogout(); } + + // Save and unload the player's profile data on logout + ProfileController.Instance.logout(event.player); } } diff --git a/src/main/java/noppes/npcs/ai/pathfinder/FlyPathFinder.java b/src/main/java/noppes/npcs/ai/pathfinder/FlyPathFinder.java index 090986165..ebe00c28e 100644 --- a/src/main/java/noppes/npcs/ai/pathfinder/FlyPathFinder.java +++ b/src/main/java/noppes/npcs/ai/pathfinder/FlyPathFinder.java @@ -2,7 +2,12 @@ package noppes.npcs.ai.pathfinder; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import net.minecraft.block.*; +import net.minecraft.block.Block; +import net.minecraft.block.BlockDoor; +import net.minecraft.block.BlockFence; +import net.minecraft.block.BlockFenceGate; +import net.minecraft.block.BlockRailBase; +import net.minecraft.block.BlockWall; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; diff --git a/src/main/java/noppes/npcs/blocks/BlockSign.java b/src/main/java/noppes/npcs/blocks/BlockSign.java index 456cd0b33..241749360 100644 --- a/src/main/java/noppes/npcs/blocks/BlockSign.java +++ b/src/main/java/noppes/npcs/blocks/BlockSign.java @@ -11,7 +11,6 @@ import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import noppes.npcs.blocks.tiles.TileBanner; import noppes.npcs.blocks.tiles.TileSign; import noppes.npcs.blocks.tiles.TileVariant; @@ -37,7 +36,7 @@ public class BlockSign extends BlockRotated { @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { - TileBanner tile = (TileBanner) world.getTileEntity(x, y, z); + TileSign tile = (TileSign) world.getTileEntity(x, y, z); return tile.canEdit(); } diff --git a/src/main/java/noppes/npcs/blocks/BlockWallBanner.java b/src/main/java/noppes/npcs/blocks/BlockWallBanner.java index 3e4aeec6e..82d4b44fc 100644 --- a/src/main/java/noppes/npcs/blocks/BlockWallBanner.java +++ b/src/main/java/noppes/npcs/blocks/BlockWallBanner.java @@ -14,7 +14,11 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.*; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; +import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import noppes.npcs.NoppesUtilServer; import noppes.npcs.blocks.tiles.TileColorable; diff --git a/src/main/java/noppes/npcs/blocks/tiles/TileScripted.java b/src/main/java/noppes/npcs/blocks/tiles/TileScripted.java index ce535cc2d..8babf8936 100644 --- a/src/main/java/noppes/npcs/blocks/tiles/TileScripted.java +++ b/src/main/java/noppes/npcs/blocks/tiles/TileScripted.java @@ -16,7 +16,11 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; -import noppes.npcs.*; +import noppes.npcs.CustomItems; +import noppes.npcs.EventHooks; +import noppes.npcs.NBTTags; +import noppes.npcs.NoppesUtilPlayer; +import noppes.npcs.TextBlock; import noppes.npcs.api.IBlock; import noppes.npcs.api.block.ITextPlane; import noppes.npcs.client.renderer.blocks.BlockScriptedRenderer; @@ -28,8 +32,12 @@ import noppes.npcs.entity.data.DataTimers; import noppes.npcs.scripted.BlockScriptedWrapper; import noppes.npcs.util.ValueUtil; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; +import java.util.TreeMap; public class TileScripted extends TileEntity implements IScriptBlockHandler { public List scripts = new ArrayList<>(); diff --git a/src/main/java/noppes/npcs/blocks/tiles/TileVariant.java b/src/main/java/noppes/npcs/blocks/tiles/TileVariant.java index f893a4d05..1a9e26e4f 100644 --- a/src/main/java/noppes/npcs/blocks/tiles/TileVariant.java +++ b/src/main/java/noppes/npcs/blocks/tiles/TileVariant.java @@ -7,7 +7,6 @@ import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.Facing; import static noppes.npcs.items.ItemNpcTool.BRUSH_COLOR_TAG; diff --git a/src/main/java/noppes/npcs/blocks/tiles/TileWaypoint.java b/src/main/java/noppes/npcs/blocks/tiles/TileWaypoint.java index 20f2326ff..b4f635d02 100644 --- a/src/main/java/noppes/npcs/blocks/tiles/TileWaypoint.java +++ b/src/main/java/noppes/npcs/blocks/tiles/TileWaypoint.java @@ -8,7 +8,11 @@ import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.StatCollector; import noppes.npcs.constants.EnumQuestType; import noppes.npcs.controllers.PartyController; -import noppes.npcs.controllers.data.*; +import noppes.npcs.controllers.data.Party; +import noppes.npcs.controllers.data.PlayerData; +import noppes.npcs.controllers.data.PlayerQuestData; +import noppes.npcs.controllers.data.Quest; +import noppes.npcs.controllers.data.QuestData; import noppes.npcs.quests.QuestLocation; import java.util.ArrayList; diff --git a/src/main/java/noppes/npcs/client/AssetsBrowser.java b/src/main/java/noppes/npcs/client/AssetsBrowser.java index 1fc83c868..92ce5b5de 100644 --- a/src/main/java/noppes/npcs/client/AssetsBrowser.java +++ b/src/main/java/noppes/npcs/client/AssetsBrowser.java @@ -4,7 +4,13 @@ import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.ModContainer; import cpw.mods.fml.common.ObfuscationReflectionHelper; import net.minecraft.client.Minecraft; -import net.minecraft.client.resources.*; +import net.minecraft.client.resources.AbstractResourcePack; +import net.minecraft.client.resources.FallbackResourceManager; +import net.minecraft.client.resources.IResourceManager; +import net.minecraft.client.resources.IResourcePack; +import net.minecraft.client.resources.NPCResourceHelper; +import net.minecraft.client.resources.ResourcePackRepository; +import net.minecraft.client.resources.SimpleReloadableResourceManager; import org.apache.commons.lang3.StringUtils; import java.io.File; diff --git a/src/main/java/noppes/npcs/client/ClientEventHandler.java b/src/main/java/noppes/npcs/client/ClientEventHandler.java index 1d24d2692..deb374ab2 100644 --- a/src/main/java/noppes/npcs/client/ClientEventHandler.java +++ b/src/main/java/noppes/npcs/client/ClientEventHandler.java @@ -14,7 +14,11 @@ import net.minecraft.client.renderer.entity.RendererLivingEntity; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.event.*; +import net.minecraftforge.client.event.MouseEvent; +import net.minecraftforge.client.event.RenderGameOverlayEvent; +import net.minecraftforge.client.event.RenderHandEvent; +import net.minecraftforge.client.event.RenderLivingEvent; +import net.minecraftforge.client.event.RenderPlayerEvent; import noppes.npcs.client.gui.customoverlay.OverlayCustom; import noppes.npcs.client.gui.hud.ClientHudManager; import noppes.npcs.client.gui.hud.CompassHudComponent; @@ -30,7 +34,12 @@ import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.entity.EntityNPCInterface; import java.lang.reflect.Field; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; public class ClientEventHandler { public static final RenderCNPCPlayer renderCNPCSelf = new RenderCNPCPlayer(); diff --git a/src/main/java/noppes/npcs/client/ClientProxy.java b/src/main/java/noppes/npcs/client/ClientProxy.java index f93153c48..f0346a5d3 100644 --- a/src/main/java/noppes/npcs/client/ClientProxy.java +++ b/src/main/java/noppes/npcs/client/ClientProxy.java @@ -34,41 +34,176 @@ import noppes.npcs.CustomItems; import noppes.npcs.CustomNpcs; import noppes.npcs.LogWriter; import noppes.npcs.api.IWorld; -import noppes.npcs.blocks.tiles.*; -import noppes.npcs.client.controllers.*; +import noppes.npcs.blocks.tiles.TileBanner; +import noppes.npcs.blocks.tiles.TileBarrel; +import noppes.npcs.blocks.tiles.TileBeam; +import noppes.npcs.blocks.tiles.TileBigSign; +import noppes.npcs.blocks.tiles.TileBlockAnvil; +import noppes.npcs.blocks.tiles.TileBook; +import noppes.npcs.blocks.tiles.TileCampfire; +import noppes.npcs.blocks.tiles.TileCandle; +import noppes.npcs.blocks.tiles.TileChair; +import noppes.npcs.blocks.tiles.TileCouchWood; +import noppes.npcs.blocks.tiles.TileCouchWool; +import noppes.npcs.blocks.tiles.TileCrate; +import noppes.npcs.blocks.tiles.TileLamp; +import noppes.npcs.blocks.tiles.TileMailbox; +import noppes.npcs.blocks.tiles.TilePedestal; +import noppes.npcs.blocks.tiles.TileScripted; +import noppes.npcs.blocks.tiles.TileShelf; +import noppes.npcs.blocks.tiles.TileShortLamp; +import noppes.npcs.blocks.tiles.TileSign; +import noppes.npcs.blocks.tiles.TileStool; +import noppes.npcs.blocks.tiles.TileTable; +import noppes.npcs.blocks.tiles.TileTallLamp; +import noppes.npcs.blocks.tiles.TileTombstone; +import noppes.npcs.blocks.tiles.TileWallBanner; +import noppes.npcs.blocks.tiles.TileWeaponRack; +import noppes.npcs.client.controllers.ClientCloneController; +import noppes.npcs.client.controllers.ClientTagMapController; +import noppes.npcs.client.controllers.MusicController; +import noppes.npcs.client.controllers.PresetController; +import noppes.npcs.client.controllers.ScriptSoundController; import noppes.npcs.client.fx.EntityBigSmokeFX; import noppes.npcs.client.fx.EntityElementalStaffFX; import noppes.npcs.client.fx.EntityEnderFX; import noppes.npcs.client.fx.EntityRainbowFX; -import noppes.npcs.client.gui.*; +import noppes.npcs.client.gui.GuiBorderBlock; +import noppes.npcs.client.gui.GuiMerchantAdd; +import noppes.npcs.client.gui.GuiNpcDimension; +import noppes.npcs.client.gui.GuiNpcMobSpawner; +import noppes.npcs.client.gui.GuiNpcMobSpawnerMounter; +import noppes.npcs.client.gui.GuiNpcPather; +import noppes.npcs.client.gui.GuiNpcRedstoneBlock; +import noppes.npcs.client.gui.GuiNpcRemoteEditor; +import noppes.npcs.client.gui.GuiNpcWaypoint; +import noppes.npcs.client.gui.GuiScript; import noppes.npcs.client.gui.custom.GuiCustom; -import noppes.npcs.client.gui.global.*; +import noppes.npcs.client.gui.global.GuiNPCManageAnimations; +import noppes.npcs.client.gui.global.GuiNPCManageBanks; +import noppes.npcs.client.gui.global.GuiNPCManageDialogs; +import noppes.npcs.client.gui.global.GuiNPCManageEffects; +import noppes.npcs.client.gui.global.GuiNPCManageFactions; +import noppes.npcs.client.gui.global.GuiNPCManageLinked; +import noppes.npcs.client.gui.global.GuiNPCManageQuest; +import noppes.npcs.client.gui.global.GuiNPCManageTags; +import noppes.npcs.client.gui.global.GuiNPCManageTransporters; +import noppes.npcs.client.gui.global.GuiNpcManageMagic; +import noppes.npcs.client.gui.global.GuiNpcManageRecipes; +import noppes.npcs.client.gui.global.GuiNpcQuestReward; import noppes.npcs.client.gui.item.GuiNpcMagicBook; import noppes.npcs.client.gui.item.GuiNpcPaintbrush; -import noppes.npcs.client.gui.mainmenu.*; -import noppes.npcs.client.gui.player.*; +import noppes.npcs.client.gui.mainmenu.GuiNPCGlobalMainMenu; +import noppes.npcs.client.gui.mainmenu.GuiNPCInv; +import noppes.npcs.client.gui.mainmenu.GuiNpcAI; +import noppes.npcs.client.gui.mainmenu.GuiNpcAdvanced; +import noppes.npcs.client.gui.mainmenu.GuiNpcDisplay; +import noppes.npcs.client.gui.mainmenu.GuiNpcStats; +import noppes.npcs.client.gui.player.GuiBigSign; +import noppes.npcs.client.gui.player.GuiCrate; +import noppes.npcs.client.gui.player.GuiMailbox; +import noppes.npcs.client.gui.player.GuiMailmanWrite; +import noppes.npcs.client.gui.player.GuiNPCBankChest; +import noppes.npcs.client.gui.player.GuiNPCTrader; +import noppes.npcs.client.gui.player.GuiNpcAnvil; +import noppes.npcs.client.gui.player.GuiNpcCarpentryBench; +import noppes.npcs.client.gui.player.GuiNpcFollower; +import noppes.npcs.client.gui.player.GuiNpcFollowerHire; +import noppes.npcs.client.gui.player.GuiTransportSelection; import noppes.npcs.client.gui.player.companion.GuiNpcCompanionInv; import noppes.npcs.client.gui.player.companion.GuiNpcCompanionStats; import noppes.npcs.client.gui.player.companion.GuiNpcCompanionTalents; import noppes.npcs.client.gui.player.modern.BlurEventHandler; import noppes.npcs.client.gui.questtypes.GuiNpcQuestTypeItem; -import noppes.npcs.client.gui.roles.*; +import noppes.npcs.client.gui.roles.GuiNpcBankSetup; +import noppes.npcs.client.gui.roles.GuiNpcFollowerSetup; +import noppes.npcs.client.gui.roles.GuiNpcItemGiver; +import noppes.npcs.client.gui.roles.GuiNpcTraderSetup; +import noppes.npcs.client.gui.roles.GuiNpcTransporter; import noppes.npcs.client.gui.script.GuiScriptBlock; import noppes.npcs.client.gui.script.GuiScriptGlobal; import noppes.npcs.client.gui.script.GuiScriptItem; -import noppes.npcs.client.model.*; -import noppes.npcs.client.renderer.*; -import noppes.npcs.client.renderer.blocks.*; -import noppes.npcs.client.renderer.items.*; +import noppes.npcs.client.model.ModelNPCGolem; +import noppes.npcs.client.model.ModelNpcCrystal; +import noppes.npcs.client.model.ModelNpcDragon; +import noppes.npcs.client.model.ModelNpcSlime; +import noppes.npcs.client.model.ModelSkirtArmor; +import noppes.npcs.client.renderer.NpcItemRenderer; +import noppes.npcs.client.renderer.RenderCustomNpc; +import noppes.npcs.client.renderer.RenderNPCHumanMale; +import noppes.npcs.client.renderer.RenderNPCPony; +import noppes.npcs.client.renderer.RenderNpcCrystal; +import noppes.npcs.client.renderer.RenderNpcDragon; +import noppes.npcs.client.renderer.RenderNpcSlime; +import noppes.npcs.client.renderer.RenderProjectile; +import noppes.npcs.client.renderer.blocks.BlockBannerRenderer; +import noppes.npcs.client.renderer.blocks.BlockBarrelRenderer; +import noppes.npcs.client.renderer.blocks.BlockBeamRenderer; +import noppes.npcs.client.renderer.blocks.BlockBigSignRenderer; +import noppes.npcs.client.renderer.blocks.BlockBloodRenderer; +import noppes.npcs.client.renderer.blocks.BlockBookRenderer; +import noppes.npcs.client.renderer.blocks.BlockBorderRenderer; +import noppes.npcs.client.renderer.blocks.BlockCampfireRenderer; +import noppes.npcs.client.renderer.blocks.BlockCandleRenderer; +import noppes.npcs.client.renderer.blocks.BlockCarpentryBenchRenderer; +import noppes.npcs.client.renderer.blocks.BlockChairRenderer; +import noppes.npcs.client.renderer.blocks.BlockCouchWoodRenderer; +import noppes.npcs.client.renderer.blocks.BlockCouchWoolRenderer; +import noppes.npcs.client.renderer.blocks.BlockCrateRenderer; +import noppes.npcs.client.renderer.blocks.BlockLanternRenderer; +import noppes.npcs.client.renderer.blocks.BlockMailboxRenderer; +import noppes.npcs.client.renderer.blocks.BlockPedestalRenderer; +import noppes.npcs.client.renderer.blocks.BlockScriptedRenderer; +import noppes.npcs.client.renderer.blocks.BlockShelfRenderer; +import noppes.npcs.client.renderer.blocks.BlockShortLampRenderer; +import noppes.npcs.client.renderer.blocks.BlockSignRenderer; +import noppes.npcs.client.renderer.blocks.BlockStoolRenderer; +import noppes.npcs.client.renderer.blocks.BlockTableRenderer; +import noppes.npcs.client.renderer.blocks.BlockTallLampRenderer; +import noppes.npcs.client.renderer.blocks.BlockTombstoneRenderer; +import noppes.npcs.client.renderer.blocks.BlockWallBannerRenderer; +import noppes.npcs.client.renderer.blocks.BlockWeaponRackRenderer; +import noppes.npcs.client.renderer.items.ItemBannerRenderer; +import noppes.npcs.client.renderer.items.ItemBannerWallRenderer; +import noppes.npcs.client.renderer.items.ItemCouchWoolRenderer; +import noppes.npcs.client.renderer.items.ItemCustomRenderer; +import noppes.npcs.client.renderer.items.ItemShortLampRenderer; +import noppes.npcs.client.renderer.items.ItemTallLampRenderer; +import noppes.npcs.client.renderer.items.ItemToolRenderer; +import noppes.npcs.client.renderer.items.ScriptedBlockItemRenderer; import noppes.npcs.config.ConfigClient; import noppes.npcs.config.ConfigItem; import noppes.npcs.config.ConfigMain; import noppes.npcs.config.StringCache; import noppes.npcs.constants.EnumGuiType; -import noppes.npcs.containers.*; +import noppes.npcs.containers.ContainerAnvilRepair; +import noppes.npcs.containers.ContainerCarpentryBench; +import noppes.npcs.containers.ContainerCrate; +import noppes.npcs.containers.ContainerCustomGui; +import noppes.npcs.containers.ContainerMail; +import noppes.npcs.containers.ContainerManageBanks; +import noppes.npcs.containers.ContainerManageRecipes; +import noppes.npcs.containers.ContainerNPCBankInterface; +import noppes.npcs.containers.ContainerNPCCompanion; +import noppes.npcs.containers.ContainerNPCFollower; +import noppes.npcs.containers.ContainerNPCFollowerHire; +import noppes.npcs.containers.ContainerNPCFollowerSetup; +import noppes.npcs.containers.ContainerNPCInv; +import noppes.npcs.containers.ContainerNPCTrader; +import noppes.npcs.containers.ContainerNPCTraderSetup; +import noppes.npcs.containers.ContainerNpcItemGiver; +import noppes.npcs.containers.ContainerNpcQuestReward; +import noppes.npcs.containers.ContainerNpcQuestTypeItem; import noppes.npcs.controllers.data.AnimationData; import noppes.npcs.controllers.data.PlayerData; -import noppes.npcs.entity.*; +import noppes.npcs.entity.EntityCustomNpc; +import noppes.npcs.entity.EntityNPCGolem; +import noppes.npcs.entity.EntityNPCInterface; +import noppes.npcs.entity.EntityNpcCrystal; +import noppes.npcs.entity.EntityNpcDragon; +import noppes.npcs.entity.EntityNpcPony; +import noppes.npcs.entity.EntityNpcSlime; +import noppes.npcs.entity.EntityProjectile; import noppes.npcs.entity.data.ModelData; import noppes.npcs.entity.data.ModelPartData; import noppes.npcs.items.ItemLinked; @@ -155,7 +290,6 @@ public class ClientProxy extends CommonProxy { NPCButton = new KeyBinding("NPC Inventory", Keyboard.KEY_N, "key.categories.customnpc"); ClientRegistry.registerKeyBinding(NPCButton); - mc.gameSettings.loadOptions(); new PresetController(CustomNpcs.Dir); diff --git a/src/main/java/noppes/npcs/client/CustomNpcResourceListener.java b/src/main/java/noppes/npcs/client/CustomNpcResourceListener.java index 8aeeff628..132805af1 100644 --- a/src/main/java/noppes/npcs/client/CustomNpcResourceListener.java +++ b/src/main/java/noppes/npcs/client/CustomNpcResourceListener.java @@ -14,6 +14,7 @@ import javax.imageio.ImageIO; import java.awt.*; import java.awt.image.BufferedImage; import java.io.File; +import java.io.InputStream; public class CustomNpcResourceListener implements IResourceManagerReloadListener { @@ -59,21 +60,23 @@ public class CustomNpcResourceListener implements try { IResourceManager manager = Minecraft.getMinecraft().getResourceManager(); ResourceLocation location = new ResourceLocation("textures/blocks/" + texture + ".png"); - BufferedImage bufferedimage = ImageIO.read(manager.getResource(location).getInputStream()); - int i = bufferedimage.getWidth(); - int j = bufferedimage.getHeight(); + try (InputStream stream = manager.getResource(location).getInputStream()) { + BufferedImage bufferedimage = ImageIO.read(stream); + int i = bufferedimage.getWidth(); + int j = bufferedimage.getHeight(); - BufferedImage image = new BufferedImage(i * 4, j * 2, BufferedImage.TYPE_INT_RGB); - Graphics g = image.getGraphics(); - g.drawImage(bufferedimage, 0, 0, null); - g.drawImage(bufferedimage, i, 0, null); - g.drawImage(bufferedimage, i * 2, 0, null); - g.drawImage(bufferedimage, i * 3, 0, null); - g.drawImage(bufferedimage, 0, i, null); - g.drawImage(bufferedimage, i, j, null); - g.drawImage(bufferedimage, i * 2, j, null); - g.drawImage(bufferedimage, i * 3, j, null); - ImageIO.write(image, "png", new File(dir, texture + ".png")); + BufferedImage image = new BufferedImage(i * 4, j * 2, BufferedImage.TYPE_INT_RGB); + Graphics g = image.getGraphics(); + g.drawImage(bufferedimage, 0, 0, null); + g.drawImage(bufferedimage, i, 0, null); + g.drawImage(bufferedimage, i * 2, 0, null); + g.drawImage(bufferedimage, i * 3, 0, null); + g.drawImage(bufferedimage, 0, i, null); + g.drawImage(bufferedimage, i, j, null); + g.drawImage(bufferedimage, i * 2, j, null); + g.drawImage(bufferedimage, i * 3, j, null); + ImageIO.write(image, "png", new File(dir, texture + ".png")); + } } catch (Exception e) { LogWriter.error("Failed caching texture: " + texture, e); } diff --git a/src/main/java/noppes/npcs/client/ImageDownloadAlt.java b/src/main/java/noppes/npcs/client/ImageDownloadAlt.java index 003e05159..7d986948f 100644 --- a/src/main/java/noppes/npcs/client/ImageDownloadAlt.java +++ b/src/main/java/noppes/npcs/client/ImageDownloadAlt.java @@ -16,6 +16,7 @@ import javax.imageio.ImageIO; import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; +import java.io.InputStream; import java.net.HttpURLConnection; import java.net.MalformedURLException; import java.net.URL; @@ -122,10 +123,14 @@ public class ImageDownloadAlt extends SimpleTexture { BufferedImage bufferedimage; if (ImageDownloadAlt.this.cacheFile != null) { - FileUtils.copyInputStreamToFile(connection.getInputStream(), ImageDownloadAlt.this.cacheFile); + try (InputStream in = connection.getInputStream()) { + FileUtils.copyInputStreamToFile(in, ImageDownloadAlt.this.cacheFile); + } bufferedimage = ImageIO.read(ImageDownloadAlt.this.cacheFile); } else { - bufferedimage = ImageIO.read(connection.getInputStream()); + try (InputStream in = connection.getInputStream()) { + bufferedimage = ImageIO.read(in); + } } if (ImageDownloadAlt.this.imageBuffer != null) { diff --git a/src/main/java/noppes/npcs/client/controllers/MusicController.java b/src/main/java/noppes/npcs/client/controllers/MusicController.java index e3a2213b8..fc2d9369b 100644 --- a/src/main/java/noppes/npcs/client/controllers/MusicController.java +++ b/src/main/java/noppes/npcs/client/controllers/MusicController.java @@ -56,16 +56,22 @@ public class MusicController { public void stopMusic() { SoundHandler soundHandler = Minecraft.getMinecraft().getSoundHandler(); - if (soundHandler != null) { + if (this.playingSound != null) { + if (soundHandler != null) { + try { + soundHandler.stopSound(this.playingSound); + } catch (Exception ignored) { + } + } + this.playingSound.stopSound(); + this.sounds.remove(this.playingSound.sound); + this.playingSound = null; + } else if (soundHandler != null) { try { soundHandler.stopSounds(); } catch (Exception ignored) { } } - if (this.playingSound != null) { - this.playingSound.stopSound(); - this.playingSound = null; - } } public void playMusicJukebox(String music, Entity entity, int offRange) { diff --git a/src/main/java/noppes/npcs/client/controllers/PresetController.java b/src/main/java/noppes/npcs/client/controllers/PresetController.java index 2e9d8605e..0f4074bb5 100644 --- a/src/main/java/noppes/npcs/client/controllers/PresetController.java +++ b/src/main/java/noppes/npcs/client/controllers/PresetController.java @@ -52,7 +52,9 @@ public class PresetController { if (!file.exists()) { return null; } - return CompressedStreamTools.readCompressed(new FileInputStream(file)); + try (FileInputStream fis = new FileInputStream(file)) { + return CompressedStreamTools.readCompressed(fis); + } } catch (Exception e) { LogWriter.except(e); } @@ -61,7 +63,9 @@ public class PresetController { if (!file.exists()) { return null; } - return CompressedStreamTools.readCompressed(new FileInputStream(file)); + try (FileInputStream fis = new FileInputStream(file)) { + return CompressedStreamTools.readCompressed(fis); + } } catch (Exception e) { LogWriter.except(e); diff --git a/src/main/java/noppes/npcs/client/gui/GuiBorderBlock.java b/src/main/java/noppes/npcs/client/gui/GuiBorderBlock.java index cf5549c70..cc2cc57a0 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiBorderBlock.java +++ b/src/main/java/noppes/npcs/client/gui/GuiBorderBlock.java @@ -6,7 +6,11 @@ import kamkeel.npcs.network.packets.request.TileEntitySavePacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.blocks.tiles.TileBorder; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNPCInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.IGuiData; public class GuiBorderBlock extends GuiNPCInterface implements IGuiData { diff --git a/src/main/java/noppes/npcs/client/gui/GuiNPCFactionSelection.java b/src/main/java/noppes/npcs/client/gui/GuiNPCFactionSelection.java index 45b402e72..8b36ab4eb 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNPCFactionSelection.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNPCFactionSelection.java @@ -5,7 +5,11 @@ import kamkeel.npcs.network.packets.request.faction.FactionsGetPacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import noppes.npcs.client.NoppesUtil; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNPCInterface; +import noppes.npcs.client.gui.util.GuiNPCStringSlot; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiSelectionListener; +import noppes.npcs.client.gui.util.IScrollData; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/client/gui/GuiNPCLinesEdit.java b/src/main/java/noppes/npcs/client/gui/GuiNPCLinesEdit.java index e140434a0..95a1db653 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNPCLinesEdit.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNPCLinesEdit.java @@ -6,7 +6,13 @@ import kamkeel.npcs.network.packets.request.mainmenu.MainmenuAdvancedSavePacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.gui.select.GuiSoundSelection; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.controllers.data.Line; import noppes.npcs.controllers.data.Lines; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcDimension.java b/src/main/java/noppes/npcs/client/gui/GuiNpcDimension.java index 309eca9b5..514f7df7a 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNpcDimension.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNpcDimension.java @@ -7,7 +7,11 @@ import kamkeel.npcs.network.packets.request.npc.RemoteDeletePacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.util.StatCollector; import noppes.npcs.client.NoppesUtil; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNPCInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.IScrollData; import noppes.npcs.constants.EnumScrollData; import java.util.HashMap; diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawner.java b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawner.java index 8c07cb55a..b3670d9e8 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawner.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawner.java @@ -1,7 +1,12 @@ package noppes.npcs.client.gui; import kamkeel.npcs.network.PacketClient; -import kamkeel.npcs.network.packets.request.clone.*; +import kamkeel.npcs.network.packets.request.clone.CloneAllTagsPacket; +import kamkeel.npcs.network.packets.request.clone.CloneListPacket; +import kamkeel.npcs.network.packets.request.clone.CloneRemovePacket; +import kamkeel.npcs.network.packets.request.clone.CloneTagListPacket; +import kamkeel.npcs.network.packets.request.clone.MobSpawnerPacket; +import kamkeel.npcs.network.packets.request.clone.SpawnMobPacket; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.Entity; @@ -13,12 +18,25 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import noppes.npcs.client.controllers.ClientCloneController; import noppes.npcs.client.controllers.ClientTagMapController; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiCustomScrollCloner; +import noppes.npcs.client.gui.util.GuiMenuSideButton; +import noppes.npcs.client.gui.util.GuiMenuTopButton; +import noppes.npcs.client.gui.util.GuiNPCInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.IGuiData; import noppes.npcs.controllers.data.Tag; import noppes.npcs.controllers.data.TagMap; import java.lang.reflect.Modifier; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.UUID; public class GuiNpcMobSpawner extends GuiNPCInterface implements IGuiData { public static HashMap tags = new HashMap<>(); diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerAdd.java b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerAdd.java index 3dc90d15f..d2895fc44 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerAdd.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerAdd.java @@ -14,7 +14,14 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; import noppes.npcs.client.controllers.ClientCloneController; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiButtonBiDirectional; +import noppes.npcs.client.gui.util.GuiNPCInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.controllers.data.Tag; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerMounter.java b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerMounter.java index 6b7ef382a..0afa7d867 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerMounter.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerMounter.java @@ -13,7 +13,13 @@ import net.minecraft.nbt.NBTTagDouble; import net.minecraft.nbt.NBTTagList; import net.minecraft.world.World; import noppes.npcs.client.controllers.ClientCloneController; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiMenuSideButton; +import noppes.npcs.client.gui.util.GuiMenuTopButton; +import noppes.npcs.client.gui.util.GuiNPCInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.IGuiData; import java.lang.reflect.Modifier; import java.util.ArrayList; diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerSelector.java b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerSelector.java index c0b988e23..9c13af815 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerSelector.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerSelector.java @@ -7,7 +7,12 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagDouble; import net.minecraft.nbt.NBTTagList; import noppes.npcs.client.controllers.ClientCloneController; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiMenuSideButton; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.SubGuiInterface; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcRemoteEditor.java b/src/main/java/noppes/npcs/client/gui/GuiNpcRemoteEditor.java index 2e92d8cce..757633c15 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNpcRemoteEditor.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNpcRemoteEditor.java @@ -1,14 +1,26 @@ package noppes.npcs.client.gui; import kamkeel.npcs.network.PacketClient; -import kamkeel.npcs.network.packets.request.npc.*; +import kamkeel.npcs.network.packets.request.npc.RemoteDeletePacket; +import kamkeel.npcs.network.packets.request.npc.RemoteFreezeGetPacket; +import kamkeel.npcs.network.packets.request.npc.RemoteFreezePacket; +import kamkeel.npcs.network.packets.request.npc.RemoteGlobalMenuPacket; +import kamkeel.npcs.network.packets.request.npc.RemoteMainMenuPacket; +import kamkeel.npcs.network.packets.request.npc.RemoteNpcsGetPacket; +import kamkeel.npcs.network.packets.request.npc.RemoteResetPacket; +import kamkeel.npcs.network.packets.request.npc.RemoteTpToNpcPacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiYesNo; import net.minecraft.client.gui.GuiYesNoCallback; import net.minecraft.entity.Entity; import net.minecraft.util.StatCollector; import noppes.npcs.client.NoppesUtil; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNPCInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.IScrollData; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcSelectionInterface.java b/src/main/java/noppes/npcs/client/gui/GuiNpcSelectionInterface.java index aeb2346be..e47c18135 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNpcSelectionInterface.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNpcSelectionInterface.java @@ -5,7 +5,11 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.util.StatCollector; import noppes.npcs.client.AssetsBrowser; import noppes.npcs.client.NoppesUtil; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNPCInterface; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNPCStringSlot; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; import noppes.npcs.entity.EntityNPCInterface; import java.util.Collections; diff --git a/src/main/java/noppes/npcs/client/gui/GuiScript.java b/src/main/java/noppes/npcs/client/gui/GuiScript.java index 1786708e2..3cdde7e62 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiScript.java +++ b/src/main/java/noppes/npcs/client/gui/GuiScript.java @@ -12,13 +12,28 @@ import net.minecraft.util.StatCollector; import noppes.npcs.NoppesStringUtils; import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.script.GuiNPCEventScripts; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiMenuTopButton; +import noppes.npcs.client.gui.util.GuiNPCInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextArea; +import noppes.npcs.client.gui.util.GuiScriptTextArea; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.IJTextAreaListener; +import noppes.npcs.client.gui.util.ITextChangeListener; import noppes.npcs.controllers.ScriptContainer; import noppes.npcs.controllers.ScriptController; import noppes.npcs.controllers.data.DataScript; import noppes.npcs.entity.EntityNPCInterface; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; public class GuiScript extends GuiNPCInterface implements IGuiData, GuiYesNoCallback, ICustomScrollListener, IJTextAreaListener, ITextChangeListener { public boolean showScript = false; @@ -264,7 +279,7 @@ public class GuiScript extends GuiNPCInterface implements IGuiData, GuiYesNoCall @Override public void save() { - if(loaded){ + if (loaded) { setScript(); NPCScriptPacket.Save(script.writeToNBT(new NBTTagCompound())); } diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiAnimationFrame.java b/src/main/java/noppes/npcs/client/gui/SubGuiAnimationFrame.java index f6b3e2b49..e5594bf52 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiAnimationFrame.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiAnimationFrame.java @@ -1,7 +1,11 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.controllers.data.Frame; public class SubGuiAnimationFrame extends SubGuiInterface implements ITextfieldListener { diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiClonerNPCTags.java b/src/main/java/noppes/npcs/client/gui/SubGuiClonerNPCTags.java index 14f4e6e91..6621c109d 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiClonerNPCTags.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiClonerNPCTags.java @@ -9,7 +9,13 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; import net.minecraft.util.StatCollector; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.IScrollData; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiClonerQuickTags.java b/src/main/java/noppes/npcs/client/gui/SubGuiClonerQuickTags.java index 996259b25..4344fb9ec 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiClonerQuickTags.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiClonerQuickTags.java @@ -2,10 +2,20 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; import net.minecraft.util.StatCollector; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.IScrollData; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumScrollData; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.TreeSet; +import java.util.Vector; public class SubGuiClonerQuickTags extends SubGuiInterface implements IScrollData { public GuiNpcMobSpawnerAdd parent; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiCustomHitbox.java b/src/main/java/noppes/npcs/client/gui/SubGuiCustomHitbox.java index 09fc84fe1..e94817d91 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiCustomHitbox.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiCustomHitbox.java @@ -1,7 +1,12 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcButtonYesNo; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.controllers.data.HitboxData; public class SubGuiCustomHitbox extends SubGuiInterface implements ITextfieldListener { diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiEffectGeneral.java b/src/main/java/noppes/npcs/client/gui/SubGuiEffectGeneral.java index dc57ed311..19903229b 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiEffectGeneral.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiEffectGeneral.java @@ -8,7 +8,13 @@ import net.minecraft.util.ResourceLocation; import noppes.npcs.client.ClientCacheHandler; import noppes.npcs.client.gui.global.GuiNPCManageEffects; import noppes.npcs.client.gui.script.GuiScriptEffect; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiMenuTopButton; +import noppes.npcs.client.gui.util.GuiNpcButtonYesNo; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.GuiScrollWindow; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.client.renderer.ImageData; import noppes.npcs.controllers.data.CustomEffect; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiMagic.java b/src/main/java/noppes/npcs/client/gui/SubGuiMagic.java index 5609d013d..96ea89d58 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiMagic.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiMagic.java @@ -5,7 +5,14 @@ import kamkeel.npcs.network.packets.request.magic.MagicSavePacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.gui.global.GuiNpcManageMagic; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumTextureType; import noppes.npcs.controllers.data.Magic; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiMagicCycle.java b/src/main/java/noppes/npcs/client/gui/SubGuiMagicCycle.java index ab975d3ae..b9c6ea4ca 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiMagicCycle.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiMagicCycle.java @@ -5,7 +5,14 @@ import kamkeel.npcs.network.packets.request.magic.MagicCycleSavePacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.gui.global.GuiNpcManageMagic; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumDiagramLayout; import noppes.npcs.controllers.data.MagicAssociation; import noppes.npcs.controllers.data.MagicCycle; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiMailmanSendSetup.java b/src/main/java/noppes/npcs/client/gui/SubGuiMailmanSendSetup.java index 849f0edad..deefee93d 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiMailmanSendSetup.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiMailmanSendSetup.java @@ -7,7 +7,12 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.gui.player.GuiMailmanWrite; import noppes.npcs.client.gui.select.GuiQuestSelection; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.GuiSelectionListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.containers.ContainerMail; import noppes.npcs.controllers.data.PlayerMail; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailability.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailability.java index 2d3cf7edf..ec1366bd2 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailability.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailability.java @@ -4,7 +4,13 @@ import kamkeel.npcs.network.packets.request.faction.FactionGetPacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.NoppesUtil; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.GuiSelectionListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumAvailabilityFactionType; import noppes.npcs.constants.EnumDayTime; import noppes.npcs.controllers.data.Availability; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityDialog.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityDialog.java index cee94a3f5..802ede067 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityDialog.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityDialog.java @@ -4,7 +4,11 @@ import kamkeel.npcs.network.packets.request.dialog.DialogGetPacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.gui.select.GuiDialogSelection; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiSelectionListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumAvailabilityDialog; import noppes.npcs.controllers.data.Availability; import noppes.npcs.controllers.data.Dialog; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityQuest.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityQuest.java index f4098c445..12d61550e 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityQuest.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityQuest.java @@ -4,7 +4,11 @@ import kamkeel.npcs.network.packets.request.quest.QuestGetPacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.gui.select.GuiQuestSelection; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiSelectionListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumAvailabilityQuest; import noppes.npcs.controllers.data.Availability; import noppes.npcs.controllers.data.Quest; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcBiomes.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcBiomes.java index 76b5d8150..c0189b4eb 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcBiomes.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcBiomes.java @@ -2,6 +2,7 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; import net.minecraft.world.biome.BiomeGenBase; +import net.minecraftforge.common.BiomeDictionary; import noppes.npcs.client.gui.util.GuiCustomScroll; import noppes.npcs.client.gui.util.GuiNpcButton; import noppes.npcs.client.gui.util.GuiNpcLabel; @@ -9,7 +10,10 @@ import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.controllers.data.SpawnData; import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; import java.util.List; +import java.util.Set; public class SubGuiNpcBiomes extends SubGuiInterface { private SpawnData data; @@ -45,7 +49,15 @@ public class SubGuiNpcBiomes extends SubGuiInterface { addLabel(new GuiNpcLabel(2, "spawning.spawningBiomes", guiLeft + 200, guiTop + 4)); List biomes = new ArrayList(); + Set allBiomes = new HashSet(); + for (BiomeDictionary.Type type : BiomeDictionary.Type.values()) { + Collections.addAll(allBiomes, BiomeDictionary.getBiomesForType(type)); + } for (BiomeGenBase base : BiomeGenBase.getBiomeGenArray()) { + if (base != null) + allBiomes.add(base); + } + for (BiomeGenBase base : allBiomes) { if (base != null && base.biomeName != null && !data.biomes.contains(base.biomeName)) { biomes.add(base.biomeName); } @@ -82,7 +94,15 @@ public class SubGuiNpcBiomes extends SubGuiInterface { } if (button.id == 3) { data.biomes.clear(); + Set allBiomes = new HashSet(); + for (BiomeDictionary.Type type : BiomeDictionary.Type.values()) { + Collections.addAll(allBiomes, BiomeDictionary.getBiomesForType(type)); + } for (BiomeGenBase base : BiomeGenBase.getBiomeGenArray()) { + if (base != null) + allBiomes.add(base); + } + for (BiomeGenBase base : allBiomes) { if (base != null) { data.biomes.add(base.biomeName); } diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcCommand.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcCommand.java index 9b3c42572..1bba05cc9 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcCommand.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcCommand.java @@ -1,7 +1,11 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; public class SubGuiNpcCommand extends SubGuiInterface implements ITextfieldListener { public String command; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialog.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialog.java index cff9e03f0..3e194f85f 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialog.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialog.java @@ -10,7 +10,14 @@ import noppes.npcs.client.gui.global.GuiNPCManageDialogs; import noppes.npcs.client.gui.player.GuiDialogInteract; import noppes.npcs.client.gui.select.GuiQuestSelection; import noppes.npcs.client.gui.select.GuiSoundSelection; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcButtonYesNo; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.GuiSelectionListener; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.controllers.data.Dialog; import noppes.npcs.controllers.data.PlayerMail; import noppes.npcs.entity.EntityDialogNpc; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogOption.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogOption.java index 6a7accc98..3c0caa1bc 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogOption.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogOption.java @@ -4,7 +4,14 @@ import kamkeel.npcs.network.packets.request.dialog.DialogGetPacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.gui.select.GuiDialogSelection; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.GuiSelectionListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumOptionType; import noppes.npcs.controllers.data.Dialog; import noppes.npcs.controllers.data.DialogOption; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogVisual.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogVisual.java index e58b90810..72481f133 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogVisual.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogVisual.java @@ -5,7 +5,16 @@ import kamkeel.npcs.network.packets.request.dialog.DialogSavePacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.NoppesUtil; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiMenuTopButton; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcButtonYesNo; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.config.ConfigMain; import noppes.npcs.controllers.data.Dialog; import noppes.npcs.controllers.data.DialogColorData; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDimensions.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDimensions.java index 03f8301ab..106ae0557 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDimensions.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDimensions.java @@ -3,11 +3,19 @@ package noppes.npcs.client.gui; import kamkeel.npcs.network.PacketClient; import kamkeel.npcs.network.packets.request.DimensionsGetPacket; import net.minecraft.client.gui.GuiButton; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.IScrollData; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.data.SpawnData; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; +import java.util.Vector; public class SubGuiNpcDimensions extends SubGuiInterface implements IScrollData { private final SpawnData data; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionOptions.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionOptions.java index b2ece2a5d..d5d4ac392 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionOptions.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionOptions.java @@ -4,7 +4,13 @@ import kamkeel.npcs.network.PacketClient; import kamkeel.npcs.network.packets.request.faction.FactionsGetPacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.util.StatCollector; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IScrollData; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.data.FactionOptions; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionPoints.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionPoints.java index 074464d74..a4ce80c25 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionPoints.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionPoints.java @@ -2,7 +2,11 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; import net.minecraft.util.StatCollector; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.controllers.data.Faction; public class SubGuiNpcFactionPoints extends SubGuiInterface implements ITextfieldListener { diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcMeleeProperties.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcMeleeProperties.java index c9d451c1b..a128d3760 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcMeleeProperties.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcMeleeProperties.java @@ -2,7 +2,12 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; import noppes.npcs.DataStats; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiButtonBiDirectional; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumPotionType; public class SubGuiNpcMeleeProperties extends SubGuiInterface implements ITextfieldListener { diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcMovement.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcMovement.java index 39c712771..e29b6f95f 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcMovement.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcMovement.java @@ -2,7 +2,11 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; import noppes.npcs.DataAI; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumAnimation; import noppes.npcs.constants.EnumMovingType; import noppes.npcs.constants.EnumStandingType; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcName.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcName.java index a31a4dea4..e98938c8f 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcName.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcName.java @@ -3,7 +3,12 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; import noppes.npcs.DataDisplay; import noppes.npcs.client.gui.mainmenu.GuiNpcDisplay; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiButtonBiDirectional; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; public class SubGuiNpcName extends SubGuiInterface implements ITextfieldListener { private DataDisplay display; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcPartyOptions.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcPartyOptions.java index 3c9fbd653..10420a65d 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcPartyOptions.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcPartyOptions.java @@ -1,7 +1,11 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumPartyExchange; import noppes.npcs.constants.EnumPartyObjectives; import noppes.npcs.constants.EnumPartyRequirements; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcProjectiles.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcProjectiles.java index 669438ec0..8acb8fc8c 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcProjectiles.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcProjectiles.java @@ -2,7 +2,14 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; import noppes.npcs.DataStats; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiButtonBiDirectional; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcButtonYesNo; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumParticleType; import noppes.npcs.constants.EnumPotionType; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcQuest.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcQuest.java index 5c56ce292..6406733be 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcQuest.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcQuest.java @@ -11,7 +11,14 @@ import noppes.npcs.client.gui.questtypes.GuiNpcQuestTypeKill; import noppes.npcs.client.gui.questtypes.GuiNpcQuestTypeLocation; import noppes.npcs.client.gui.questtypes.GuiNpcQuestTypeManual; import noppes.npcs.client.gui.select.GuiQuestSelection; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.GuiSelectionListener; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; +import noppes.npcs.client.gui.util.SubGuiNpcCooldownPicker; import noppes.npcs.constants.EnumGuiType; import noppes.npcs.constants.EnumQuestCompletion; import noppes.npcs.constants.EnumQuestRepeat; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcRangeProperties.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcRangeProperties.java index 12d283e06..428e83016 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcRangeProperties.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcRangeProperties.java @@ -3,7 +3,12 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; import noppes.npcs.DataStats; import noppes.npcs.client.gui.select.GuiSoundSelection; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; public class SubGuiNpcRangeProperties extends SubGuiInterface implements ITextfieldListener, ISubGuiListener { private DataStats stats; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcResistanceProperties.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcResistanceProperties.java index ddcf0239b..41b725c12 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcResistanceProperties.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcResistanceProperties.java @@ -2,7 +2,11 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; import noppes.npcs.Resistances; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcSlider; +import noppes.npcs.client.gui.util.ISliderListener; +import noppes.npcs.client.gui.util.SubGuiInterface; public class SubGuiNpcResistanceProperties extends SubGuiInterface implements ISliderListener { private Resistances resistances; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcRespawn.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcRespawn.java index ea70f7cf2..0a0694779 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcRespawn.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcRespawn.java @@ -2,7 +2,11 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; import noppes.npcs.DataStats; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; public class SubGuiNpcRespawn extends SubGuiInterface implements ITextfieldListener { private DataStats stats; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcTint.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcTint.java index d40c3a0cb..1a3804c2b 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcTint.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcTint.java @@ -1,7 +1,13 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcButtonYesNo; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.controllers.data.TintData; public class SubGuiNpcTint extends SubGuiInterface implements ISubGuiListener, ITextfieldListener { diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiPlayerData.java b/src/main/java/noppes/npcs/client/gui/SubGuiPlayerData.java index a91946b2a..0d39c0cd8 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiPlayerData.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiPlayerData.java @@ -8,13 +8,27 @@ import kamkeel.npcs.network.packets.request.playerdata.PlayerDataSaveInfoPacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.CustomNpcResourceListener; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiMenuTopButton; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.GuiToggleButton; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IPlayerDataInfo; +import noppes.npcs.client.gui.util.IScrollData; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumPlayerData; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.data.MagicData; import org.lwjgl.opengl.GL11; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Vector; import static noppes.npcs.client.gui.player.inventory.GuiCNPCInventory.specialIcons; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiScriptParticle.java b/src/main/java/noppes/npcs/client/gui/SubGuiScriptParticle.java index 2cd7587e6..69c211358 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiScriptParticle.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiScriptParticle.java @@ -1,7 +1,11 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.scripted.ScriptParticle; public class SubGuiScriptParticle extends SubGuiInterface implements ITextfieldListener { diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiSpawningOptions.java b/src/main/java/noppes/npcs/client/gui/SubGuiSpawningOptions.java index 2fa94b219..c15f9162f 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiSpawningOptions.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiSpawningOptions.java @@ -1,7 +1,12 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcButtonYesNo; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.controllers.data.SpawnData; public class SubGuiSpawningOptions extends SubGuiInterface implements ITextfieldListener { diff --git a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCAdvancedLinkedNpc.java b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCAdvancedLinkedNpc.java index f954e0129..ef837871b 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCAdvancedLinkedNpc.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCAdvancedLinkedNpc.java @@ -5,7 +5,11 @@ import kamkeel.npcs.network.packets.request.linked.LinkedGetAllPacket; import kamkeel.npcs.network.packets.request.linked.LinkedSetPacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IScrollData; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCDialogNpcOptions.java b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCDialogNpcOptions.java index 084c11e1a..0e2c31845 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCDialogNpcOptions.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCDialogNpcOptions.java @@ -8,7 +8,11 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.gui.select.GuiDialogSelection; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiSelectionListener; +import noppes.npcs.client.gui.util.IGuiData; import noppes.npcs.controllers.data.DialogOption; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCFactionSetup.java b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCFactionSetup.java index 8caecf0c7..e56f088be 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCFactionSetup.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCFactionSetup.java @@ -7,7 +7,12 @@ import kamkeel.npcs.network.packets.request.mainmenu.MainmenuAdvancedSavePacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.gui.SubGuiNpcFactionOptions; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IScrollData; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCMagic.java b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCMagic.java index 86eb1fbb2..c235d75f5 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCMagic.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCMagic.java @@ -6,7 +6,15 @@ import kamkeel.npcs.network.packets.request.magic.MagicNpcGetPacket; import kamkeel.npcs.network.packets.request.magic.MagicNpcSavePacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.IScrollData; +import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.data.MagicData; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCMarks.java b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCMarks.java index bc22bcde2..46cc27c47 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCMarks.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCMarks.java @@ -5,7 +5,11 @@ import kamkeel.npcs.network.packets.request.mainmenu.MainmenuAdvancedMarkDataPac import net.minecraft.client.gui.GuiButton; import noppes.npcs.client.gui.SubGuiColorSelector; import noppes.npcs.client.gui.SubGuiNpcAvailability; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiButtonBiDirectional; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.MarkType; import noppes.npcs.controllers.data.MarkData; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCSoundsMenu.java b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCSoundsMenu.java index 44942ea4c..007c42ee7 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCSoundsMenu.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCSoundsMenu.java @@ -5,7 +5,13 @@ import kamkeel.npcs.network.packets.request.mainmenu.MainmenuAdvancedSavePacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.gui.select.GuiSoundSelection; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.entity.EntityNPCInterface; public class GuiNPCSoundsMenu extends GuiNPCInterface2 implements ITextfieldListener, ISubGuiListener { diff --git a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCTagSetup.java b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCTagSetup.java index f32aeab39..dcd361e48 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCTagSetup.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCTagSetup.java @@ -9,7 +9,14 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; import net.minecraft.util.StatCollector; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.IScrollData; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/client/gui/custom/GuiCustom.java b/src/main/java/noppes/npcs/client/gui/custom/GuiCustom.java index de8304c75..599afebe8 100644 --- a/src/main/java/noppes/npcs/client/gui/custom/GuiCustom.java +++ b/src/main/java/noppes/npcs/client/gui/custom/GuiCustom.java @@ -25,7 +25,12 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; import noppes.npcs.api.gui.ICustomGuiComponent; -import noppes.npcs.client.gui.custom.components.*; +import noppes.npcs.client.gui.custom.components.CustomGuiButton; +import noppes.npcs.client.gui.custom.components.CustomGuiLabel; +import noppes.npcs.client.gui.custom.components.CustomGuiLine; +import noppes.npcs.client.gui.custom.components.CustomGuiScrollComponent; +import noppes.npcs.client.gui.custom.components.CustomGuiTextField; +import noppes.npcs.client.gui.custom.components.CustomGuiTexturedRect; import noppes.npcs.client.gui.custom.interfaces.IClickListener; import noppes.npcs.client.gui.custom.interfaces.IDataHolder; import noppes.npcs.client.gui.custom.interfaces.IGuiComponent; @@ -33,13 +38,27 @@ import noppes.npcs.client.gui.util.GuiCustomScroll; import noppes.npcs.client.gui.util.ICustomScrollListener; import noppes.npcs.client.gui.util.IGuiData; import noppes.npcs.containers.ContainerCustomGui; -import noppes.npcs.scripted.gui.*; +import noppes.npcs.scripted.gui.ScriptGui; +import noppes.npcs.scripted.gui.ScriptGuiButton; +import noppes.npcs.scripted.gui.ScriptGuiComponent; +import noppes.npcs.scripted.gui.ScriptGuiLabel; +import noppes.npcs.scripted.gui.ScriptGuiLine; +import noppes.npcs.scripted.gui.ScriptGuiScroll; +import noppes.npcs.scripted.gui.ScriptGuiTextField; +import noppes.npcs.scripted.gui.ScriptGuiTexturedRect; import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; public class GuiCustom extends GuiScreen implements ICustomScrollListener, IGuiData { ScriptGui gui; diff --git a/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiLabel.java b/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiLabel.java index daa1a98e0..106dcc124 100644 --- a/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiLabel.java +++ b/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiLabel.java @@ -461,8 +461,8 @@ public class CustomGuiLabel extends Gui implements IGuiComponent { private void readFontTexture() { BufferedImage bufferedimage; - try { - bufferedimage = ImageIO.read(getResourceInputStream(this.locationFontTexture)); + try (InputStream stream = getResourceInputStream(this.locationFontTexture)) { + bufferedimage = ImageIO.read(stream); } catch (IOException ioexception) { throw new RuntimeException(ioexception); } @@ -515,8 +515,7 @@ public class CustomGuiLabel extends Gui implements IGuiComponent { } private void readGlyphSizes() { - try { - InputStream inputstream = getResourceInputStream(new ResourceLocation("font/glyph_sizes.bin")); + try (InputStream inputstream = getResourceInputStream(new ResourceLocation("font/glyph_sizes.bin"))) { inputstream.read(this.glyphWidth); } catch (IOException ioexception) { throw new RuntimeException(ioexception); diff --git a/src/main/java/noppes/npcs/client/gui/customoverlay/OverlayCustom.java b/src/main/java/noppes/npcs/client/gui/customoverlay/OverlayCustom.java index aa36108c7..5940d134a 100644 --- a/src/main/java/noppes/npcs/client/gui/customoverlay/OverlayCustom.java +++ b/src/main/java/noppes/npcs/client/gui/customoverlay/OverlayCustom.java @@ -10,7 +10,11 @@ import noppes.npcs.client.gui.customoverlay.components.CustomOverlayLabel; import noppes.npcs.client.gui.customoverlay.components.CustomOverlayLine; import noppes.npcs.client.gui.customoverlay.components.CustomOverlayTexturedRect; import noppes.npcs.client.gui.customoverlay.interfaces.IOverlayComponent; -import noppes.npcs.scripted.overlay.*; +import noppes.npcs.scripted.overlay.ScriptOverlay; +import noppes.npcs.scripted.overlay.ScriptOverlayComponent; +import noppes.npcs.scripted.overlay.ScriptOverlayLabel; +import noppes.npcs.scripted.overlay.ScriptOverlayLine; +import noppes.npcs.scripted.overlay.ScriptOverlayTexturedRect; import org.lwjgl.opengl.GL11; import java.util.HashMap; diff --git a/src/main/java/noppes/npcs/client/gui/customoverlay/components/CustomOverlayLabel.java b/src/main/java/noppes/npcs/client/gui/customoverlay/components/CustomOverlayLabel.java index f5b97457b..507716abd 100644 --- a/src/main/java/noppes/npcs/client/gui/customoverlay/components/CustomOverlayLabel.java +++ b/src/main/java/noppes/npcs/client/gui/customoverlay/components/CustomOverlayLabel.java @@ -400,8 +400,8 @@ public class CustomOverlayLabel extends Gui implements IOverlayComponent { private void readFontTexture() { BufferedImage bufferedimage; - try { - bufferedimage = ImageIO.read(getResourceInputStream(this.locationFontTexture)); + try (InputStream stream = getResourceInputStream(this.locationFontTexture)) { + bufferedimage = ImageIO.read(stream); } catch (IOException ioexception) { throw new RuntimeException(ioexception); } @@ -454,8 +454,7 @@ public class CustomOverlayLabel extends Gui implements IOverlayComponent { } private void readGlyphSizes() { - try { - InputStream inputstream = getResourceInputStream(new ResourceLocation("font/glyph_sizes.bin")); + try (InputStream inputstream = getResourceInputStream(new ResourceLocation("font/glyph_sizes.bin"))) { inputstream.read(this.glyphWidth); } catch (IOException ioexception) { throw new RuntimeException(ioexception); diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCEditAnimation.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCEditAnimation.java index 4b5997b7f..eb7b84001 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCEditAnimation.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCEditAnimation.java @@ -7,7 +7,16 @@ import net.minecraft.client.gui.GuiScreen; import noppes.npcs.client.gui.SubGuiAnimationFrame; import noppes.npcs.client.gui.SubGuiAnimationOptions; import noppes.npcs.client.gui.SubGuiColorSelector; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiModelInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcSlider; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.GuiTexturedButton; +import noppes.npcs.client.gui.util.ISliderListener; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumAnimationPart; import noppes.npcs.controllers.data.Animation; import noppes.npcs.controllers.data.AnimationData; diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageAnimations.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageAnimations.java index 6ab69d319..7d1fa84be 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageAnimations.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageAnimations.java @@ -11,7 +11,18 @@ import net.minecraft.client.gui.GuiYesNoCallback; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; import noppes.npcs.client.NoppesUtil; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiModelInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.GuiTexturedButton; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.IScrollData; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.data.Animation; import noppes.npcs.controllers.data.AnimationData; diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageBanks.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageBanks.java index ee3cf3f35..693ecbf0c 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageBanks.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageBanks.java @@ -8,7 +8,14 @@ import kamkeel.npcs.network.packets.request.bank.BanksGetPacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.CustomNpcResourceListener; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiContainerNPCInterface2; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.IScrollData; +import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.containers.ContainerManageBanks; import noppes.npcs.controllers.data.Bank; diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageDialogs.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageDialogs.java index ba25d44aa..eb0ede5bf 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageDialogs.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageDialogs.java @@ -1,7 +1,14 @@ package noppes.npcs.client.gui.global; import kamkeel.npcs.network.PacketClient; -import kamkeel.npcs.network.packets.request.dialog.*; +import kamkeel.npcs.network.packets.request.dialog.DialogCategoriesGetPacket; +import kamkeel.npcs.network.packets.request.dialog.DialogCategoryGetPacket; +import kamkeel.npcs.network.packets.request.dialog.DialogCategoryRemovePacket; +import kamkeel.npcs.network.packets.request.dialog.DialogCategorySavePacket; +import kamkeel.npcs.network.packets.request.dialog.DialogGetPacket; +import kamkeel.npcs.network.packets.request.dialog.DialogRemovePacket; +import kamkeel.npcs.network.packets.request.dialog.DialogSavePacket; +import kamkeel.npcs.network.packets.request.dialog.DialogsGetPacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiYesNo; import net.minecraft.client.gui.GuiYesNoCallback; @@ -10,7 +17,16 @@ import net.minecraft.util.StatCollector; import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.SubGuiEditText; import noppes.npcs.client.gui.SubGuiNpcDialog; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.IScrollData; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.data.Dialog; import noppes.npcs.controllers.data.DialogCategory; diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageEffects.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageEffects.java index 68635ae45..a5f32da52 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageEffects.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageEffects.java @@ -16,7 +16,16 @@ import noppes.npcs.client.ClientCacheHandler; import noppes.npcs.client.CustomNpcResourceListener; import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.SubGuiEffectGeneral; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.IScrollData; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.client.renderer.ImageData; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.CustomEffectController; diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageFactions.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageFactions.java index ced128544..246e528f3 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageFactions.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageFactions.java @@ -13,12 +13,26 @@ import net.minecraft.util.StatCollector; import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.SubGuiColorSelector; import noppes.npcs.client.gui.SubGuiNpcFactionPoints; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.IScrollData; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.data.Faction; import noppes.npcs.entity.EntityNPCInterface; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Vector; public class GuiNPCManageFactions extends GuiNPCInterface2 implements IScrollData, ICustomScrollListener, ITextfieldListener, IGuiData, ISubGuiListener, GuiYesNoCallback { private GuiCustomScroll scrollFactions; @@ -132,7 +146,7 @@ public class GuiNPCManageFactions extends GuiNPCInterface2 implements IScrollDat if (button.id == 4) { faction.getsAttacked = button.getValue() == 1; } - if (button.id == 4) { + if (button.id == 5) { faction.isPassive = button.getValue() == 1; } if (button.id == 10) { diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageLinked.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageLinked.java index 5d7434794..e07d2583c 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageLinked.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageLinked.java @@ -1,7 +1,13 @@ package noppes.npcs.client.gui.global; import kamkeel.npcs.network.PacketClient; -import kamkeel.npcs.network.packets.request.linked.*; +import kamkeel.npcs.network.packets.request.linked.LinkedGetAllPacket; +import kamkeel.npcs.network.packets.request.linked.LinkedGetPacket; +import kamkeel.npcs.network.packets.request.linked.LinkedItemBuildPacket; +import kamkeel.npcs.network.packets.request.linked.LinkedItemRemovePacket; +import kamkeel.npcs.network.packets.request.linked.LinkedItemSavePacket; +import kamkeel.npcs.network.packets.request.linked.LinkedNPCAddPacket; +import kamkeel.npcs.network.packets.request.linked.LinkedNPCRemovePacket; import kamkeel.npcs.util.ColorUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; @@ -20,7 +26,15 @@ import noppes.npcs.client.CustomNpcResourceListener; import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.SubGuiEditText; import noppes.npcs.client.gui.item.SubGuiLinkedItem; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.IScrollData; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.client.renderer.ImageData; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.data.LinkedItem; diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageQuest.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageQuest.java index 5a18fab75..f3d1679f2 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageQuest.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageQuest.java @@ -1,7 +1,14 @@ package noppes.npcs.client.gui.global; import kamkeel.npcs.network.PacketClient; -import kamkeel.npcs.network.packets.request.quest.*; +import kamkeel.npcs.network.packets.request.quest.QuestCategoriesGetPacket; +import kamkeel.npcs.network.packets.request.quest.QuestCategoryGetPacket; +import kamkeel.npcs.network.packets.request.quest.QuestCategoryRemovePacket; +import kamkeel.npcs.network.packets.request.quest.QuestCategorySavePacket; +import kamkeel.npcs.network.packets.request.quest.QuestGetPacket; +import kamkeel.npcs.network.packets.request.quest.QuestRemovePacket; +import kamkeel.npcs.network.packets.request.quest.QuestSavePacket; +import kamkeel.npcs.network.packets.request.quest.QuestsGetPacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiYesNo; @@ -11,7 +18,16 @@ import net.minecraft.util.StatCollector; import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.SubGuiEditText; import noppes.npcs.client.gui.SubGuiNpcQuest; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.IScrollData; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.data.Quest; import noppes.npcs.controllers.data.QuestCategory; diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageTags.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageTags.java index ec84783d2..0872c3cb5 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageTags.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageTags.java @@ -8,7 +8,17 @@ import kamkeel.npcs.network.packets.request.tags.TagsGetPacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.gui.SubGuiColorSelector; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.IScrollData; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.data.Tag; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageMagic.java b/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageMagic.java index fbdc8be21..76036717e 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageMagic.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageMagic.java @@ -1,13 +1,28 @@ package noppes.npcs.client.gui.global; import kamkeel.npcs.network.PacketClient; -import kamkeel.npcs.network.packets.request.magic.*; +import kamkeel.npcs.network.packets.request.magic.MagicCycleRemovePacket; +import kamkeel.npcs.network.packets.request.magic.MagicCycleSavePacket; +import kamkeel.npcs.network.packets.request.magic.MagicGetAllPacket; +import kamkeel.npcs.network.packets.request.magic.MagicGetPacket; +import kamkeel.npcs.network.packets.request.magic.MagicRemovePacket; +import kamkeel.npcs.network.packets.request.magic.MagicSavePacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.gui.SubGuiMagic; import noppes.npcs.client.gui.SubGuiMagicCycle; import noppes.npcs.client.gui.SubGuiMagicCycleViewer; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.GuiToggleButton; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.IScrollData; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.data.Magic; import noppes.npcs.controllers.data.MagicCycle; diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNpcManagePlayerData.java b/src/main/java/noppes/npcs/client/gui/global/GuiNpcManagePlayerData.java index e66019bbd..58b50de0a 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNpcManagePlayerData.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNpcManagePlayerData.java @@ -9,7 +9,15 @@ import net.minecraft.client.gui.GuiYesNo; import net.minecraft.client.gui.GuiYesNoCallback; import net.minecraft.util.StatCollector; import noppes.npcs.client.gui.SubGuiPlayerData; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IScrollData; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumPlayerData; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.entity.EntityNPCInterface; @@ -115,10 +123,12 @@ public class GuiNpcManagePlayerData extends GuiNPCInterface2 implements GuiYesNo public void confirmClicked(boolean confirm, int id) { if (confirm) { if (id == 0) { - PacketClient.sendClient(new PlayerDataRemovePacket(EnumPlayerData.Players, selectedPlayer, null)); - playerData.remove(selectedPlayer); - selectedPlayer = null; - playerScroll.setList(getSearchList()); + if (selectedPlayer != null && !selectedPlayer.isEmpty()) { + PacketClient.sendClient(new PlayerDataRemovePacket(EnumPlayerData.Players, selectedPlayer)); + playerData.remove(selectedPlayer); + selectedPlayer = null; + playerScroll.setList(getSearchList()); + } } if (id == 1) { PacketClient.sendClient(new PlayerDataMapRegenPacket()); diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageRecipes.java b/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageRecipes.java index 4fa1dd407..1b83b0639 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageRecipes.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageRecipes.java @@ -12,7 +12,20 @@ import net.minecraft.util.StatCollector; import noppes.npcs.client.CustomNpcResourceListener; import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.SubGuiNpcAvailability; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.script.GuiScriptRecipe; +import noppes.npcs.client.gui.util.GuiButtonBiDirectional; +import noppes.npcs.client.gui.util.GuiContainerNPCInterface2; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcButtonYesNo; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.IScrollData; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumGuiType; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.containers.ContainerManageRecipes; @@ -69,9 +82,10 @@ public class GuiNpcManageRecipes extends GuiContainerNPCInterface2 implements IS this.addButton(new GuiButtonBiDirectional(0, guiLeft + 280, y, 130, 20, new String[]{"menu.global", "tile.npcCarpentyBench.name", "tile.anvil.name"}, tab)); y += 106; + y += 44; - this.addButton(new GuiNpcButton(3, guiLeft + 226, y += 22, 50, 20, "gui.add")); - this.addButton(new GuiNpcButton(4, guiLeft + 226, y += 22, 50, 20, "gui.remove")); + this.addButton(new GuiNpcButton(3, guiLeft + 172, y, 50, 20, "gui.add")); + this.addButton(new GuiNpcButton(4, guiLeft + 226, y, 50, 20, "gui.remove")); this.addButton(new GuiNpcButton(10, guiLeft + 226, y += 30, 50, 20, "gui.copy")); if (container.width != 1) { @@ -83,10 +97,12 @@ public class GuiNpcManageRecipes extends GuiContainerNPCInterface2 implements IS buttonPos += 22; this.addButton(new GuiNpcButton(15, guiLeft + 172, buttonPos - 5, 103, 20, "availability.options")); + this.addButton(new GuiNpcButton(16, guiLeft + 172, buttonPos + 17, 103, 20, "script.scripts")); this.getButton(5).setEnabled(false); this.getButton(6).setEnabled(false); this.getButton(15).setEnabled(false); + this.getButton(16).setEnabled(false); this.addTextField(new GuiNpcTextField(0, this, fontRendererObj, guiLeft + 8, guiTop + 8, 160, 20, container.recipe.name)); this.getTextField(0).enabled = false; @@ -116,11 +132,13 @@ public class GuiNpcManageRecipes extends GuiContainerNPCInterface2 implements IS buttonPos += 22; this.addButton(new GuiNpcButton(15, guiLeft + 172, buttonPos - 5, 103, 20, "availability.options")); + this.addButton(new GuiNpcButton(16, guiLeft + 172, buttonPos + 17, 103, 20, "script.scripts")); this.getButton(7).setEnabled(false); this.getButton(8).setEnabled(false); this.getButton(9).setEnabled(false); this.getButton(15).setEnabled(false); + this.getButton(16).setEnabled(false); this.addTextField(new GuiNpcTextField(0, this, fontRendererObj, guiLeft + 8, guiTop + 8, 160, 20, container.recipeAnvil.name)); this.getTextField(0).enabled = false; @@ -200,6 +218,21 @@ public class GuiNpcManageRecipes extends GuiContainerNPCInterface2 implements IS setSubGui(new SubGuiNpcAvailability(container.recipe.availability)); } } + + if (button.id == 16) { + save(); + if (container.width == 1) { + GuiScriptRecipe gui = new GuiScriptRecipe(this, container.recipeAnvil); + gui.setWorldAndResolution(mc, width, height); + gui.initGui(); + mc.currentScreen = gui; + } else if (!container.recipe.isGlobal) { + GuiScriptRecipe gui = new GuiScriptRecipe(this, container.recipe); + gui.setWorldAndResolution(mc, width, height); + gui.initGui(); + mc.currentScreen = gui; + } + } } @Override @@ -231,13 +264,15 @@ public class GuiNpcManageRecipes extends GuiContainerNPCInterface2 implements IS @Override public void setGuiData(NBTTagCompound compound) { if (compound.hasKey("IsAnvil")) { - RecipeAnvil recipe = RecipeAnvil.read(compound); + RecipeAnvil recipe = new RecipeAnvil(); + recipe.readNBT(compound); container.setRecipe(recipe); container.width = 1; tab = 2; fixButtons(); } else { - RecipeCarpentry recipe = RecipeCarpentry.read(compound); + RecipeCarpentry recipe = RecipeCarpentry.create(compound); + recipe.readNBT(compound); container.setRecipe(recipe); fixButtons(); } @@ -273,6 +308,10 @@ public class GuiNpcManageRecipes extends GuiContainerNPCInterface2 implements IS GuiNpcButton avail = this.getButton(15); if (avail != null) avail.setEnabled(true); + + GuiNpcButton script = this.getButton(16); + if (script != null) + script.setEnabled(true); } else { getTextField(0).setText(container.recipe.name); @@ -287,6 +326,10 @@ public class GuiNpcManageRecipes extends GuiContainerNPCInterface2 implements IS GuiNpcButton avail = this.getButton(15); if (avail != null) avail.setEnabled(true); + + GuiNpcButton script = this.getButton(16); + if (script != null) + script.setEnabled(true); } } } diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNpcNaturalSpawns.java b/src/main/java/noppes/npcs/client/gui/global/GuiNpcNaturalSpawns.java index ca5b7fe9e..a5ebd6e1f 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNpcNaturalSpawns.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNpcNaturalSpawns.java @@ -12,12 +12,28 @@ import noppes.npcs.client.gui.GuiNpcMobSpawnerSelector; import noppes.npcs.client.gui.SubGuiNpcBiomes; import noppes.npcs.client.gui.SubGuiNpcDimensions; import noppes.npcs.client.gui.SubGuiSpawningOptions; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiHoverText; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcSlider; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.IScrollData; +import noppes.npcs.client.gui.util.ISliderListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.data.SpawnData; import noppes.npcs.entity.EntityNPCInterface; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Set; +import java.util.Vector; public class GuiNpcNaturalSpawns extends GuiNPCInterface2 implements IGuiData, IScrollData, ITextfieldListener, ICustomScrollListener, ISliderListener { private GuiCustomScroll scrollNaturalSpawns; @@ -66,6 +82,7 @@ public class GuiNpcNaturalSpawns extends GuiNPCInterface2 implements IGuiData, I addButton(new GuiNpcButton(4, guiLeft + 90, y - 5, 50, 20, "selectServer.edit")); addSlider(new GuiNpcSlider(this, 5, guiLeft + 4, y += 17, 180, 20, (float) this.spawn.itemWeight / 100)); + addExtra(new GuiHoverText(1, "spawning.naturalInfo", guiLeft + 188, y + 5)); this.spawnEntryScroll.guiLeft = guiLeft + 4; this.spawnEntryScroll.guiTop = y + 40; diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNpcQuestReward.java b/src/main/java/noppes/npcs/client/gui/global/GuiNpcQuestReward.java index 6692f5b98..28a06c515 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNpcQuestReward.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNpcQuestReward.java @@ -3,7 +3,11 @@ package noppes.npcs.client.gui.global; import net.minecraft.client.gui.GuiButton; import net.minecraft.util.ResourceLocation; import noppes.npcs.client.NoppesUtil; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiContainerNPCInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.containers.ContainerNpcQuestReward; import noppes.npcs.controllers.data.Quest; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/client/gui/item/GuiNpcMagicBook.java b/src/main/java/noppes/npcs/client/gui/item/GuiNpcMagicBook.java index 7a4f0467a..3348f059f 100644 --- a/src/main/java/noppes/npcs/client/gui/item/GuiNpcMagicBook.java +++ b/src/main/java/noppes/npcs/client/gui/item/GuiNpcMagicBook.java @@ -5,7 +5,12 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.CustomNpcResourceListener; import noppes.npcs.client.gui.GuiMagicCycleMap; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNPCInterface; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.IScrollData; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.data.MagicCycle; diff --git a/src/main/java/noppes/npcs/client/gui/item/SubGuiLinkedItem.java b/src/main/java/noppes/npcs/client/gui/item/SubGuiLinkedItem.java index dd0dc1c64..9bf537a69 100644 --- a/src/main/java/noppes/npcs/client/gui/item/SubGuiLinkedItem.java +++ b/src/main/java/noppes/npcs/client/gui/item/SubGuiLinkedItem.java @@ -13,7 +13,16 @@ import noppes.npcs.client.CustomNpcResourceListener; import noppes.npcs.client.gui.SubGuiColorSelector; import noppes.npcs.client.gui.global.GuiNPCManageLinked; import noppes.npcs.client.gui.script.GuiScriptLinkedItem; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiButtonBiDirectional; +import noppes.npcs.client.gui.util.GuiMenuTopButton; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcButtonYesNo; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.GuiScrollWindow; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.client.renderer.ImageData; import noppes.npcs.controllers.data.LinkedItem; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNPCGlobalMainMenu.java b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNPCGlobalMainMenu.java index 0364abe21..8295618dd 100644 --- a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNPCGlobalMainMenu.java +++ b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNPCGlobalMainMenu.java @@ -11,7 +11,12 @@ import noppes.npcs.client.gui.util.GuiNpcSquareButton; import noppes.npcs.constants.EnumGuiType; import noppes.npcs.entity.EntityNPCInterface; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import static noppes.npcs.client.gui.player.inventory.GuiCNPCInventory.specialIcons; diff --git a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNPCInv.java b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNPCInv.java index 6c3669814..275eea6ff 100644 --- a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNPCInv.java +++ b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNPCInv.java @@ -10,7 +10,12 @@ import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.inventory.Slot; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiContainerNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.containers.ContainerNPCInv; import noppes.npcs.entity.EntityNPCInterface; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcAI.java b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcAI.java index 895866a55..538d58b59 100644 --- a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcAI.java +++ b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcAI.java @@ -7,7 +7,12 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.DataAI; import noppes.npcs.client.gui.SubGuiNpcMovement; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.constants.EnumCombatPolicy; import noppes.npcs.constants.EnumNavType; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcAdvanced.java b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcAdvanced.java index aa00ed09f..d7b5ac919 100644 --- a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcAdvanced.java +++ b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcAdvanced.java @@ -9,8 +9,23 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.NoppesStringUtils; import noppes.npcs.client.NoppesUtil; -import noppes.npcs.client.gui.advanced.*; -import noppes.npcs.client.gui.roles.*; +import noppes.npcs.client.gui.advanced.GuiNPCAdvancedLinkedNpc; +import noppes.npcs.client.gui.advanced.GuiNPCDialogNpcOptions; +import noppes.npcs.client.gui.advanced.GuiNPCFactionSetup; +import noppes.npcs.client.gui.advanced.GuiNPCLinesMenu; +import noppes.npcs.client.gui.advanced.GuiNPCMagic; +import noppes.npcs.client.gui.advanced.GuiNPCMarks; +import noppes.npcs.client.gui.advanced.GuiNPCNightSetup; +import noppes.npcs.client.gui.advanced.GuiNPCSoundsMenu; +import noppes.npcs.client.gui.advanced.GuiNPCTagSetup; +import noppes.npcs.client.gui.roles.GuiNpcBard; +import noppes.npcs.client.gui.roles.GuiNpcCompanion; +import noppes.npcs.client.gui.roles.GuiNpcConversation; +import noppes.npcs.client.gui.roles.GuiNpcFollowerJob; +import noppes.npcs.client.gui.roles.GuiNpcGuard; +import noppes.npcs.client.gui.roles.GuiNpcHealer; +import noppes.npcs.client.gui.roles.GuiNpcSpawner; +import noppes.npcs.client.gui.roles.GuiNpcTransporter; import noppes.npcs.client.gui.util.GuiNPCInterface2; import noppes.npcs.client.gui.util.GuiNpcButton; import noppes.npcs.client.gui.util.IGuiData; @@ -119,7 +134,7 @@ public class GuiNpcAdvanced extends GuiNPCInterface2 implements IGuiData { @Override public void setGuiData(NBTTagCompound compound) { if (compound.hasKey("RoleData")) { - npc.advanced.setRole(compound.getByte("RoleData")); + npc.advanced.setRole(compound.getInteger("RoleOrdinal")); if (npc.roleInterface != null) npc.roleInterface.readFromNBT(compound); diff --git a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcDisplay.java b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcDisplay.java index a7086a36f..f81242f89 100644 --- a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcDisplay.java +++ b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcDisplay.java @@ -10,10 +10,20 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; import noppes.npcs.DataDisplay; import noppes.npcs.client.NoppesUtil; -import noppes.npcs.client.gui.*; +import noppes.npcs.client.gui.GuiNpcTextureCloaks; +import noppes.npcs.client.gui.GuiNpcTextureOverlays; +import noppes.npcs.client.gui.SubGuiCustomHitbox; +import noppes.npcs.client.gui.SubGuiNpcName; +import noppes.npcs.client.gui.SubGuiNpcTint; import noppes.npcs.client.gui.model.GuiCreationScreen; import noppes.npcs.client.gui.select.GuiTextureSelection; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.config.ConfigMain; import noppes.npcs.controllers.data.SkinOverlay; import noppes.npcs.entity.EntityCustomNpc; diff --git a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcStats.java b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcStats.java index f3833477c..80aa0e6b6 100644 --- a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcStats.java +++ b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcStats.java @@ -8,8 +8,18 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.EnumCreatureAttribute; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.DataStats; -import noppes.npcs.client.gui.*; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.SubGuiNpcMeleeProperties; +import noppes.npcs.client.gui.SubGuiNpcProjectiles; +import noppes.npcs.client.gui.SubGuiNpcRangeProperties; +import noppes.npcs.client.gui.SubGuiNpcResistanceProperties; +import noppes.npcs.client.gui.SubGuiNpcRespawn; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcButtonYesNo; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.entity.EntityNPCInterface; public class GuiNpcStats extends GuiNPCInterface2 implements ITextfieldListener, IGuiData { diff --git a/src/main/java/noppes/npcs/client/gui/model/GuiCreationScreen.java b/src/main/java/noppes/npcs/client/gui/model/GuiCreationScreen.java index 722d9ff86..15d33b209 100644 --- a/src/main/java/noppes/npcs/client/gui/model/GuiCreationScreen.java +++ b/src/main/java/noppes/npcs/client/gui/model/GuiCreationScreen.java @@ -16,13 +16,29 @@ import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagByte; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiModelInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.ICustomScrollListener; import noppes.npcs.compat.PixelmonHelper; -import noppes.npcs.entity.*; +import noppes.npcs.entity.EntityCustomNpc; +import noppes.npcs.entity.EntityFakeLiving; +import noppes.npcs.entity.EntityNPCGolem; +import noppes.npcs.entity.EntityNPCInterface; +import noppes.npcs.entity.EntityNpcCrystal; +import noppes.npcs.entity.EntityNpcDragon; +import noppes.npcs.entity.EntityNpcPony; +import noppes.npcs.entity.EntityNpcSlime; import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; public class GuiCreationScreen extends GuiModelInterface implements ICustomScrollListener { diff --git a/src/main/java/noppes/npcs/client/gui/model/GuiEntitySelection.java b/src/main/java/noppes/npcs/client/gui/model/GuiEntitySelection.java index 1689893d3..f5a05d996 100644 --- a/src/main/java/noppes/npcs/client/gui/model/GuiEntitySelection.java +++ b/src/main/java/noppes/npcs/client/gui/model/GuiEntitySelection.java @@ -12,7 +12,12 @@ import noppes.npcs.client.EntityUtil; import noppes.npcs.client.gui.util.GuiNPCInterface; import noppes.npcs.client.gui.util.GuiNPCStringSlot; import noppes.npcs.client.gui.util.GuiNpcButton; -import noppes.npcs.entity.*; +import noppes.npcs.entity.EntityCustomNpc; +import noppes.npcs.entity.EntityNPCGolem; +import noppes.npcs.entity.EntityNpcCrystal; +import noppes.npcs.entity.EntityNpcDragon; +import noppes.npcs.entity.EntityNpcPony; +import noppes.npcs.entity.EntityNpcSlime; import noppes.npcs.entity.data.ModelData; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/noppes/npcs/client/gui/model/GuiModelRotate.java b/src/main/java/noppes/npcs/client/gui/model/GuiModelRotate.java index 743de0945..f8cafab52 100644 --- a/src/main/java/noppes/npcs/client/gui/model/GuiModelRotate.java +++ b/src/main/java/noppes/npcs/client/gui/model/GuiModelRotate.java @@ -2,7 +2,11 @@ package noppes.npcs.client.gui.model; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiModelInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcSlider; +import noppes.npcs.client.gui.util.ISliderListener; import noppes.npcs.entity.EntityCustomNpc; import noppes.npcs.entity.data.ModelData; import noppes.npcs.entity.data.ModelRotatePart; diff --git a/src/main/java/noppes/npcs/client/gui/model/GuiModelScale.java b/src/main/java/noppes/npcs/client/gui/model/GuiModelScale.java index e00af5683..4a1f2358f 100644 --- a/src/main/java/noppes/npcs/client/gui/model/GuiModelScale.java +++ b/src/main/java/noppes/npcs/client/gui/model/GuiModelScale.java @@ -2,7 +2,11 @@ package noppes.npcs.client.gui.model; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiModelInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcSlider; +import noppes.npcs.client.gui.util.ISliderListener; import noppes.npcs.entity.EntityCustomNpc; import noppes.npcs.entity.data.ModelData; import noppes.npcs.entity.data.ModelScalePart; diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiAnvilRecipes.java b/src/main/java/noppes/npcs/client/gui/player/GuiAnvilRecipes.java index 9b9341f48..956e30058 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiAnvilRecipes.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiAnvilRecipes.java @@ -10,7 +10,11 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import noppes.npcs.client.CustomNpcResourceListener; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiButtonNextPage; +import noppes.npcs.client.gui.util.GuiNPCInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; import noppes.npcs.controllers.RecipeController; import noppes.npcs.controllers.data.RecipeAnvil; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiDialogInteract.java b/src/main/java/noppes/npcs/client/gui/player/GuiDialogInteract.java index 1287000e1..a49db2873 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiDialogInteract.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiDialogInteract.java @@ -68,6 +68,13 @@ public class GuiDialogInteract extends GuiNPCInterface implements IGuiClose { private HashMap dialogImages = new HashMap<>(); + /** + * Tracks if a close packet has been sent to the server. This ensures that the + * dialog closed event always triggers even when the gui is closed through + * external means such as key binds that bypass {@link #keyTyped(char, int)}. + */ + private boolean sentClosePacket = false; + public GuiDialogInteract(EntityNPCInterface npc, Dialog dialog) { super(npc); this.dialog = dialog; @@ -647,6 +654,7 @@ public class GuiDialogInteract extends GuiNPCInterface implements IGuiClose { } private void closed() { + sentClosePacket = true; grabMouse(false); PacketClient.sendClient(new CheckPlayerValue(CheckPlayerValue.Type.CheckQuestCompletion)); } @@ -657,6 +665,7 @@ public class GuiDialogInteract extends GuiNPCInterface implements IGuiClose { public void appendDialog(Dialog dialog) { closeOnEsc = !dialog.disableEsc; + sentClosePacket = false; this.dialogImages.clear(); this.dialog = dialog; this.options = new ArrayList(); @@ -701,6 +710,17 @@ public class GuiDialogInteract extends GuiNPCInterface implements IGuiClose { MusicController.Instance.stopAllSounds(); } + @Override + public void onGuiClosed() { + if (!sentClosePacket) { + if (dialog != null) { + PacketClient.sendClient(new DialogSelectPacket(dialog.id, -1)); + } + closed(); + } + super.onGuiClosed(); + } + @Override public void setClose(int i, NBTTagCompound data) { grabMouse(false); diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiMailbox.java b/src/main/java/noppes/npcs/client/gui/player/GuiMailbox.java index babf6b3a0..e8ccec1f9 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiMailbox.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiMailbox.java @@ -7,7 +7,12 @@ import net.minecraft.client.gui.GuiYesNoCallback; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; import noppes.npcs.client.NoppesUtil; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNPCInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IGuiData; import noppes.npcs.controllers.data.PlayerMail; import noppes.npcs.controllers.data.PlayerMailData; diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiMailmanWrite.java b/src/main/java/noppes/npcs/client/gui/player/GuiMailmanWrite.java index d80138a5b..d19694ba6 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiMailmanWrite.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiMailmanWrite.java @@ -12,9 +12,20 @@ import net.minecraft.client.resources.I18n; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; -import net.minecraft.util.*; +import net.minecraft.util.ChatAllowedCharacters; +import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; import noppes.npcs.client.NoppesUtil; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiButtonNextPage; +import noppes.npcs.client.gui.util.GuiContainerNPCInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.IGuiClose; +import noppes.npcs.client.gui.util.IGuiError; +import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.containers.ContainerMail; import noppes.npcs.controllers.data.PlayerMail; import org.lwjgl.input.Keyboard; diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiNpcAnvil.java b/src/main/java/noppes/npcs/client/gui/player/GuiNpcAnvil.java index 7ef23a9a1..e98b8d280 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiNpcAnvil.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiNpcAnvil.java @@ -46,6 +46,9 @@ public class GuiNpcAnvil extends GuiContainerNPCInterface { int i1 = (height - ySize) / 2; drawTexturedModalRect(l, i1, 0, 0, xSize, ySize); super.drawGuiContainerBackgroundLayer(partialTicks, mouseX, mouseY); + if (!container.canPickupResult()) { + drawRedSlotOutline(guiLeft + 133, guiTop + 47); + } // Draw title and player's inventory label. fontRendererObj.drawString(StatCollector.translateToLocal("tile.anvil.name"), guiLeft + 4, guiTop + 4, CustomNpcResourceListener.DefaultTextColor); @@ -74,6 +77,14 @@ public class GuiNpcAnvil extends GuiContainerNPCInterface { fontRendererObj.drawString(status, guiLeft + 5, guiTop + 75, textColor); } + private void drawRedSlotOutline(int x, int y) { + int c = 0xFFFF0000; + drawRect(x - 1, y - 1, x + 17, y, c); + drawRect(x - 1, y + 16, x + 17, y + 17, c); + drawRect(x - 1, y, x, y + 16, c); + drawRect(x + 16, y, x + 17, y + 16, c); + } + @Override public void save() { // Nothing to save. diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiNpcCarpentryBench.java b/src/main/java/noppes/npcs/client/gui/player/GuiNpcCarpentryBench.java index 6c59de3ca..f3476528e 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiNpcCarpentryBench.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiNpcCarpentryBench.java @@ -46,10 +46,23 @@ public class GuiNpcCarpentryBench extends GuiContainerNPCInterface { title = StatCollector.translateToLocal("tile.anvil.name"); drawTexturedModalRect(l, i1, 0, 0, xSize, ySize); super.drawGuiContainerBackgroundLayer(f, i, j); + if (!container.canPickupResult()) { + drawRedSlotOutline(guiLeft + 129, guiTop + 37); + } fontRendererObj.drawString(title, guiLeft + 4, guiTop + 4, CustomNpcResourceListener.DefaultTextColor); fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), guiLeft + 4, guiTop + 87, CustomNpcResourceListener.DefaultTextColor); } + private void drawRedSlotOutline(int x, int y) { + int c = 0xFFFF0000; + int size = 24; + + drawRect(x - 1, y - 1, x + 1 + size, y, c); + drawRect(x - 1, y + size, x + 1 + size, y + 1 + size, c); + drawRect(x - 1, y, x, y + size, c); + drawRect(x + size, y, x + 1 + size, y + size, c); + } + @Override public void save() { return; diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiRecipes.java b/src/main/java/noppes/npcs/client/gui/player/GuiRecipes.java index 3c6f2ef70..78507813a 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiRecipes.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiRecipes.java @@ -11,7 +11,11 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import noppes.npcs.client.CustomNpcResourceListener; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiButtonNextPage; +import noppes.npcs.client.gui.util.GuiNPCInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; import noppes.npcs.controllers.RecipeController; import noppes.npcs.controllers.data.RecipeCarpentry; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiTransportSelection.java b/src/main/java/noppes/npcs/client/gui/player/GuiTransportSelection.java index 3c726c33d..f266059a6 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiTransportSelection.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiTransportSelection.java @@ -5,7 +5,12 @@ import kamkeel.npcs.network.packets.player.TransportPacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNPCInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.IScrollData; +import noppes.npcs.client.gui.util.ITopButtonListener; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.entity.EntityNPCInterface; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/noppes/npcs/client/gui/player/companion/GuiNpcCompanionStats.java b/src/main/java/noppes/npcs/client/gui/player/companion/GuiNpcCompanionStats.java index 591fe8f82..a7d4c953d 100644 --- a/src/main/java/noppes/npcs/client/gui/player/companion/GuiNpcCompanionStats.java +++ b/src/main/java/noppes/npcs/client/gui/player/companion/GuiNpcCompanionStats.java @@ -11,7 +11,11 @@ import net.minecraft.util.MathHelper; import noppes.npcs.CustomItems; import noppes.npcs.CustomNpcs; import noppes.npcs.NoppesStringUtils; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiContainerNPCInterface; +import noppes.npcs.client.gui.util.GuiMenuTopIconButton; +import noppes.npcs.client.gui.util.GuiNPCInterface; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.IGuiData; import noppes.npcs.constants.EnumCompanionJobs; import noppes.npcs.constants.EnumCompanionTalent; import noppes.npcs.constants.EnumGuiType; diff --git a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiParty.java b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiParty.java index 76ae5173c..3ff696952 100644 --- a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiParty.java +++ b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiParty.java @@ -2,7 +2,17 @@ package noppes.npcs.client.gui.player.inventory; import kamkeel.npcs.network.PacketClient; import kamkeel.npcs.network.packets.player.CheckPlayerValue; -import kamkeel.npcs.network.packets.request.party.*; +import kamkeel.npcs.network.packets.request.party.PartyAcceptInvitePacket; +import kamkeel.npcs.network.packets.request.party.PartyDisbandPacket; +import kamkeel.npcs.network.packets.request.party.PartyIgnoreInvitePacket; +import kamkeel.npcs.network.packets.request.party.PartyInfoPacket; +import kamkeel.npcs.network.packets.request.party.PartyInvitePacket; +import kamkeel.npcs.network.packets.request.party.PartyKickPacket; +import kamkeel.npcs.network.packets.request.party.PartyLeavePacket; +import kamkeel.npcs.network.packets.request.party.PartyLogToServerPacket; +import kamkeel.npcs.network.packets.request.party.PartySavePacket; +import kamkeel.npcs.network.packets.request.party.PartySetLeaderPacket; +import kamkeel.npcs.network.packets.request.party.PartySetQuestPacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiYesNo; import net.minecraft.client.gui.GuiYesNoCallback; @@ -14,13 +24,25 @@ import net.minecraft.util.StatCollector; import noppes.npcs.QuestLogData; import noppes.npcs.client.ClientCacheHandler; import noppes.npcs.client.CustomNpcResourceListener; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiButtonNextPage; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IPartyData; +import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.controllers.data.Party; import noppes.npcs.controllers.data.Quest; import org.lwjgl.opengl.GL11; import tconstruct.client.tabs.AbstractTab; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.Objects; +import java.util.UUID; +import java.util.Vector; public class GuiParty extends GuiCNPCInventory implements ITextfieldListener, ICustomScrollListener, IPartyData, GuiYesNoCallback { private final ResourceLocation resource = new ResourceLocation("customnpcs", "textures/gui/standardbg.png"); diff --git a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiProfiles.java b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiProfiles.java index 0a9f1be87..7ffb7aff2 100644 --- a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiProfiles.java +++ b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiProfiles.java @@ -4,7 +4,12 @@ import kamkeel.npcs.controllers.data.profile.Profile; import kamkeel.npcs.controllers.data.profile.ProfileInfoEntry; import kamkeel.npcs.controllers.data.profile.Slot; import kamkeel.npcs.network.PacketClient; -import kamkeel.npcs.network.packets.player.profile.*; +import kamkeel.npcs.network.packets.player.profile.ProfileChangePacket; +import kamkeel.npcs.network.packets.player.profile.ProfileCreatePacket; +import kamkeel.npcs.network.packets.player.profile.ProfileGetInfoPacket; +import kamkeel.npcs.network.packets.player.profile.ProfileGetPacket; +import kamkeel.npcs.network.packets.player.profile.ProfileRemovePacket; +import kamkeel.npcs.network.packets.player.profile.ProfileRenamePacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiYesNo; import net.minecraft.client.gui.GuiYesNoCallback; @@ -16,7 +21,12 @@ import noppes.npcs.api.handler.data.ISlot; import noppes.npcs.client.CustomNpcResourceListener; import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.SubGuiEditText; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; import tconstruct.client.tabs.AbstractTab; @@ -335,22 +345,15 @@ public class GuiProfiles extends GuiCNPCInventory implements ISubGuiListener, IC public void setGuiData(NBTTagCompound compound) { this.slot = null; - if (compound.hasKey("PROFILE")) { - // Load Profile - this.profile = new Profile(mc.thePlayer, compound); - this.data = new HashMap<>(); - String currentSlot = "\u00A7e"; - String otherSlot = "\u00A7f"; - for (ISlot slot1 : profile.getSlots().values()) { - String name = slot1.getId() + " - " + slot1.getName(); - if (profile.currentSlotId == slot1.getId()) - name = currentSlot + name; - else - name = otherSlot + name; - this.data.put(name, slot1.getId()); - } + if (compound.hasKey("CHANGE_PACKET")) { + this.readProfileCompound( + compound.getCompoundTag("PROFILE")); + this.slotInfoMap = ProfileGetInfoPacket.readProfileInfo( + compound.getCompoundTag("PROFILE_INFO")); + } else if (compound.hasKey("PROFILE")) { + this.readProfileCompound(compound); } else if (compound.hasKey("PROFILE_INFO")) { - slotInfoMap = ProfileGetInfoPacket.readProfileInfo(compound); + this.slotInfoMap = ProfileGetInfoPacket.readProfileInfo(compound); } if (scroll != null) { scroll.setSelected(""); @@ -358,6 +361,22 @@ public class GuiProfiles extends GuiCNPCInventory implements ISubGuiListener, IC initGui(); } + private void readProfileCompound(NBTTagCompound compound) { + // Load Profile + this.profile = new Profile(mc.thePlayer, compound); + this.data = new HashMap<>(); + String currentSlot = "\u00A7e"; + String otherSlot = "\u00A7f"; + for (ISlot slot1 : profile.getSlots().values()) { + String name = slot1.getId() + " - " + slot1.getName(); + if (profile.currentSlotId == slot1.getId()) + name = currentSlot + name; + else + name = otherSlot + name; + this.data.put(name, slot1.getId()); + } + } + /** * Handles mouse clicks for the scrollbar. */ diff --git a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiQuestLog.java b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiQuestLog.java index 0b65ec305..e382b7c51 100644 --- a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiQuestLog.java +++ b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiQuestLog.java @@ -17,14 +17,27 @@ import noppes.npcs.client.ClientCacheHandler; import noppes.npcs.client.CustomNpcResourceListener; import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.TextBlockClient; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiButtonNextPage; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiMenuSideButton; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.IPartyData; import noppes.npcs.controllers.data.Party; import noppes.npcs.util.ValueUtil; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; import tconstruct.client.tabs.AbstractTab; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.UUID; public class GuiQuestLog extends GuiCNPCInventory implements ICustomScrollListener, IGuiData, IPartyData, GuiYesNoCallback { diff --git a/src/main/java/noppes/npcs/client/gui/player/modern/GuiModernDialogInteract.java b/src/main/java/noppes/npcs/client/gui/player/modern/GuiModernDialogInteract.java index 6766b7711..fc4a221c7 100644 --- a/src/main/java/noppes/npcs/client/gui/player/modern/GuiModernDialogInteract.java +++ b/src/main/java/noppes/npcs/client/gui/player/modern/GuiModernDialogInteract.java @@ -57,6 +57,12 @@ public class GuiModernDialogInteract extends GuiNPCInterface implements IGuiClos private final HashMap dialogImages = new HashMap<>(); + /** + * Similar to {@link noppes.npcs.client.gui.player.GuiDialogInteract#sentClosePacket} this flag + * tracks if a close packet was already sent to the server. + */ + private boolean sentClosePacket = false; + public GuiModernDialogInteract(EntityNPCInterface npc, Dialog dialog) { super(npc); this.dialog = dialog; @@ -357,6 +363,7 @@ public class GuiModernDialogInteract extends GuiNPCInterface implements IGuiClos } private void closed() { + sentClosePacket = true; grabMouse(false); PacketClient.sendClient(new CheckPlayerValue(CheckPlayerValue.Type.CheckQuestCompletion)); } @@ -367,6 +374,7 @@ public class GuiModernDialogInteract extends GuiNPCInterface implements IGuiClos public void appendDialog(Dialog dialog) { closeOnEsc = !dialog.disableEsc; + sentClosePacket = false; this.dialogImages.clear(); this.dialog = dialog; this.options = new ArrayList(); @@ -423,4 +431,15 @@ public class GuiModernDialogInteract extends GuiNPCInterface implements IGuiClos public void setClose(int i, NBTTagCompound data) { grabMouse(false); } + + @Override + public void onGuiClosed() { + if (!sentClosePacket) { + if (dialog != null) { + PacketClient.sendClient(new DialogSelectPacket(dialog.id, -1)); + } + closed(); + } + super.onGuiClosed(); + } } diff --git a/src/main/java/noppes/npcs/client/gui/player/modern/GuiModernQuestDialog.java b/src/main/java/noppes/npcs/client/gui/player/modern/GuiModernQuestDialog.java index 0def72744..f0a20373f 100644 --- a/src/main/java/noppes/npcs/client/gui/player/modern/GuiModernQuestDialog.java +++ b/src/main/java/noppes/npcs/client/gui/player/modern/GuiModernQuestDialog.java @@ -29,12 +29,20 @@ import noppes.npcs.client.gui.util.GuiTexturedButton; import noppes.npcs.client.gui.util.IGuiClose; import noppes.npcs.config.ConfigExperimental; import noppes.npcs.controllers.FactionController; -import noppes.npcs.controllers.data.*; +import noppes.npcs.controllers.data.Dialog; +import noppes.npcs.controllers.data.DialogImage; +import noppes.npcs.controllers.data.PlayerData; +import noppes.npcs.controllers.data.Quest; +import noppes.npcs.controllers.data.QuestData; import noppes.npcs.entity.EntityNPCInterface; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; public class GuiModernQuestDialog extends GuiNPCInterface implements IGuiClose { private int selected = 0; @@ -54,6 +62,11 @@ public class GuiModernQuestDialog extends GuiNPCInterface implements IGuiClose { private boolean isGrabbed = false; + /** + * Flag to ensure the dialog close packet is only sent once. + */ + private boolean sentClosePacket = false; + private final HashMap dialogImages = new HashMap<>(); private Dialog prevDialog; private int optionId; @@ -70,6 +83,7 @@ public class GuiModernQuestDialog extends GuiNPCInterface implements IGuiClose { public void initGui() { super.initGui(); isGrabbed = false; + sentClosePacket = false; guiTop = (height - ySize); calculateRowHeight(); this.scaledResolution = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); @@ -353,6 +367,7 @@ public class GuiModernQuestDialog extends GuiNPCInterface implements IGuiClose { } private void closed() { + sentClosePacket = true; grabMouse(false); PacketClient.sendClient(new CheckPlayerValue(CheckPlayerValue.Type.CheckQuestCompletion)); } @@ -403,4 +418,15 @@ public class GuiModernQuestDialog extends GuiNPCInterface implements IGuiClose { public void setClose(int i, NBTTagCompound data) { grabMouse(false); } + + @Override + public void onGuiClosed() { + if (!sentClosePacket) { + if (prevDialog != null) { + PacketClient.sendClient(new DialogSelectPacket(prevDialog.id, -1)); + } + closed(); + } + super.onGuiClosed(); + } } diff --git a/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeItem.java b/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeItem.java index d57f6f12d..0d9ac099f 100644 --- a/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeItem.java +++ b/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeItem.java @@ -4,7 +4,12 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.util.ResourceLocation; import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.global.GuiNPCManageQuest; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiContainerNPCInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcButtonYesNo; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.containers.ContainerNpcQuestTypeItem; import noppes.npcs.controllers.data.Quest; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeKill.java b/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeKill.java index bf4829130..c4e7babd9 100644 --- a/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeKill.java +++ b/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeKill.java @@ -5,7 +5,13 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLivingBase; import net.minecraft.world.World; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.controllers.data.Quest; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.quests.QuestKill; diff --git a/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeLocation.java b/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeLocation.java index 4afbc1040..9c730b7af 100644 --- a/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeLocation.java +++ b/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeLocation.java @@ -2,7 +2,11 @@ package noppes.npcs.client.gui.questtypes; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.controllers.data.Quest; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.quests.QuestLocation; diff --git a/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeManual.java b/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeManual.java index 4c4730888..4022d2447 100644 --- a/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeManual.java +++ b/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeManual.java @@ -2,7 +2,11 @@ package noppes.npcs.client.gui.questtypes; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.controllers.data.Quest; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.quests.QuestManual; diff --git a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcBard.java b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcBard.java index 1a44021cc..e77496766 100644 --- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcBard.java +++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcBard.java @@ -4,7 +4,12 @@ import kamkeel.npcs.network.packets.request.jobs.JobSavePacket; import net.minecraft.client.gui.GuiButton; import noppes.npcs.client.controllers.MusicController; import noppes.npcs.client.gui.select.GuiSoundSelection; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.JobBard; diff --git a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcCompanion.java b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcCompanion.java index f35532ec3..731ec85f9 100644 --- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcCompanion.java +++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcCompanion.java @@ -6,7 +6,13 @@ import kamkeel.npcs.network.packets.request.role.RoleSavePacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.gui.player.companion.GuiNpcCompanionTalents.GuiTalent; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcSlider; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ISliderListener; +import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.constants.EnumCompanionStage; import noppes.npcs.constants.EnumCompanionTalent; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcConversation.java b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcConversation.java index 546125193..4a28787d0 100644 --- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcConversation.java +++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcConversation.java @@ -4,7 +4,13 @@ import kamkeel.npcs.network.packets.request.jobs.JobSavePacket; import net.minecraft.client.gui.GuiButton; import noppes.npcs.client.gui.SubGuiNpcAvailability; import noppes.npcs.client.gui.select.GuiQuestSelection; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.GuiSelectionListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.JobConversation; import noppes.npcs.roles.JobConversation.ConversationLine; diff --git a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcFollowerJob.java b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcFollowerJob.java index c41b728c4..4f656f63f 100644 --- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcFollowerJob.java +++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcFollowerJob.java @@ -1,7 +1,11 @@ package noppes.npcs.client.gui.roles; import kamkeel.npcs.network.packets.request.jobs.JobSavePacket; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ICustomScrollListener; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.JobFollower; diff --git a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcFollowerSetup.java b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcFollowerSetup.java index 2f18bdbff..1a3d36546 100644 --- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcFollowerSetup.java +++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcFollowerSetup.java @@ -6,7 +6,11 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiContainerNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcButtonYesNo; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; import noppes.npcs.containers.ContainerNPCFollowerSetup; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.RoleFollower; diff --git a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcSpawner.java b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcSpawner.java index 0901b38b2..d57dd417c 100644 --- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcSpawner.java +++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcSpawner.java @@ -8,7 +8,13 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; import noppes.npcs.client.gui.GuiNpcMobSpawnerSelector; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.JobSpawner; diff --git a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcTraderSetup.java b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcTraderSetup.java index 4d9729982..43c259da7 100644 --- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcTraderSetup.java +++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcTraderSetup.java @@ -7,7 +7,11 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; import noppes.npcs.client.CustomNpcResourceListener; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiContainerNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButtonYesNo; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.containers.ContainerNPCTraderSetup; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.RoleTrader; diff --git a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcTransporter.java b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcTransporter.java index 6be4a1f75..39cf78d46 100644 --- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcTransporter.java +++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcTransporter.java @@ -6,7 +6,13 @@ import kamkeel.npcs.network.packets.request.transport.TransportGetLocationPacket import kamkeel.npcs.network.packets.request.transport.TransportSavePacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.IScrollData; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.data.TransportLocation; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/client/gui/roles/SubGuiNpcConversationLine.java b/src/main/java/noppes/npcs/client/gui/roles/SubGuiNpcConversationLine.java index d98457bbd..6f08ac730 100644 --- a/src/main/java/noppes/npcs/client/gui/roles/SubGuiNpcConversationLine.java +++ b/src/main/java/noppes/npcs/client/gui/roles/SubGuiNpcConversationLine.java @@ -2,7 +2,12 @@ package noppes.npcs.client.gui.roles; import net.minecraft.client.gui.GuiButton; import noppes.npcs.client.gui.select.GuiSoundSelection; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; public class SubGuiNpcConversationLine extends SubGuiInterface implements ITextfieldListener, ISubGuiListener { public String line; diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiNPCEventScripts.java b/src/main/java/noppes/npcs/client/gui/script/GuiNPCEventScripts.java index 0fe589c8f..5b4693a10 100644 --- a/src/main/java/noppes/npcs/client/gui/script/GuiNPCEventScripts.java +++ b/src/main/java/noppes/npcs/client/gui/script/GuiNPCEventScripts.java @@ -39,7 +39,7 @@ public class GuiNPCEventScripts extends GuiScriptInterface { } public void setGuiData(NBTTagCompound compound) { - if(compound.hasKey("LoadComplete")){ + if (compound.hasKey("LoadComplete")) { loaded = true; return; } @@ -63,7 +63,7 @@ public class GuiNPCEventScripts extends GuiScriptInterface { } public void save() { - if(loaded) { + if (loaded) { super.save(); List containers = this.script.getScripts(); for (int i = 0; i < containers.size(); i++) { diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiScriptAllNPCs.java b/src/main/java/noppes/npcs/client/gui/script/GuiScriptAllNPCs.java index 5ab933754..6f0927cbc 100644 --- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptAllNPCs.java +++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptAllNPCs.java @@ -35,7 +35,7 @@ public class GuiScriptAllNPCs extends GuiScriptInterface { } public void setGuiData(NBTTagCompound compound) { - if(compound.hasKey("LoadComplete")){ + if (compound.hasKey("LoadComplete")) { loaded = true; return; } @@ -59,7 +59,7 @@ public class GuiScriptAllNPCs extends GuiScriptInterface { } public void save() { - if(loaded){ + if (loaded) { super.save(); List containers = this.script.getScripts(); for (int i = 0; i < containers.size(); i++) { diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiScriptBlock.java b/src/main/java/noppes/npcs/client/gui/script/GuiScriptBlock.java index 0f0fbc192..d5a5f3f86 100644 --- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptBlock.java +++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptBlock.java @@ -34,7 +34,7 @@ public class GuiScriptBlock extends GuiScriptInterface { } public void save() { - if(loaded) { + if (loaded) { super.save(); BlockScriptPacket.Save(tileScripted.xCoord, tileScripted.yCoord, tileScripted.zCoord, this.tileScripted.getNBT(new NBTTagCompound())); } diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiScriptEffect.java b/src/main/java/noppes/npcs/client/gui/script/GuiScriptEffect.java index 5348a6958..33582ad88 100644 --- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptEffect.java +++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptEffect.java @@ -11,12 +11,29 @@ import net.minecraft.util.StatCollector; import noppes.npcs.NBTTags; import noppes.npcs.NoppesStringUtils; import noppes.npcs.client.gui.global.GuiNPCManageEffects; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiMenuTopButton; +import noppes.npcs.client.gui.util.GuiNPCInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextArea; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.GuiScriptTextArea; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.IJTextAreaListener; +import noppes.npcs.client.gui.util.ITextChangeListener; +import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.controllers.ScriptContainer; import noppes.npcs.controllers.data.CustomEffect; import noppes.npcs.controllers.data.EffectScript; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; public class GuiScriptEffect extends GuiNPCInterface implements GuiYesNoCallback, IGuiData, ITextChangeListener, ICustomScrollListener, IJTextAreaListener, ITextfieldListener { @@ -315,7 +332,7 @@ public class GuiScriptEffect extends GuiNPCInterface implements GuiYesNoCallback } public void setGuiData(NBTTagCompound compound) { - if(compound.hasKey("LoadComplete")){ + if (compound.hasKey("LoadComplete")) { loaded = true; return; } @@ -354,7 +371,7 @@ public class GuiScriptEffect extends GuiNPCInterface implements GuiYesNoCallback } public void save() { - if(loaded) { + if (loaded) { this.setScript(); List containers = this.scriptHandler.getScripts(); diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiScriptForge.java b/src/main/java/noppes/npcs/client/gui/script/GuiScriptForge.java index e8460a6ce..aea39d1a5 100644 --- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptForge.java +++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptForge.java @@ -65,7 +65,7 @@ public class GuiScriptForge extends GuiScriptInterface { } public void setGuiData(NBTTagCompound compound) { - if(compound.hasKey("LoadComplete")){ + if (compound.hasKey("LoadComplete")) { loaded = true; return; } @@ -89,7 +89,7 @@ public class GuiScriptForge extends GuiScriptInterface { } public void save() { - if(loaded) { + if (loaded) { super.save(); List containers = this.script.getScripts(); for (int i = 0; i < containers.size(); i++) { diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java b/src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java index 5de8a7ba2..f68d5bfa0 100644 --- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java +++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java @@ -9,14 +9,31 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.util.StatCollector; import noppes.npcs.NoppesStringUtils; import noppes.npcs.client.NoppesUtil; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiMenuTopButton; +import noppes.npcs.client.gui.util.GuiNPCInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextArea; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.GuiScriptTextArea; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.IJTextAreaListener; +import noppes.npcs.client.gui.util.ITextChangeListener; +import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.controllers.ScriptContainer; import noppes.npcs.controllers.ScriptController; import noppes.npcs.controllers.data.ForgeDataScript; import noppes.npcs.controllers.data.IScriptHandler; import noppes.npcs.scripted.item.ScriptCustomItem; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; public class GuiScriptInterface extends GuiNPCInterface implements GuiYesNoCallback, IGuiData, ITextChangeListener, ICustomScrollListener, IJTextAreaListener, ITextfieldListener { @@ -339,7 +356,7 @@ public class GuiScriptInterface extends GuiNPCInterface implements GuiYesNoCallb } public void save() { - if(loaded) + if (loaded) this.setScript(); } diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiScriptItem.java b/src/main/java/noppes/npcs/client/gui/script/GuiScriptItem.java index 9b12d2bb6..23a29b90c 100644 --- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptItem.java +++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptItem.java @@ -49,7 +49,7 @@ public class GuiScriptItem extends GuiScriptInterface { } public void save() { - if(loaded) { + if (loaded) { super.save(); ItemScriptPacket.Save(this.item.getMCNbt()); } diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiScriptLinkedItem.java b/src/main/java/noppes/npcs/client/gui/script/GuiScriptLinkedItem.java index 4d2727de6..664c08d1f 100644 --- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptLinkedItem.java +++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptLinkedItem.java @@ -11,13 +11,30 @@ import net.minecraft.util.StatCollector; import noppes.npcs.NBTTags; import noppes.npcs.NoppesStringUtils; import noppes.npcs.client.gui.global.GuiNPCManageLinked; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiMenuTopButton; +import noppes.npcs.client.gui.util.GuiNPCInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextArea; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.GuiScriptTextArea; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.IJTextAreaListener; +import noppes.npcs.client.gui.util.ITextChangeListener; +import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.constants.EnumScriptType; import noppes.npcs.controllers.ScriptContainer; import noppes.npcs.controllers.data.LinkedItem; import noppes.npcs.controllers.data.LinkedItemScript; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; public class GuiScriptLinkedItem extends GuiNPCInterface implements GuiYesNoCallback, IGuiData, ITextChangeListener, ICustomScrollListener, IJTextAreaListener, ITextfieldListener { @@ -327,7 +344,7 @@ public class GuiScriptLinkedItem extends GuiNPCInterface implements GuiYesNoCall } public void setGuiData(NBTTagCompound compound) { - if(compound.hasKey("LoadComplete")){ + if (compound.hasKey("LoadComplete")) { loaded = true; return; } @@ -367,7 +384,7 @@ public class GuiScriptLinkedItem extends GuiNPCInterface implements GuiYesNoCall } public void save() { - if(loaded) { + if (loaded) { this.setScript(); List containers = this.scriptHandler.getScripts(); diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiScriptPlayers.java b/src/main/java/noppes/npcs/client/gui/script/GuiScriptPlayers.java index 6948ce89f..501e348d1 100644 --- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptPlayers.java +++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptPlayers.java @@ -91,7 +91,7 @@ public class GuiScriptPlayers extends GuiScriptInterface { } public void setGuiData(NBTTagCompound compound) { - if(compound.hasKey("LoadComplete")){ + if (compound.hasKey("LoadComplete")) { loaded = true; return; } @@ -115,7 +115,7 @@ public class GuiScriptPlayers extends GuiScriptInterface { } public void save() { - if(loaded) { + if (loaded) { super.save(); List containers = this.script.getScripts(); for (int i = 0; i < containers.size(); i++) { diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiScriptRecipe.java b/src/main/java/noppes/npcs/client/gui/script/GuiScriptRecipe.java new file mode 100644 index 000000000..bb93052d7 --- /dev/null +++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptRecipe.java @@ -0,0 +1,435 @@ +package noppes.npcs.client.gui.script; + +import kamkeel.npcs.network.packets.request.script.RecipeScriptPacket; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.gui.GuiConfirmOpenLink; +import net.minecraft.client.gui.GuiYesNo; +import net.minecraft.client.gui.GuiYesNoCallback; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.util.StatCollector; +import noppes.npcs.NBTTags; +import noppes.npcs.NoppesStringUtils; +import noppes.npcs.client.gui.global.GuiNpcManageRecipes; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiMenuTopButton; +import noppes.npcs.client.gui.util.GuiNPCInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextArea; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.GuiScriptTextArea; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.IJTextAreaListener; +import noppes.npcs.client.gui.util.ITextChangeListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.controllers.ScriptContainer; +import noppes.npcs.controllers.data.RecipeAnvil; +import noppes.npcs.controllers.data.RecipeCarpentry; +import noppes.npcs.controllers.data.RecipeScript; + +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +public class GuiScriptRecipe extends GuiNPCInterface implements GuiYesNoCallback, IGuiData, ITextChangeListener, ICustomScrollListener, IJTextAreaListener, ITextfieldListener { + private int activeTab = 0; + public Map> languages = new HashMap(); + private final int scriptLimit = 1; + public List hookList = new ArrayList(); + public String previousHookClicked = ""; + + public final GuiNpcManageRecipes parent; + public final int recipeId; + public final boolean anvil; + + private final RecipeScript scriptHandler; + boolean loaded = false; + + public GuiScriptRecipe(GuiNpcManageRecipes parent, RecipeCarpentry recipe) { + this.drawDefaultBackground = true; + this.closeOnEsc = true; + this.xSize = 420; + this.setBackground("menubg.png"); + + this.parent = parent; + + this.scriptHandler = new RecipeScript(); + this.anvil = false; + this.recipeId = recipe.id; + + hookList.add(RecipeScript.ScriptType.PRE.function); + hookList.add(RecipeScript.ScriptType.POST.function); + + RecipeScriptPacket.Get(false, recipeId); + } + + public GuiScriptRecipe(GuiNpcManageRecipes parent, RecipeAnvil recipe) { + this.drawDefaultBackground = true; + this.closeOnEsc = true; + this.xSize = 420; + this.setBackground("menubg.png"); + + this.parent = parent; + + this.scriptHandler = new RecipeScript(); + this.anvil = true; + this.recipeId = recipe.id; + + hookList.add(RecipeScript.ScriptType.PRE.function); + hookList.add(RecipeScript.ScriptType.POST.function); + + RecipeScriptPacket.Get(true, recipeId); + } + + public void initGui() { + this.ySize = (int) ((double) this.xSize * 0.56); + if ((double) this.ySize > (double) this.height * 0.95) { + this.ySize = (int) ((double) this.height * 0.95); + this.xSize = (int) ((double) this.ySize / 0.56); + } + + this.bgScale = (float) this.xSize / 400.0F; + super.initGui(); + this.guiTop += 10; + int yoffset = (int) ((double) this.ySize * 0.02); + GuiMenuTopButton top; + this.addTopButton(top = new GuiMenuTopButton(0, this.guiLeft + 4, this.guiTop - 17, "gui.settings")); + int topXoffset = 0; + int topYoffset = 0; + + if (this.scriptHandler.container != null) { + this.addTopButton(top = new GuiMenuTopButton(1, top.xPosition + top.width + topXoffset, top.yPosition + topYoffset, "Script")); + + } else { + this.addTopButton(new GuiMenuTopButton(this.scriptLimit, top.xPosition + top.width, top.yPosition, "+")); + } + + top = this.getTopButton(this.activeTab); + if (top == null) { + this.activeTab = 0; + top = this.getTopButton(0); + } + + top.active = true; + if (this.activeTab == 1) { + GuiCustomScroll hooks = new GuiCustomScroll(this, 1); + hooks.allowUserInput = false; + hooks.setSize(108, 198); + hooks.guiLeft = this.guiLeft - 110; + hooks.guiTop = this.guiTop + 14; + + hooks.setUnsortedList(this.hookList); + this.addScroll(hooks); + GuiNpcLabel hookLabel = new GuiNpcLabel(0, "script.hooks", hooks.guiLeft, this.guiTop + 5); + hookLabel.color = 11184810; + this.addLabel(hookLabel); + ScriptContainer container = this.scriptHandler.container; + GuiScriptTextArea ta = new GuiScriptTextArea(this, 2, this.guiLeft + 1 + yoffset, this.guiTop + yoffset, this.xSize - 108 - yoffset, (int) ((double) this.ySize * 0.96) - yoffset * 2, container == null ? "" : container.script); + ta.enableCodeHighlighting(); + ta.setListener(this); + this.addTextField(ta); + int left1 = this.guiLeft + this.xSize - 104; + this.addButton(new GuiNpcButton(102, left1, this.guiTop + yoffset, 60, 20, "gui.clear")); + this.addButton(new GuiNpcButton(101, left1 + 61, this.guiTop + yoffset, 60, 20, "gui.paste")); + this.addButton(new GuiNpcButton(100, left1, this.guiTop + 21 + yoffset, 60, 20, "gui.copy")); + this.addButton(new GuiNpcButton(105, left1 + 61, this.guiTop + 21 + yoffset, 60, 20, "gui.remove")); + + this.addButton(new GuiNpcButton(107, left1, this.guiTop + 66 + yoffset, 80, 20, "script.loadscript")); + this.getButton(107).enabled = false; + + GuiCustomScroll scroll = (new GuiCustomScroll(this, 0)).setUnselectable(); + scroll.setSize(100, (int) ((double) this.ySize * 0.54) - yoffset * 2); + scroll.guiLeft = left1; + scroll.guiTop = this.guiTop + 88 + yoffset; + if (container != null) { + scroll.setList(container.scripts); + } + + this.addScroll(scroll); + } else { + GuiNpcTextArea var8 = new GuiNpcTextArea(2, this, this.guiLeft + 4 + yoffset, this.guiTop + 6 + yoffset, this.xSize - 160 - yoffset, (int) ((float) this.ySize * 0.92F) - yoffset * 2, this.getConsoleText()); + var8.enabled = false; + this.addTextField(var8); + int var9 = this.guiLeft + this.xSize - 150; + this.addButton(new GuiNpcButton(100, var9, this.guiTop + 125, 60, 20, "gui.copy")); + this.addButton(new GuiNpcButton(102, var9, this.guiTop + 146, 60, 20, "gui.clear")); + this.addLabel(new GuiNpcLabel(1, "script.language", var9, this.guiTop + 15)); + this.addButton(new GuiNpcButton(103, var9 + 60, this.guiTop + 10, 80, 20, this.languages.keySet().toArray(new String[this.languages.keySet().size()]), this.getScriptIndex())); + this.getButton(103).enabled = !this.languages.isEmpty(); + this.addLabel(new GuiNpcLabel(2, "gui.enabled", var9, this.guiTop + 36)); + this.addButton(new GuiNpcButton(104, var9 + 60, this.guiTop + 31, 50, 20, new String[]{"gui.no", "gui.yes"}, this.scriptHandler.getEnabled() ? 1 : 0)); + + this.addButton(new GuiNpcButton(109, var9, this.guiTop + 78, 80, 20, "gui.website")); + this.addButton(new GuiNpcButton(112, var9 + 81, this.guiTop + 78, 80, 20, "gui.forum")); + this.addButton(new GuiNpcButton(110, var9, this.guiTop + 99, 80, 20, "script.apidoc")); + this.addButton(new GuiNpcButton(111, var9 + 81, this.guiTop + 99, 80, 20, "script.apisrc")); + } + + this.xSize = 420; + this.ySize = 256; + } + + public void customScrollClicked(int i, int j, int k, GuiCustomScroll scroll) { + String hook = scroll.getSelected(); + if (this.previousHookClicked.equals(hook)) { + String addString = ""; + if (!this.getTextField(2).getText().isEmpty()) { + addString = addString + "\n"; + } + + addString = addString + "function " + hook + "(event) {\n \n}\n"; + this.getTextField(2).setText(this.getTextField(2).getText() + addString); + this.previousHookClicked = ""; + } else { + this.previousHookClicked = hook; + } + + } + + public void unFocused(GuiNpcTextField textfield) { + } + + private String getConsoleText() { + Map map = this.scriptHandler.getConsoleText(); + StringBuilder builder = new StringBuilder(); + Iterator var3 = map.entrySet().iterator(); + + while (var3.hasNext()) { + Map.Entry entry = (Map.Entry) var3.next(); + builder.insert(0, new Date((Long) entry.getKey()) + (String) entry.getValue() + "\n"); + } + + return builder.toString(); + } + + private int getScriptIndex() { + int i = 0; + + for (Iterator var2 = this.languages.keySet().iterator(); var2.hasNext(); ++i) { + String language = (String) var2.next(); + if (language.equalsIgnoreCase(this.scriptHandler.getLanguage())) { + return i; + } + } + + return 0; + } + + public void confirmClicked(boolean flag, int i) { + if (flag) { + if (i == 0) { + this.openLink("https://www.curseforge.com/minecraft/mc-mods/customnpc-plus"); + } + + if (i == 1) { + this.openLink("https://kamkeel.github.io/CustomNPC-Plus/"); + } + + if (i == 2) { + this.openLink("https://kamkeel.github.io/CustomNPC-Plus/"); + } + + if (i == 3) { + this.openLink("http://www.minecraftforge.net/forum/index.php/board,122.0.html"); + } + + if (i == 10) { + this.scriptHandler.container = null; + this.activeTab = 0; + } + + if (i == 101) { + this.getTextField(2).setText(NoppesStringUtils.getClipboardContents()); + this.setScript(); + } + + if (i == 102) { + if (this.activeTab == 1) { + ScriptContainer container = this.scriptHandler.container; + container.script = ""; + } else { + this.scriptHandler.clearConsole(); + } + + this.initGui(); + } + } + + this.displayGuiScreen(this); + } + + protected void actionPerformed(GuiButton guibutton) { + if (guibutton.id == 0) { + this.setScript(); + this.activeTab = 0; + this.initGui(); + } + + if (guibutton.id == this.scriptLimit) { + if (scriptHandler.container == null) + this.scriptHandler.container = new ScriptContainer(this.scriptHandler); + else + this.setScript(); + this.activeTab = 1; + this.initGui(); + } + + if (guibutton.id == 109) { + this.displayGuiScreen(new GuiConfirmOpenLink(this, "https://kamkeel.github.io/CustomNPC-Plus/", 0, true)); + } + + if (guibutton.id == 110) { + this.displayGuiScreen(new GuiConfirmOpenLink(this, "https://github.com/KAMKEEL/CustomNPC-Plus-API", 1, true)); + } + + if (guibutton.id == 111) { + this.displayGuiScreen(new GuiConfirmOpenLink(this, "https://github.com/Noppes/CustomNPCsAPI", 2, true)); + } + + if (guibutton.id == 112) { + this.displayGuiScreen(new GuiConfirmOpenLink(this, "http://www.minecraftforge.net/forum/index.php/board,122.0.html", 3, true)); + } + + if (guibutton.id == 100) { + NoppesStringUtils.setClipboardContents(this.getTextField(2).getText()); + } + + if (guibutton.id == 101) { + GuiYesNo guiyesno = new GuiYesNo(this, StatCollector.translateToLocal("gui.paste"), StatCollector.translateToLocal("gui.sure"), 101); + this.displayGuiScreen(guiyesno); + } + + GuiYesNo container1; + if (guibutton.id == 102) { + container1 = new GuiYesNo(this, StatCollector.translateToLocal("gui.clear"), StatCollector.translateToLocal("gui.sure"), 102); + this.displayGuiScreen(container1); + } + + if (guibutton.id == 103) { + this.scriptHandler.setLanguage(guibutton.displayString); + } + + if (guibutton.id == 104) { + this.scriptHandler.setEnabled(((GuiNpcButton) guibutton).getValue() == 1); + } + + if (guibutton.id == 105) { + container1 = new GuiYesNo(this, "", ((GuiNpcButton) guibutton).displayString, 10); + this.displayGuiScreen(container1); + } + + if (guibutton.id == 107) { + ScriptContainer container = this.scriptHandler.container; + if (container == null) { + container = new ScriptContainer(this.scriptHandler); + this.scriptHandler.container = container; + } + +// this.setSubGui(new EventGuiScriptList((List)this.languages.get(this.script.getLanguage()), container)); + } + + } + + private void setScript() { + if (this.activeTab == 1) { + ScriptContainer container = this.scriptHandler.container; + if (container == null) { + container = new ScriptContainer(this.scriptHandler); + this.scriptHandler.container = container; + } + + String text = this.getTextField(2).getText(); + text = text.replace("\r\n", "\n"); + text = text.replace("\r", "\n"); + container.script = text; + } + + } + + public void setGuiData(NBTTagCompound compound) { + if (compound.hasKey("LoadComplete")) { + loaded = true; + return; + } + + if (!compound.hasKey("Tab")) { + this.scriptHandler.setLanguage(compound.getString("ScriptLanguage")); + this.scriptHandler.setEnabled(compound.getBoolean("ScriptEnabled")); + this.copiedSetGuiData(compound); + } else { + int tab = compound.getInteger("Tab"); + ScriptContainer container = new ScriptContainer(this.scriptHandler); + container.readFromNBT(compound.getCompoundTag("Script")); + this.scriptHandler.container = container; + this.initGui(); + } + } + + private void copiedSetGuiData(NBTTagCompound compound) { + NBTTagList data = compound.getTagList("Languages", 10); + HashMap languages = new HashMap(); + + for (int i = 0; i < data.tagCount(); ++i) { + NBTTagCompound comp = data.getCompoundTagAt(i); + ArrayList scripts = new ArrayList(); + NBTTagList list = comp.getTagList("Scripts", 8); + + for (int j = 0; j < list.tagCount(); ++j) { + scripts.add(list.getStringTagAt(j)); + } + + languages.put(comp.getString("Language"), scripts); + } + + this.languages = languages; + this.initGui(); + } + + public void save() { + if (loaded) { + this.setScript(); + + List containers = this.scriptHandler.getScripts(); + for (int i = 0; i < containers.size(); i++) { + ScriptContainer container = containers.get(i); + RecipeScriptPacket.Save(anvil, recipeId, i, containers.size(), container.writeToNBT(new NBTTagCompound())); + } + NBTTagCompound scriptData = new NBTTagCompound(); + scriptData.setString("ScriptLanguage", this.scriptHandler.getLanguage()); + scriptData.setBoolean("ScriptEnabled", this.scriptHandler.getEnabled()); + scriptData.setTag("ScriptConsole", NBTTags.NBTLongStringMap(this.scriptHandler.getConsoleText())); + + RecipeScriptPacket.Save(anvil, recipeId, -1, containers.size(), scriptData); + } + } + + public void textUpdate(String text) { + ScriptContainer container = this.scriptHandler.container; + if (container != null) { + container.script = text; + } + + } + + public void saveText(String text) { + ScriptContainer container = this.scriptHandler.container; + if (container != null) { + container.script = text; + } + + this.initGui(); + } + + @Override + public void close() { + this.save(); + parent.setWorldAndResolution(mc, width, height); + parent.initGui(); + mc.currentScreen = parent; + } +} diff --git a/src/main/java/noppes/npcs/client/gui/select/GuiDialogSelection.java b/src/main/java/noppes/npcs/client/gui/select/GuiDialogSelection.java index a98a80f4d..bfe59e467 100644 --- a/src/main/java/noppes/npcs/client/gui/select/GuiDialogSelection.java +++ b/src/main/java/noppes/npcs/client/gui/select/GuiDialogSelection.java @@ -2,7 +2,13 @@ package noppes.npcs.client.gui.select; import com.google.common.collect.Lists; import net.minecraft.client.gui.GuiButton; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.GuiSelectionListener; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.controllers.DialogController; import noppes.npcs.controllers.data.Dialog; import noppes.npcs.controllers.data.DialogCategory; diff --git a/src/main/java/noppes/npcs/client/gui/select/GuiQuestSelection.java b/src/main/java/noppes/npcs/client/gui/select/GuiQuestSelection.java index 58548069c..72a1da482 100644 --- a/src/main/java/noppes/npcs/client/gui/select/GuiQuestSelection.java +++ b/src/main/java/noppes/npcs/client/gui/select/GuiQuestSelection.java @@ -2,7 +2,13 @@ package noppes.npcs.client.gui.select; import com.google.common.collect.Lists; import net.minecraft.client.gui.GuiButton; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.GuiSelectionListener; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.controllers.QuestController; import noppes.npcs.controllers.data.Quest; import noppes.npcs.controllers.data.QuestCategory; diff --git a/src/main/java/noppes/npcs/client/gui/select/GuiSoundSelection.java b/src/main/java/noppes/npcs/client/gui/select/GuiSoundSelection.java index e50630526..341b3cc48 100644 --- a/src/main/java/noppes/npcs/client/gui/select/GuiSoundSelection.java +++ b/src/main/java/noppes/npcs/client/gui/select/GuiSoundSelection.java @@ -8,7 +8,11 @@ import net.minecraft.client.audio.SoundRegistry; import net.minecraft.client.gui.GuiButton; import net.minecraft.util.ResourceLocation; import noppes.npcs.client.controllers.MusicController; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/noppes/npcs/client/gui/select/GuiTextureSelection.java b/src/main/java/noppes/npcs/client/gui/select/GuiTextureSelection.java index c258c8b24..eb8af18d0 100644 --- a/src/main/java/noppes/npcs/client/gui/select/GuiTextureSelection.java +++ b/src/main/java/noppes/npcs/client/gui/select/GuiTextureSelection.java @@ -6,7 +6,13 @@ import cpw.mods.fml.common.ModContainer; import cpw.mods.fml.common.ObfuscationReflectionHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.resources.*; +import net.minecraft.client.resources.AbstractResourcePack; +import net.minecraft.client.resources.DefaultResourcePack; +import net.minecraft.client.resources.FallbackResourceManager; +import net.minecraft.client.resources.IResourcePack; +import net.minecraft.client.resources.NPCResourceHelper; +import net.minecraft.client.resources.ResourcePackRepository; +import net.minecraft.client.resources.SimpleReloadableResourceManager; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; @@ -23,7 +29,12 @@ import java.io.UnsupportedEncodingException; import java.net.URL; import java.net.URLDecoder; import java.nio.charset.StandardCharsets; -import java.util.*; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiCustomScroll.java b/src/main/java/noppes/npcs/client/gui/util/GuiCustomScroll.java index bb83ef292..0bf481ffb 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiCustomScroll.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiCustomScroll.java @@ -7,7 +7,11 @@ import net.minecraft.util.StatCollector; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; import static noppes.npcs.client.gui.util.GuiNPCInterface.resizingActive; @@ -26,10 +30,10 @@ public class GuiCustomScroll extends GuiScreen { protected int oldHover; private int hoverCount = 0; protected boolean hoverableText = false; - private int listHeight; - protected int scrollY; - protected int maxScrollY; - protected int scrollHeight; + public int listHeight; + public int scrollY; + public int maxScrollY; + public int scrollHeight; private boolean isScrolling; public boolean multipleSelection = false; private ICustomScrollListener listener; diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiDiagram.java b/src/main/java/noppes/npcs/client/gui/util/GuiDiagram.java index 926708989..07822888c 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiDiagram.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiDiagram.java @@ -10,9 +10,19 @@ import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; import java.awt.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; import java.util.List; +import java.util.Map; import java.util.Queue; -import java.util.*; +import java.util.Random; +import java.util.Set; +import java.util.TreeMap; /** * Abstract GUI class for drawing diagrams with icons (nodes) and connections (arrows). @@ -136,12 +146,20 @@ public abstract class GuiDiagram extends Gui { String nameFrom = iconFrom != null ? getIconName(iconFrom) : "Unknown"; String nameTo = iconTo != null ? getIconName(iconTo) : "Unknown"; tooltip.add(nameFrom + " > " + nameTo + ":"); - tooltip.add(conn.hoverText); + // Split Hover Text by newlines + if (conn.hoverText != null && !conn.hoverText.isEmpty()) { + String[] lines = conn.hoverText.split("\n"); + tooltip.addAll(Arrays.asList(lines)); + } if (allowTwoWay) { DiagramConnection reverse = getConnectionByIds(conn.idTo, conn.idFrom); if (reverse != null) { tooltip.add(nameTo + " > " + nameFrom + ":"); - tooltip.add(reverse.hoverText); + // Split Hover Text by newlines + if (reverse.hoverText != null && !reverse.hoverText.isEmpty()) { + String[] lines = reverse.hoverText.split("\n"); + tooltip.addAll(Arrays.asList(lines)); + } } } return tooltip; diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiHoverText.java b/src/main/java/noppes/npcs/client/gui/util/GuiHoverText.java index 8e5d3f722..14f083b01 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiHoverText.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiHoverText.java @@ -1,10 +1,11 @@ package noppes.npcs.client.gui.util; +import kamkeel.npcs.util.TextSplitter; import net.minecraft.client.gui.GuiScreen; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; -import java.util.ArrayList; import java.util.List; public class GuiHoverText extends GuiScreen { @@ -28,8 +29,7 @@ public class GuiHoverText extends GuiScreen { this.drawTexturedModalRect(this.x, this.y, 0, 0, 12, 12); if (inArea(x, y, 12, 12, par1, par2)) { - List lines = new ArrayList(); - lines.add(text); + List lines = TextSplitter.splitText(StatCollector.translateToLocal(text), 30); this.drawHoveringText(lines, x + 8, y + 6, this.fontRendererObj); GL11.glDisable(GL11.GL_LIGHTING); } diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface.java b/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface.java index 2ce62726b..27e5da0ec 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface.java @@ -314,8 +314,6 @@ public abstract class GuiNPCInterface extends GuiScreen { scroll.updateSubGUI(subGui); scroll.drawScreen(i, j, f, !subGui && scroll.isMouseOver(i, j) ? Mouse.getDWheel() : 0); } - for (GuiScreen gui : extra.values()) - gui.drawScreen(i, j, f); // Draw scrollable windows. for (GuiScrollWindow guiScrollableComponent : scrollWindows.values()) { guiScrollableComponent.drawScreen(i, j, f, !subGui && guiScrollableComponent.isMouseOver(i, j) ? Mouse.getDWheel() : 0); @@ -335,6 +333,9 @@ public abstract class GuiNPCInterface extends GuiScreen { } } + for (GuiScreen gui : extra.values()) + gui.drawScreen(i, j, f); + if (subgui != null) { subgui.drawScreen(i, j, f); } diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiNPCStringSlot.java b/src/main/java/noppes/npcs/client/gui/util/GuiNPCStringSlot.java index b0434d542..629fa6b92 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiNPCStringSlot.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiNPCStringSlot.java @@ -4,7 +4,11 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiSlot; import net.minecraft.client.renderer.Tessellator; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; public class GuiNPCStringSlot extends GuiSlot { diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiScriptTextArea.java b/src/main/java/noppes/npcs/client/gui/util/GuiScriptTextArea.java index 205351715..95708326b 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiScriptTextArea.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiScriptTextArea.java @@ -91,7 +91,8 @@ public class GuiScriptTextArea extends GuiNpcTextField { scrolledLine = Math.min(Math.max((int) (1f * diff * (yMouse - y) / height), 0), diff); } int startBracket = 0, endBracket = 0; - if (endSelection - startSelection == 1 || startSelection == endSelection && startSelection < text.length()) { + if (startSelection >= 0 && startSelection < text.length() && + (endSelection - startSelection == 1 || startSelection == endSelection)) { char c = text.charAt(startSelection); int found = 0; if (c == '{') { diff --git a/src/main/java/noppes/npcs/client/model/ModelMPM.java b/src/main/java/noppes/npcs/client/model/ModelMPM.java index f4d92a8dd..6c6cc623d 100644 --- a/src/main/java/noppes/npcs/client/model/ModelMPM.java +++ b/src/main/java/noppes/npcs/client/model/ModelMPM.java @@ -13,13 +13,32 @@ import noppes.npcs.api.ISkinOverlay; import noppes.npcs.client.ClientCacheHandler; import noppes.npcs.client.model.animation.AniCrawling; import noppes.npcs.client.model.animation.AniHug; -import noppes.npcs.client.model.part.*; +import noppes.npcs.client.model.part.ModelBeard; +import noppes.npcs.client.model.part.ModelBodywear; +import noppes.npcs.client.model.part.ModelBreasts; +import noppes.npcs.client.model.part.ModelClaws; +import noppes.npcs.client.model.part.ModelEars; +import noppes.npcs.client.model.part.ModelFin; +import noppes.npcs.client.model.part.ModelHair; +import noppes.npcs.client.model.part.ModelHeadwear; +import noppes.npcs.client.model.part.ModelHorns; +import noppes.npcs.client.model.part.ModelLegs; +import noppes.npcs.client.model.part.ModelLimbWear; +import noppes.npcs.client.model.part.ModelMohawk; +import noppes.npcs.client.model.part.ModelSkirt; +import noppes.npcs.client.model.part.ModelSnout; +import noppes.npcs.client.model.part.ModelTail; +import noppes.npcs.client.model.part.ModelWings; import noppes.npcs.client.model.util.ModelPartInterface; import noppes.npcs.client.model.util.ModelScaleRenderer; import noppes.npcs.client.renderer.ImageData; import noppes.npcs.constants.EnumAnimation; import noppes.npcs.constants.EnumAnimationPart; -import noppes.npcs.controllers.data.*; +import noppes.npcs.controllers.data.Animation; +import noppes.npcs.controllers.data.AnimationData; +import noppes.npcs.controllers.data.Frame; +import noppes.npcs.controllers.data.FramePart; +import noppes.npcs.controllers.data.SkinOverlay; import noppes.npcs.entity.EntityCustomNpc; import noppes.npcs.entity.data.ModelPartData; import noppes.npcs.entity.data.ModelScalePart; diff --git a/src/main/java/noppes/npcs/client/model/ModelPony.java b/src/main/java/noppes/npcs/client/model/ModelPony.java index 57e47f8bc..b0d23b40a 100644 --- a/src/main/java/noppes/npcs/client/model/ModelPony.java +++ b/src/main/java/noppes/npcs/client/model/ModelPony.java @@ -20,6 +20,7 @@ import javax.imageio.ImageIO; import java.awt.*; import java.awt.image.BufferedImage; import java.io.IOException; +import java.io.InputStream; public class ModelPony extends ModelBase { @@ -756,29 +757,30 @@ public class ModelPony extends ModelBase { if (pony.textureLocation != pony.checked && pony.textureLocation != null) { try { IResource resource = Minecraft.getMinecraft().getResourceManager().getResource(pony.textureLocation); - BufferedImage bufferedimage = ImageIO.read(resource.getInputStream()); + try (InputStream stream = resource.getInputStream()) { + BufferedImage bufferedimage = ImageIO.read(stream); - pony.isPegasus = false; - pony.isUnicorn = false; - Color color = new Color(bufferedimage.getRGB(0, 0), true); - Color color1 = new Color(249, 177, 49, 255); - Color color2 = new Color(136, 202, 240, 255); - Color color3 = new Color(209, 159, 228, 255); - Color color4 = new Color(254, 249, 252, 255); - if (color.equals(color1)) { + pony.isPegasus = false; + pony.isUnicorn = false; + Color color = new Color(bufferedimage.getRGB(0, 0), true); + Color color1 = new Color(249, 177, 49, 255); + Color color2 = new Color(136, 202, 240, 255); + Color color3 = new Color(209, 159, 228, 255); + Color color4 = new Color(254, 249, 252, 255); + if (color.equals(color1)) { + } + if (color.equals(color2)) { + pony.isPegasus = true; + } + if (color.equals(color3)) { + pony.isUnicorn = true; + } + if (color.equals(color4)) { + pony.isPegasus = true; + pony.isUnicorn = true; + } + pony.checked = pony.textureLocation; } - if (color.equals(color2)) { - pony.isPegasus = true; - } - if (color.equals(color3)) { - pony.isUnicorn = true; - } - if (color.equals(color4)) { - pony.isPegasus = true; - pony.isUnicorn = true; - } - pony.checked = pony.textureLocation; - } catch (IOException e) { } diff --git a/src/main/java/noppes/npcs/client/model/part/ModelTail.java b/src/main/java/noppes/npcs/client/model/part/ModelTail.java index d49eb565f..8b555e190 100644 --- a/src/main/java/noppes/npcs/client/model/part/ModelTail.java +++ b/src/main/java/noppes/npcs/client/model/part/ModelTail.java @@ -7,7 +7,13 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; import noppes.npcs.client.ClientProxy; import noppes.npcs.client.model.ModelMPM; -import noppes.npcs.client.model.part.tails.*; +import noppes.npcs.client.model.part.tails.ModelCanineTail; +import noppes.npcs.client.model.part.tails.ModelDragonTail; +import noppes.npcs.client.model.part.tails.ModelFeatherTail; +import noppes.npcs.client.model.part.tails.ModelMonkeyTail; +import noppes.npcs.client.model.part.tails.ModelRodentTail; +import noppes.npcs.client.model.part.tails.ModelSquirrelTail; +import noppes.npcs.client.model.part.tails.ModelTailFin; import noppes.npcs.client.model.util.ModelScaleRenderer; import noppes.npcs.constants.EnumAnimation; import noppes.npcs.controllers.data.TintData; diff --git a/src/main/java/noppes/npcs/client/renderer/ImageData.java b/src/main/java/noppes/npcs/client/renderer/ImageData.java index a9afad5c8..15c383e40 100644 --- a/src/main/java/noppes/npcs/client/renderer/ImageData.java +++ b/src/main/java/noppes/npcs/client/renderer/ImageData.java @@ -93,8 +93,9 @@ public class ImageData { if (!this.isUrl) { try { IResource iresource = Minecraft.getMinecraft().getResourceManager().getResource(location); - InputStream inputstream = iresource.getInputStream(); - this.bufferedImage = ImageIO.read(inputstream); + try (InputStream inputstream = iresource.getInputStream()) { + this.bufferedImage = ImageIO.read(inputstream); + } } catch (IOException ignored) { } } else { diff --git a/src/main/java/noppes/npcs/client/renderer/RenderNPCHumanMale.java b/src/main/java/noppes/npcs/client/renderer/RenderNPCHumanMale.java index dcd19ce2d..452627bad 100644 --- a/src/main/java/noppes/npcs/client/renderer/RenderNPCHumanMale.java +++ b/src/main/java/noppes/npcs/client/renderer/RenderNPCHumanMale.java @@ -8,7 +8,11 @@ import net.minecraft.client.renderer.entity.RenderBiped; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemBow; +import net.minecraft.item.ItemStack; import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.client.IItemRenderer; import net.minecraftforge.client.MinecraftForgeClient; diff --git a/src/main/java/noppes/npcs/client/renderer/RenderNPCPony.java b/src/main/java/noppes/npcs/client/renderer/RenderNPCPony.java index c7761e380..a82ba93a8 100644 --- a/src/main/java/noppes/npcs/client/renderer/RenderNPCPony.java +++ b/src/main/java/noppes/npcs/client/renderer/RenderNPCPony.java @@ -11,8 +11,12 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; import net.minecraft.init.Items; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemArmor.ArmorMaterial; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemBow; +import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import noppes.npcs.client.model.ModelPony; import noppes.npcs.client.model.ModelPonyArmor; @@ -24,6 +28,7 @@ import javax.imageio.ImageIO; import java.awt.*; import java.awt.image.BufferedImage; import java.io.IOException; +import java.io.InputStream; public class RenderNPCPony extends RenderNPCInterface { @@ -93,29 +98,30 @@ public class RenderNPCPony extends RenderNPCInterface { if (check) { try { IResource resource = Minecraft.getMinecraft().getResourceManager().getResource(loc); - BufferedImage bufferedimage = ImageIO.read(resource.getInputStream()); + try (InputStream stream = resource.getInputStream()) { + BufferedImage bufferedimage = ImageIO.read(stream); - pony.isPegasus = false; - pony.isUnicorn = false; - Color color = new Color(bufferedimage.getRGB(0, 0), true); - Color color1 = new Color(249, 177, 49, 255); - Color color2 = new Color(136, 202, 240, 255); - Color color3 = new Color(209, 159, 228, 255); - Color color4 = new Color(254, 249, 252, 255); - if (color.equals(color1)) { + pony.isPegasus = false; + pony.isUnicorn = false; + Color color = new Color(bufferedimage.getRGB(0, 0), true); + Color color1 = new Color(249, 177, 49, 255); + Color color2 = new Color(136, 202, 240, 255); + Color color3 = new Color(209, 159, 228, 255); + Color color4 = new Color(254, 249, 252, 255); + if (color.equals(color1)) { + } + if (color.equals(color2)) { + pony.isPegasus = true; + } + if (color.equals(color3)) { + pony.isUnicorn = true; + } + if (color.equals(color4)) { + pony.isPegasus = true; + pony.isUnicorn = true; + } + pony.checked = loc; } - if (color.equals(color2)) { - pony.isPegasus = true; - } - if (color.equals(color3)) { - pony.isUnicorn = true; - } - if (color.equals(color4)) { - pony.isPegasus = true; - pony.isUnicorn = true; - } - pony.checked = loc; - } catch (IOException e) { } diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockCouchWoolRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockCouchWoolRenderer.java index 9933d47d7..5bff9a1cb 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockCouchWoolRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockCouchWoolRenderer.java @@ -12,8 +12,19 @@ import net.minecraft.util.ResourceLocation; import noppes.npcs.CustomItems; import noppes.npcs.blocks.BlockCouchWool; import noppes.npcs.blocks.tiles.TileCouchWool; -import noppes.npcs.client.model.blocks.couch.*; -import noppes.npcs.client.model.blocks.legacy.couch.*; +import noppes.npcs.client.model.blocks.couch.ModelCouchCorner; +import noppes.npcs.client.model.blocks.couch.ModelCouchLeft; +import noppes.npcs.client.model.blocks.couch.ModelCouchMiddle; +import noppes.npcs.client.model.blocks.couch.ModelCouchRight; +import noppes.npcs.client.model.blocks.couch.ModelCouchSingle; +import noppes.npcs.client.model.blocks.legacy.couch.ModelLegacyCouchCorner; +import noppes.npcs.client.model.blocks.legacy.couch.ModelLegacyCouchCornerWool; +import noppes.npcs.client.model.blocks.legacy.couch.ModelLegacyCouchLeft; +import noppes.npcs.client.model.blocks.legacy.couch.ModelLegacyCouchLeftWool; +import noppes.npcs.client.model.blocks.legacy.couch.ModelLegacyCouchMiddle; +import noppes.npcs.client.model.blocks.legacy.couch.ModelLegacyCouchMiddleWool; +import noppes.npcs.client.model.blocks.legacy.couch.ModelLegacyCouchRight; +import noppes.npcs.client.model.blocks.legacy.couch.ModelLegacyCouchRightWool; import noppes.npcs.config.ConfigClient; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; @@ -119,13 +130,12 @@ public class BlockCouchWoolRenderer extends BlockRendererInterface { float[] color = ColorUtil.hexToRGB(tile.color); GL11.glColor3f(color[0], color[1], color[2]); - if (tile.hasCornerLeft){ + if (tile.hasCornerLeft) { GL11.glPushMatrix(); GL11.glRotatef(270, 0, 1, 0); modelCouchCorner.Cussion.render(0.0625F); GL11.glPopMatrix(); - } - else if (tile.hasCornerRight) + } else if (tile.hasCornerRight) modelCouchCorner.Cussion.render(0.0625F); else if (tile.hasLeft && tile.hasRight) modelCouch.Cussion.render(0.0625F); diff --git a/src/main/java/noppes/npcs/config/ConfigDebug.java b/src/main/java/noppes/npcs/config/ConfigDebug.java index addc10a6d..1934f7969 100644 --- a/src/main/java/noppes/npcs/config/ConfigDebug.java +++ b/src/main/java/noppes/npcs/config/ConfigDebug.java @@ -33,6 +33,8 @@ public class ConfigDebug { public static Property ScriptLogIgnoreTypeProperty; public static String ScriptLogIgnoreType = "TICK"; + public static boolean LogActionManager = false; + public static void init(File configFile) { config = new Configuration(configFile); @@ -59,6 +61,9 @@ public class ConfigDebug { "INIT,TICK,INTERACT,DIALOG,DAMAGED,KILLED,ATTACK,TARGET,COLLIDE,KILLS,DIALOG_CLOSE,TIMER"); ScriptLogIgnoreType = ScriptLogIgnoreTypeProperty.getString(); + LogActionManager = config.get(LOGGING, "Log Action Manager", LogActionManager, "Log the Performance of the Action Manager").getBoolean(LogActionManager); + + // Convert to Legacy if (CustomNpcs.legacyExist) { PlayerLogging = LegacyConfig.PlayerLogging; diff --git a/src/main/java/noppes/npcs/config/ConfigScript.java b/src/main/java/noppes/npcs/config/ConfigScript.java index 8ec60d2b1..15c2b9ca0 100644 --- a/src/main/java/noppes/npcs/config/ConfigScript.java +++ b/src/main/java/noppes/npcs/config/ConfigScript.java @@ -55,11 +55,17 @@ public class ConfigScript { public static Property EnableBannedClassesProperty; public static boolean EnableBannedClasses = false; + public static Property RunLoadedScriptsFirstProperty; + public static boolean RunLoadedScriptsFirst = true; + public static Property BannedClassesProperty; public final static HashSet BannedClasses = new HashSet<>(); public static int ActionManagerTickDefault = 5; + public static Property ClearActionsOnDeathProperty; + public static boolean ClearActionsOnDeath = true; + public static boolean IndividualPlayerScripts = false; public static void init(File configFile) { @@ -108,6 +114,12 @@ public class ConfigScript { EnableBannedClassesProperty = config.get(CUSTOMIZATION, "Enable Banned Classes", false, "Enables the Banned Classes Functionality"); EnableBannedClasses = EnableBannedClassesProperty.getBoolean(false); + RunLoadedScriptsFirstProperty = config.get(CUSTOMIZATION, "Run Loaded Scripts First", true, + "If scripts have been loaded from the scripting GUI, the script engine will evaluates them by\n" + + "merging your loaded scripts with your main script, then running the combined script.\n" + + "This config determines the order in while the loaded scripts are merged with your main scripts: before (true), or after (false)."); + RunLoadedScriptsFirst = RunLoadedScriptsFirstProperty.getBoolean(true); + BannedClassesProperty = config.get(CUSTOMIZATION, "Banned Classes", "java.net.URL,java.net.URI", "Comma separated list of classes that cannot be used in scripts through Java.for().\n" + "Classes must be fully written out with library names preceding them.\n" + @@ -116,6 +128,8 @@ public class ConfigScript { IndividualPlayerScripts = config.get(CUSTOMIZATION, "Individual Player Scripts", false, "Acts similar to CNPC 1.12 where Player Scripts like Init are run PER Player").getBoolean(false); ActionManagerTickDefault = config.get(CUSTOMIZATION, "Action Manager Tick Default", ActionManagerTickDefault, "How frequent to update the action manager ticking tasks").getInt(ActionManagerTickDefault); + ClearActionsOnDeathProperty = config.get(CUSTOMIZATION, "Clear Actions On Death", true, "If true, clears the Action Manager for players and NPCs when they die"); + ClearActionsOnDeath = ClearActionsOnDeathProperty.getBoolean(true); // Convert to Legacy if (CustomNpcs.legacyExist) { @@ -147,7 +161,7 @@ public class ConfigScript { if (ExpandedScriptLimit < 0) ExpandedScriptLimit = 0; - if(ActionManagerTickDefault < 0){ + if (ActionManagerTickDefault < 0) { ActionManagerTickDefault = 1; } diff --git a/src/main/java/noppes/npcs/config/GlyphCache.java b/src/main/java/noppes/npcs/config/GlyphCache.java index fc4922be9..98474c493 100644 --- a/src/main/java/noppes/npcs/config/GlyphCache.java +++ b/src/main/java/noppes/npcs/config/GlyphCache.java @@ -14,8 +14,11 @@ import java.io.InputStream; import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.nio.IntBuffer; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; +import java.util.LinkedHashMap; import java.util.List; -import java.util.*; /** * @author https://github.com/secretdataz/BetterFonts @@ -253,19 +256,19 @@ public class GlyphCache { } void setCustomFont(ResourceLocation location, int size, boolean antiAlias) throws Exception { - InputStream stream = Minecraft.getMinecraft().getResourceManager().getResource(location).getInputStream(); + try (InputStream stream = Minecraft.getMinecraft().getResourceManager().getResource(location).getInputStream()) { + GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment(); + Font font = Font.createFont(Font.TRUETYPE_FONT, stream); + ge.registerFont(font); + font = font.deriveFont(Font.PLAIN, 72); - GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment(); - Font font = Font.createFont(Font.TRUETYPE_FONT, stream); - ge.registerFont(font); - font = font.deriveFont(Font.PLAIN, 72); + usedFonts.clear(); + usedFonts.add(font); - usedFonts.clear(); - usedFonts.add(font); - - fontSize = size; - antiAliasEnabled = antiAlias; - setRenderingHints(); + fontSize = size; + antiAliasEnabled = antiAlias; + setRenderingHints(); + } } int fontHeight(String s) { diff --git a/src/main/java/noppes/npcs/config/legacy/LegacyLoader.java b/src/main/java/noppes/npcs/config/legacy/LegacyLoader.java index 608824c08..8c1995b8a 100644 --- a/src/main/java/noppes/npcs/config/legacy/LegacyLoader.java +++ b/src/main/java/noppes/npcs/config/legacy/LegacyLoader.java @@ -2,7 +2,12 @@ package noppes.npcs.config.legacy; import noppes.npcs.LogWriter; -import java.io.*; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; import java.lang.reflect.Field; import java.util.HashMap; import java.util.LinkedList; diff --git a/src/main/java/noppes/npcs/containers/ContainerAnvilRepair.java b/src/main/java/noppes/npcs/containers/ContainerAnvilRepair.java index ff873ce58..dc7026a06 100644 --- a/src/main/java/noppes/npcs/containers/ContainerAnvilRepair.java +++ b/src/main/java/noppes/npcs/containers/ContainerAnvilRepair.java @@ -3,12 +3,19 @@ package noppes.npcs.containers; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.*; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.InventoryCraftResult; +import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import noppes.npcs.EventHooks; import noppes.npcs.api.handler.data.IAnvilRecipe; import noppes.npcs.controllers.RecipeController; import noppes.npcs.controllers.data.RecipeAnvil; +import noppes.npcs.scripted.event.RecipeScriptEvent; public class ContainerAnvilRepair extends Container { // A 2-slot crafting matrix: slot 0 = damaged item, slot 1 = repair material. @@ -25,6 +32,10 @@ public class ContainerAnvilRepair extends Container { public int repairCost = 0; public int repairMaterialConsumed = 0; + private RecipeAnvil currentRecipe; + private SlotAnvilOutput resultSlot; + private boolean resultCanPickup = true; + public ContainerAnvilRepair(InventoryPlayer playerInv, World world, int x, int y, int z) { this.worldObj = world; this.posX = x; @@ -33,7 +44,8 @@ public class ContainerAnvilRepair extends Container { this.player = playerInv.player; // Output slot (index 0) using our custom SlotAnvilOutput. - this.addSlotToContainer(new SlotAnvilOutput(this, anvilResult, 0, 133, 47)); + this.resultSlot = new SlotAnvilOutput(this, anvilResult, 0, 133, 47); + this.addSlotToContainer(this.resultSlot); // Input slot 0: damaged item. We restrict its stack size to 1. this.addSlotToContainer(new Slot(anvilMatrix, 0, 26, 47) { @@ -109,7 +121,11 @@ public class ContainerAnvilRepair extends Container { } } + currentRecipe = matchingRecipe; + ItemStack output = null; + boolean canPickup = true; + RecipeScriptEvent.Pre pre = null; if (matchingRecipe != null) { if (!matchingRecipe.availability.isAvailable(player)) { return; @@ -147,16 +163,34 @@ public class ContainerAnvilRepair extends Container { int xpCost = baseXpCost * materialsUsed; calcItem.setItemDamage(currentDamage); + + ItemStack[] items = new ItemStack[]{input0, input1}; + pre = EventHooks.onRecipeScriptPre(player, matchingRecipe.getScriptHandler(), matchingRecipe, items); + int scriptXp = pre.getXpCost(); + int scriptMat = pre.getMaterialUsage(); + xpCost += scriptXp; + materialsUsed += scriptMat; + pre.setXpCost(xpCost); + pre.setMaterialUsage(materialsUsed); + canPickup = !pre.isCanceled(); + if (player.experienceTotal >= xpCost) { output = calcItem; } + repairMaterialConsumed = materialsUsed; repairCost = xpCost; + output = EventHooks.onRecipeScriptPost(player, matchingRecipe.getScriptHandler(), matchingRecipe, items, output); } else { repairCost = 0; } + anvilResult.setInventorySlotContents(0, output); + this.resultCanPickup = canPickup; + if (this.resultSlot != null) { + this.resultSlot.setCanPickup(canPickup); + } } } @@ -166,6 +200,7 @@ public class ContainerAnvilRepair extends Container { public void addCraftingToCrafters(ICrafting listener) { super.addCraftingToCrafters(listener); listener.sendProgressBarUpdate(this, 0, this.repairCost); + listener.sendProgressBarUpdate(this, 1, this.resultCanPickup ? 1 : 0); } @Override @@ -173,6 +208,7 @@ public class ContainerAnvilRepair extends Container { super.detectAndSendChanges(); for (Object crafterObj : this.crafters) { ((ICrafting) crafterObj).sendProgressBarUpdate(this, 0, this.repairCost); + ((ICrafting) crafterObj).sendProgressBarUpdate(this, 1, this.resultCanPickup ? 1 : 0); } } @@ -180,6 +216,8 @@ public class ContainerAnvilRepair extends Container { public void updateProgressBar(int id, int data) { if (id == 0) { this.repairCost = data; + } else if (id == 1 && this.resultSlot != null) { + this.resultSlot.setCanPickup(data != 0); } } // --- End Sync Methods --- @@ -204,6 +242,10 @@ public class ContainerAnvilRepair extends Container { (double) this.posZ + 0.5D) <= 64.0D; } + public boolean canPickupResult() { + return this.resultCanPickup; + } + @Override public ItemStack transferStackInSlot(EntityPlayer player, int index) { ItemStack copy = null; @@ -212,6 +254,10 @@ public class ContainerAnvilRepair extends Container { ItemStack stack = slot.getStack(); copy = stack.copy(); if (index == 0) { // output slot + SlotAnvilOutput resultSlot = (SlotAnvilOutput) slot; + if (!resultSlot.canPickup()) { + return null; + } if (player.experienceTotal < this.repairCost) { return null; } @@ -254,12 +300,21 @@ public class ContainerAnvilRepair extends Container { // subtracts one from the damaged item stack. public class SlotAnvilOutput extends Slot { private final ContainerAnvilRepair container; + private boolean canPickup = true; public SlotAnvilOutput(ContainerAnvilRepair container, IInventory inventory, int index, int x, int y) { super(inventory, index, x, y); this.container = container; } + public void setCanPickup(boolean value) { + this.canPickup = value; + } + + public boolean canPickup() { + return this.canPickup; + } + @Override public boolean isItemValid(ItemStack stack) { return false; @@ -267,11 +322,14 @@ public class ContainerAnvilRepair extends Container { @Override public boolean canTakeStack(EntityPlayer player) { - return player.experienceTotal >= container.repairCost; + return canPickup && player.experienceTotal >= container.repairCost; } @Override public void onPickupFromSlot(EntityPlayer player, ItemStack stack) { + if (!canPickup) { + return; + } if (player.experienceTotal < container.repairCost) { container.updateRepairResult(); return; @@ -301,6 +359,7 @@ public class ContainerAnvilRepair extends Container { } container.repairCost = 0; container.updateRepairResult(); + canPickup = true; super.onPickupFromSlot(player, stack); } } diff --git a/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java b/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java index ef5d3a9b3..898bbfdc4 100644 --- a/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java +++ b/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java @@ -3,13 +3,21 @@ package noppes.npcs.containers; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.*; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.InventoryCraftResult; +import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.inventory.Slot; +import net.minecraft.inventory.SlotCrafting; import net.minecraft.item.ItemStack; import net.minecraft.network.play.server.S2FPacketSetSlot; import net.minecraft.world.World; import noppes.npcs.CustomItems; +import noppes.npcs.EventHooks; import noppes.npcs.controllers.RecipeController; import noppes.npcs.controllers.data.RecipeCarpentry; +import noppes.npcs.scripted.event.RecipeScriptEvent; public class ContainerCarpentryBench extends Container { public InventoryCrafting craftMatrix = new InventoryCrafting(this, 4, 4); @@ -20,13 +28,18 @@ public class ContainerCarpentryBench extends Container { private int posY; private int posZ; + private RecipeCarpentry currentRecipe; + private SlotCarpentryResult resultSlot; + private boolean resultCanPickup = true; + public ContainerCarpentryBench(InventoryPlayer par1InventoryPlayer, World par2World, int par3, int par4, int par5) { this.worldObj = par2World; this.posX = par3; this.posY = par4; this.posZ = par5; this.player = par1InventoryPlayer.player; - this.addSlotToContainer(new SlotCrafting(par1InventoryPlayer.player, this.craftMatrix, this.craftResult, 0, 133, 41)); + this.resultSlot = new SlotCarpentryResult(this, par1InventoryPlayer.player, this.craftMatrix, this.craftResult, 0, 133, 41); + this.addSlotToContainer(this.resultSlot); int var6; int var7; @@ -60,13 +73,28 @@ public class ContainerCarpentryBench extends Container { public void onCraftMatrixChanged(IInventory par1IInventory) { if (!this.worldObj.isRemote) { RecipeCarpentry recipe = RecipeController.Instance.findMatchingRecipe(this.craftMatrix); + this.currentRecipe = recipe; ItemStack item = null; + boolean canPickup = true; if (recipe != null && recipe.availability.isAvailable(player)) { item = recipe.getCraftingResult(this.craftMatrix); + + ItemStack[] items = new ItemStack[this.craftMatrix.getSizeInventory()]; + for (int i = 0; i < items.length; i++) { + items[i] = this.craftMatrix.getStackInSlot(i); + } + + RecipeScriptEvent.Pre pre = EventHooks.onRecipeScriptPre(player, recipe.getScriptHandler(), recipe, items); + canPickup = !pre.isCanceled(); + item = EventHooks.onRecipeScriptPost(player, recipe.getScriptHandler(), recipe, items, item); } this.craftResult.setInventorySlotContents(0, item); + this.resultCanPickup = canPickup; + if (this.resultSlot != null) { + this.resultSlot.setCanPickup(canPickup); + } EntityPlayerMP plmp = (EntityPlayerMP) player; plmp.playerNetServerHandler.sendPacket(new S2FPacketSetSlot(this.windowId, 0, item)); } @@ -95,6 +123,10 @@ public class ContainerCarpentryBench extends Container { return this.worldObj.getBlock(this.posX, this.posY, this.posZ) != CustomItems.carpentyBench ? false : par1EntityPlayer.getDistanceSq((double) this.posX + 0.5D, (double) this.posY + 0.5D, (double) this.posZ + 0.5D) <= 64.0D; } + public boolean canPickupResult() { + return this.resultCanPickup; + } + /** * Called to transfer a stack from one inventory to the other eg. when shift clicking. */ @@ -108,6 +140,10 @@ public class ContainerCarpentryBench extends Container { var2 = var4.copy(); if (par1 == 0) { + SlotCarpentryResult resultSlot = (SlotCarpentryResult) var3; + if (!resultSlot.canPickup()) { + return null; + } if (!this.mergeItemStack(var4, 17, 53, true)) { return null; } @@ -139,8 +175,8 @@ public class ContainerCarpentryBench extends Container { } // Update client-side inventory - if (!this.worldObj.isRemote && player instanceof EntityPlayerMP) { - ((EntityPlayerMP) player).sendContainerToPlayer(this); + if (!this.worldObj.isRemote && par1EntityPlayer instanceof EntityPlayerMP) { + ((EntityPlayerMP) par1EntityPlayer).sendContainerToPlayer(this); } return var2; @@ -150,4 +186,59 @@ public class ContainerCarpentryBench extends Container { public boolean func_94530_a(ItemStack stack, Slot slotIn) { return slotIn.inventory != this.craftResult && super.func_94530_a(stack, slotIn); } + + // --- Sync Methods --- + @Override + public void addCraftingToCrafters(ICrafting listener) { + super.addCraftingToCrafters(listener); + listener.sendProgressBarUpdate(this, 0, this.resultCanPickup ? 1 : 0); + } + + @Override + public void detectAndSendChanges() { + super.detectAndSendChanges(); + for (Object crafterObj : this.crafters) { + ((ICrafting) crafterObj).sendProgressBarUpdate(this, 0, this.resultCanPickup ? 1 : 0); + } + } + + @Override + public void updateProgressBar(int id, int data) { + if (id == 0 && this.resultSlot != null) { + this.resultSlot.setCanPickup(data != 0); + resultCanPickup = data != 0; + } + } + // --- End Sync Methods --- + + // Custom result slot to handle recipe scripts + private class SlotCarpentryResult extends SlotCrafting { + private final ContainerCarpentryBench container; + private boolean canPickup = true; + + public SlotCarpentryResult(ContainerCarpentryBench container, EntityPlayer player, InventoryCrafting matrix, IInventory result, int index, int x, int y) { + super(player, matrix, result, index, x, y); + this.container = container; + } + + public void setCanPickup(boolean value) { + this.canPickup = value; + } + + public boolean canPickup() { + return this.canPickup; + } + + @Override + public boolean canTakeStack(EntityPlayer player) { + return canPickup && super.canTakeStack(player); + } + + @Override + public void onPickupFromSlot(EntityPlayer player, ItemStack stack) { + if (!canPickup) + return; + super.onPickupFromSlot(player, stack); + } + } } diff --git a/src/main/java/noppes/npcs/containers/ContainerNPCBankInterface.java b/src/main/java/noppes/npcs/containers/ContainerNPCBankInterface.java index 48017e13f..17cc83279 100644 --- a/src/main/java/noppes/npcs/containers/ContainerNPCBankInterface.java +++ b/src/main/java/noppes/npcs/containers/ContainerNPCBankInterface.java @@ -85,8 +85,41 @@ public class ContainerNPCBankInterface extends ContainerNpcInterface { } @Override - public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer, int i) { - return null; + public ItemStack transferStackInSlot(EntityPlayer player, int index) { + ItemStack returnedStack = null; + Slot slot = (Slot) this.inventorySlots.get(index); + if (slot != null && slot.getHasStack()) { + ItemStack stackInSlot = slot.getStack(); + returnedStack = stackInSlot.copy(); + + int bankStart = (currency != null) ? 1 : 0; + int bankEnd = bankStart + getRowNumber() * 9; + + if (index >= bankStart && index < bankEnd) { + // Moving items from bank inventory to the player + if (!this.mergeItemStack(stackInSlot, bankEnd, this.inventorySlots.size(), true)) { + return null; + } + } else if (index >= bankEnd) { + // Moving items from the player inventory to the bank + if (!this.mergeItemStack(stackInSlot, bankStart, bankEnd, false)) { + return null; + } + } else { + // Currency slot + if (!this.mergeItemStack(stackInSlot, bankEnd, this.inventorySlots.size(), true)) { + return null; + } + } + + if (stackInSlot.stackSize == 0) { + slot.putStack(null); + } else { + slot.onSlotChanged(); + } + } + + return returnedStack; } @Override diff --git a/src/main/java/noppes/npcs/controllers/AnimationController.java b/src/main/java/noppes/npcs/controllers/AnimationController.java index a25947cfe..65adfcd3d 100644 --- a/src/main/java/noppes/npcs/controllers/AnimationController.java +++ b/src/main/java/noppes/npcs/controllers/AnimationController.java @@ -10,7 +10,12 @@ import noppes.npcs.api.handler.data.IAnimation; import noppes.npcs.controllers.data.Animation; import noppes.npcs.util.NBTJsonUtil; -import java.io.*; +import java.io.BufferedInputStream; +import java.io.DataInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/noppes/npcs/controllers/BankController.java b/src/main/java/noppes/npcs/controllers/BankController.java index ddc258859..8c1aa67ce 100644 --- a/src/main/java/noppes/npcs/controllers/BankController.java +++ b/src/main/java/noppes/npcs/controllers/BankController.java @@ -79,7 +79,9 @@ public class BankController { } private void loadBanks(File file) throws IOException { - loadBanks(CompressedStreamTools.readCompressed(new FileInputStream(file))); + try (FileInputStream fis = new FileInputStream(file)) { + loadBanks(CompressedStreamTools.readCompressed(fis)); + } } public void loadBanks(NBTTagCompound nbttagcompound1) throws IOException { diff --git a/src/main/java/noppes/npcs/controllers/CustomEffectController.java b/src/main/java/noppes/npcs/controllers/CustomEffectController.java index 167af222a..d1036dc70 100644 --- a/src/main/java/noppes/npcs/controllers/CustomEffectController.java +++ b/src/main/java/noppes/npcs/controllers/CustomEffectController.java @@ -18,7 +18,12 @@ import noppes.npcs.controllers.data.EffectScript; import noppes.npcs.controllers.data.PlayerEffect; import noppes.npcs.util.NBTJsonUtil; -import java.io.*; +import java.io.BufferedInputStream; +import java.io.DataInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; import java.util.HashMap; import java.util.Iterator; import java.util.Map; diff --git a/src/main/java/noppes/npcs/controllers/DialogController.java b/src/main/java/noppes/npcs/controllers/DialogController.java index 3faf29b62..3490735f3 100644 --- a/src/main/java/noppes/npcs/controllers/DialogController.java +++ b/src/main/java/noppes/npcs/controllers/DialogController.java @@ -19,7 +19,11 @@ import noppes.npcs.util.NBTJsonUtil; import java.io.File; import java.io.FileInputStream; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; public class DialogController implements IDialogHandler { public HashMap categoriesSync = new HashMap(); @@ -120,7 +124,10 @@ public class DialogController implements IDialogHandler { if (!dir.exists()) { dir.mkdir(); } - NBTTagCompound nbttagcompound1 = CompressedStreamTools.readCompressed(new FileInputStream(file)); + NBTTagCompound nbttagcompound1; + try (FileInputStream fis = new FileInputStream(file)) { + nbttagcompound1 = CompressedStreamTools.readCompressed(fis); + } NBTTagList list = nbttagcompound1.getTagList("Data", 10); if (list == null) return; diff --git a/src/main/java/noppes/npcs/controllers/FactionController.java b/src/main/java/noppes/npcs/controllers/FactionController.java index 995fddd13..9ddf860ea 100644 --- a/src/main/java/noppes/npcs/controllers/FactionController.java +++ b/src/main/java/noppes/npcs/controllers/FactionController.java @@ -11,7 +11,12 @@ import noppes.npcs.api.handler.IFactionHandler; import noppes.npcs.api.handler.data.IFaction; import noppes.npcs.controllers.data.Faction; -import java.io.*; +import java.io.BufferedInputStream; +import java.io.DataInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/noppes/npcs/controllers/GlobalDataController.java b/src/main/java/noppes/npcs/controllers/GlobalDataController.java index 49a5c2e9b..b518bfaa0 100644 --- a/src/main/java/noppes/npcs/controllers/GlobalDataController.java +++ b/src/main/java/noppes/npcs/controllers/GlobalDataController.java @@ -40,7 +40,10 @@ public class GlobalDataController { } private void loadData(File file) throws Exception { - NBTTagCompound nbttagcompound1 = CompressedStreamTools.readCompressed(new FileInputStream(file)); + NBTTagCompound nbttagcompound1; + try (FileInputStream fis = new FileInputStream(file)) { + nbttagcompound1 = CompressedStreamTools.readCompressed(fis); + } itemGiverId = nbttagcompound1.getInteger("itemGiverId"); } diff --git a/src/main/java/noppes/npcs/controllers/LinkedItemController.java b/src/main/java/noppes/npcs/controllers/LinkedItemController.java index d97948b49..c2bc19044 100644 --- a/src/main/java/noppes/npcs/controllers/LinkedItemController.java +++ b/src/main/java/noppes/npcs/controllers/LinkedItemController.java @@ -12,7 +12,12 @@ import noppes.npcs.controllers.data.LinkedItem; import noppes.npcs.controllers.data.LinkedItemScript; import noppes.npcs.util.NBTJsonUtil; -import java.io.*; +import java.io.BufferedInputStream; +import java.io.DataInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; import java.util.HashMap; import java.util.zip.GZIPInputStream; diff --git a/src/main/java/noppes/npcs/controllers/MagicController.java b/src/main/java/noppes/npcs/controllers/MagicController.java index b18b9de70..40febf172 100644 --- a/src/main/java/noppes/npcs/controllers/MagicController.java +++ b/src/main/java/noppes/npcs/controllers/MagicController.java @@ -15,7 +15,12 @@ import noppes.npcs.controllers.data.Magic; import noppes.npcs.controllers.data.MagicAssociation; import noppes.npcs.controllers.data.MagicCycle; -import java.io.*; +import java.io.BufferedInputStream; +import java.io.DataInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; import java.util.HashMap; import java.util.zip.GZIPInputStream; diff --git a/src/main/java/noppes/npcs/controllers/PlayerDataController.java b/src/main/java/noppes/npcs/controllers/PlayerDataController.java index e5649a379..c8964b31d 100644 --- a/src/main/java/noppes/npcs/controllers/PlayerDataController.java +++ b/src/main/java/noppes/npcs/controllers/PlayerDataController.java @@ -12,11 +12,20 @@ import net.minecraft.util.ChatComponentText; import noppes.npcs.CustomNpcs; import noppes.npcs.LogWriter; import noppes.npcs.config.ConfigMain; -import noppes.npcs.controllers.data.*; +import noppes.npcs.controllers.data.Bank; +import noppes.npcs.controllers.data.PlayerBankData; +import noppes.npcs.controllers.data.PlayerData; +import noppes.npcs.controllers.data.PlayerDataScript; +import noppes.npcs.controllers.data.PlayerMail; import noppes.npcs.util.CacheHashMap; import noppes.npcs.util.NBTJsonUtil; -import java.io.*; +import java.io.BufferedInputStream; +import java.io.DataInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -184,7 +193,10 @@ public class PlayerDataController { try { File file = new File(saveDir, filename); if (file.exists()) { - NBTTagCompound comp = CompressedStreamTools.readCompressed(new FileInputStream(file)); + NBTTagCompound comp; + try (FileInputStream fis = new FileInputStream(file)) { + comp = CompressedStreamTools.readCompressed(fis); + } file.delete(); file = new File(saveDir, filename + "_old"); if (file.exists()) @@ -197,7 +209,9 @@ public class PlayerDataController { try { File file = new File(saveDir, filename + "_old"); if (file.exists()) { - return CompressedStreamTools.readCompressed(new FileInputStream(file)); + try (FileInputStream fis = new FileInputStream(file)) { + return CompressedStreamTools.readCompressed(fis); + } } } catch (Exception e) { diff --git a/src/main/java/noppes/npcs/controllers/QuestController.java b/src/main/java/noppes/npcs/controllers/QuestController.java index 5987b3a44..72688b7e5 100644 --- a/src/main/java/noppes/npcs/controllers/QuestController.java +++ b/src/main/java/noppes/npcs/controllers/QuestController.java @@ -18,7 +18,11 @@ import noppes.npcs.util.NBTJsonUtil; import java.io.File; import java.io.FileInputStream; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; public class QuestController implements IQuestHandler { public HashMap categoriesSync = new HashMap(); @@ -112,7 +116,10 @@ public class QuestController implements IQuestHandler { if (!dir.exists()) { dir.mkdir(); } - NBTTagCompound nbttagcompound1 = CompressedStreamTools.readCompressed(new FileInputStream(file)); + NBTTagCompound nbttagcompound1; + try (FileInputStream fis = new FileInputStream(file)) { + nbttagcompound1 = CompressedStreamTools.readCompressed(fis); + } lastUsedCatID = nbttagcompound1.getInteger("lastID"); lastUsedQuestID = nbttagcompound1.getInteger("lastQuestID"); NBTTagList list = nbttagcompound1.getTagList("Data", 10); diff --git a/src/main/java/noppes/npcs/controllers/RecipeController.java b/src/main/java/noppes/npcs/controllers/RecipeController.java index 77d877b40..7fccdec93 100644 --- a/src/main/java/noppes/npcs/controllers/RecipeController.java +++ b/src/main/java/noppes/npcs/controllers/RecipeController.java @@ -13,13 +13,18 @@ import noppes.npcs.api.handler.data.IAnvilRecipe; import noppes.npcs.api.handler.data.IRecipe; import noppes.npcs.controllers.data.RecipeAnvil; import noppes.npcs.controllers.data.RecipeCarpentry; +import noppes.npcs.controllers.data.RecipeScript; import noppes.npcs.controllers.data.RecipesDefault; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; public class RecipeController implements IRecipeHandler { private static Collection prevRecipes; @@ -28,6 +33,9 @@ public class RecipeController implements IRecipeHandler { public HashMap carpentryRecipes = new HashMap(); public HashMap anvilRecipes = new HashMap(); + public HashMap carpentryScripts = new HashMap<>(); + public HashMap anvilScripts = new HashMap<>(); + public static RecipeController Instance; public static final int version = 1; @@ -93,7 +101,10 @@ public class RecipeController implements IRecipeHandler { } private void loadCategories(File file) throws Exception { - NBTTagCompound nbttagcompound1 = CompressedStreamTools.readCompressed(new FileInputStream(file)); + NBTTagCompound nbttagcompound1; + try (FileInputStream fis = new FileInputStream(file)) { + nbttagcompound1 = CompressedStreamTools.readCompressed(fis); + } nextId = nbttagcompound1.getInteger("LastId"); nextAnvilId = nbttagcompound1.getInteger("LastAnvilId"); NBTTagList list = nbttagcompound1.getTagList("Data", 10); @@ -104,12 +115,14 @@ public class RecipeController implements IRecipeHandler { for (int i = 0; i < list.tagCount(); i++) { NBTTagCompound compound = list.getCompoundTagAt(i); if (compound.hasKey("IsAnvil")) { - RecipeAnvil anvil = RecipeAnvil.read(compound); + RecipeAnvil anvil = new RecipeAnvil(); + anvil.readNBT(compound); anvilRecipes.put(anvil.id, anvil); if (anvil.id > nextAnvilId) nextAnvilId = anvil.id; } else { - RecipeCarpentry recipe = RecipeCarpentry.read(compound); + RecipeCarpentry recipe = RecipeCarpentry.create(compound); + recipe.readNBT(compound); if (recipe.isGlobal) globalRecipes.put(recipe.id, recipe); else @@ -130,13 +143,13 @@ public class RecipeController implements IRecipeHandler { File saveDir = CustomNpcs.getWorldSaveDirectory(); NBTTagList list = new NBTTagList(); for (RecipeCarpentry recipe : globalRecipes.values()) { - list.appendTag(recipe.writeNBT()); + list.appendTag(recipe.writeNBT(true)); } for (RecipeCarpentry recipe : carpentryRecipes.values()) { - list.appendTag(recipe.writeNBT()); + list.appendTag(recipe.writeNBT(true)); } for (RecipeAnvil recipe : anvilRecipes.values()) { - list.appendTag(recipe.writeNBT()); + list.appendTag(recipe.writeNBT(true)); } NBTTagCompound nbttagcompound = new NBTTagCompound(); nbttagcompound.setTag("Data", list); @@ -186,7 +199,8 @@ public class RecipeController implements IRecipeHandler { } public RecipeCarpentry saveRecipe(NBTTagCompound compound) throws IOException { - RecipeCarpentry recipe = RecipeCarpentry.read(compound); + RecipeCarpentry recipe = RecipeCarpentry.create(compound); + recipe.readNBT(compound); RecipeCarpentry current = getRecipe(recipe.id); if (current != null && !current.name.equals(recipe.name)) { @@ -212,7 +226,8 @@ public class RecipeController implements IRecipeHandler { } public RecipeAnvil saveAnvilRecipe(NBTTagCompound compound) throws IOException { - RecipeAnvil recipe = RecipeAnvil.read(compound); + RecipeAnvil recipe = new RecipeAnvil(); + recipe.readNBT(compound); RecipeAnvil current = getAnvilRecipe(recipe.id); if (current != null && !current.name.equals(recipe.name)) { @@ -270,8 +285,10 @@ public class RecipeController implements IRecipeHandler { SyncController.syncAllWorkbenchRecipes(); RecipeCarpentry carpentry = carpentryRecipes.remove(recipe.id); - if (carpentry != null) + if (carpentry != null) { + carpentryScripts.remove(recipe.id); SyncController.syncAllCarpentryRecipes(); + } saveCategories(); reloadGlobalRecipes(globalRecipes); @@ -329,7 +346,7 @@ public class RecipeController implements IRecipeHandler { recipe = RecipeCarpentry.saveRecipe(recipe, result, objects); try { - this.saveRecipe(recipe.writeNBT()); + this.saveRecipe(recipe.writeNBT(true)); } catch (Exception var7) { var7.printStackTrace(); } @@ -352,7 +369,7 @@ public class RecipeController implements IRecipeHandler { recipe.name = name; try { - this.saveRecipe(recipe.writeNBT()); + this.saveRecipe(recipe.writeNBT(true)); } catch (IOException var12) { var12.printStackTrace(); } @@ -362,7 +379,7 @@ public class RecipeController implements IRecipeHandler { public void addAnvilRecipe(String name, boolean global, ItemStack itemToRepair, ItemStack repairMaterial, int xpCost, float repairPercentage) { RecipeAnvil recipe = new RecipeAnvil(name, itemToRepair, repairMaterial, xpCost, repairPercentage); try { - this.saveAnvilRecipe(recipe.writeNBT()); + this.saveAnvilRecipe(recipe.writeNBT(true)); } catch (Exception e) { e.printStackTrace(); } diff --git a/src/main/java/noppes/npcs/controllers/ScriptContainer.java b/src/main/java/noppes/npcs/controllers/ScriptContainer.java index 07ddbfde4..3ea46b6a7 100644 --- a/src/main/java/noppes/npcs/controllers/ScriptContainer.java +++ b/src/main/java/noppes/npcs/controllers/ScriptContainer.java @@ -1,6 +1,7 @@ package noppes.npcs.controllers; import cpw.mods.fml.common.eventhandler.Event; +import jdk.nashorn.api.scripting.ScriptObjectMirror; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.NBTTags; import noppes.npcs.config.ConfigScript; @@ -10,12 +11,18 @@ import noppes.npcs.scripted.NpcAPI; import javax.script.Compilable; import javax.script.CompiledScript; -import javax.script.Invocable; +import javax.script.ScriptContext; import javax.script.ScriptEngine; import java.io.PrintWriter; import java.io.StringWriter; import java.lang.reflect.Method; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.TreeMap; public class ScriptContainer { private static final String lock = "lock"; @@ -35,6 +42,7 @@ public class ScriptContainer { private static Method luaCoerce; private static Method luaCall; private CompiledScript compScript = null; + private final HashMap cachedFunctions = new HashMap<>(); public ScriptContainer(IScriptHandler handler) { this.handler = handler; @@ -92,24 +100,36 @@ public class ScriptContainer { private String getFullCode() { if (!this.evaluated) { - // build includes first + // build includes first depending on config setting StringBuilder sb = new StringBuilder(); - for (String loc : this.scripts) { - String code = ScriptController.Instance.scripts.get(loc); - if (code != null && !code.isEmpty()) { - sb.append(code).append("\n"); - } + if (ConfigScript.RunLoadedScriptsFirst) { + this.appendExternalScripts(sb); } - // then your per‐hook script + + // then your per‐hook main script if (this.script != null && !this.script.isEmpty()) { sb.append(this.script).append("\n"); } + + // build includes last if not built first + if (!ConfigScript.RunLoadedScriptsFirst) { + this.appendExternalScripts(sb); + } this.fullscript = sb.toString(); this.unknownFunctions = new HashSet<>(); } return this.fullscript; } + private void appendExternalScripts(StringBuilder sb) { + for (String loc : this.scripts) { + String code = ScriptController.Instance.scripts.get(loc); + if (code != null && !code.isEmpty()) { + sb.append(code).append("\n"); + } + } + } + public void run(ScriptEngine engine) { StringWriter sw = new StringWriter(); PrintWriter pw = new PrintWriter(sw); @@ -173,6 +193,7 @@ public class ScriptContainer { try { if (!evaluated) { + this.cachedFunctions.clear(); engine.eval(getFullCode()); evaluated = true; } @@ -188,7 +209,15 @@ public class ScriptContainer { unknownFunctions.add(type); } } else { - ((Invocable) engine).invokeFunction(type, event); + if (!this.cachedFunctions.containsKey(type)) { + ScriptObjectMirror global = (ScriptObjectMirror) engine.getBindings(ScriptContext.ENGINE_SCOPE); + ScriptObjectMirror func = (ScriptObjectMirror) global.get(type); + this.cachedFunctions.put(type, func); + } + ScriptObjectMirror func = this.cachedFunctions.get(type); + if (func != null) { + func.call(null, event); + } } } catch (NoSuchMethodException e) { unknownFunctions.add(type); diff --git a/src/main/java/noppes/npcs/controllers/ScriptController.java b/src/main/java/noppes/npcs/controllers/ScriptController.java index 86cd950b9..d4246440b 100644 --- a/src/main/java/noppes/npcs/controllers/ScriptController.java +++ b/src/main/java/noppes/npcs/controllers/ScriptController.java @@ -30,7 +30,12 @@ import java.io.BufferedReader; import java.io.File; import java.io.FileReader; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import static noppes.npcs.util.CustomNPCsThreader.customNPCThread; diff --git a/src/main/java/noppes/npcs/controllers/ServerCloneController.java b/src/main/java/noppes/npcs/controllers/ServerCloneController.java index 95c932943..ea61a0112 100644 --- a/src/main/java/noppes/npcs/controllers/ServerCloneController.java +++ b/src/main/java/noppes/npcs/controllers/ServerCloneController.java @@ -22,7 +22,14 @@ import noppes.npcs.util.NBTJsonUtil; import java.io.File; import java.io.FileInputStream; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.UUID; public class ServerCloneController implements ICloneHandler { public static ServerCloneController Instance; @@ -63,7 +70,10 @@ public class ServerCloneController implements ICloneHandler { private Map> loadOldClones(File file) throws Exception { Map> clones = new HashMap>(); - NBTTagCompound nbttagcompound1 = CompressedStreamTools.readCompressed(new FileInputStream(file)); + NBTTagCompound nbttagcompound1; + try (FileInputStream fis = new FileInputStream(file)) { + nbttagcompound1 = CompressedStreamTools.readCompressed(fis); + } NBTTagList list = nbttagcompound1.getTagList("Data", 10); if (list == null) { return clones; diff --git a/src/main/java/noppes/npcs/controllers/ServerTagMapController.java b/src/main/java/noppes/npcs/controllers/ServerTagMapController.java index 886fdfcfe..0221481e3 100644 --- a/src/main/java/noppes/npcs/controllers/ServerTagMapController.java +++ b/src/main/java/noppes/npcs/controllers/ServerTagMapController.java @@ -6,7 +6,12 @@ import noppes.npcs.CustomNpcs; import noppes.npcs.LogWriter; import noppes.npcs.controllers.data.TagMap; -import java.io.*; +import java.io.BufferedInputStream; +import java.io.DataInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; import java.util.zip.GZIPInputStream; public class ServerTagMapController { diff --git a/src/main/java/noppes/npcs/controllers/SpawnController.java b/src/main/java/noppes/npcs/controllers/SpawnController.java index 1608825f5..7a04d788d 100644 --- a/src/main/java/noppes/npcs/controllers/SpawnController.java +++ b/src/main/java/noppes/npcs/controllers/SpawnController.java @@ -10,8 +10,17 @@ import noppes.npcs.api.handler.INaturalSpawnsHandler; import noppes.npcs.api.handler.data.INaturalSpawn; import noppes.npcs.controllers.data.SpawnData; -import java.io.*; -import java.util.*; +import java.io.BufferedInputStream; +import java.io.DataInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Random; import java.util.zip.GZIPInputStream; public class SpawnController implements INaturalSpawnsHandler { diff --git a/src/main/java/noppes/npcs/controllers/TagController.java b/src/main/java/noppes/npcs/controllers/TagController.java index 14fd6b066..cbd2ed006 100644 --- a/src/main/java/noppes/npcs/controllers/TagController.java +++ b/src/main/java/noppes/npcs/controllers/TagController.java @@ -9,8 +9,18 @@ import noppes.npcs.api.handler.ITagHandler; import noppes.npcs.api.handler.data.ITag; import noppes.npcs.controllers.data.Tag; -import java.io.*; -import java.util.*; +import java.io.BufferedInputStream; +import java.io.DataInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.UUID; import java.util.zip.GZIPInputStream; public class TagController implements ITagHandler { diff --git a/src/main/java/noppes/npcs/controllers/TransportController.java b/src/main/java/noppes/npcs/controllers/TransportController.java index bebcb09cb..d7fa6fa57 100644 --- a/src/main/java/noppes/npcs/controllers/TransportController.java +++ b/src/main/java/noppes/npcs/controllers/TransportController.java @@ -66,7 +66,10 @@ public class TransportController implements ITransportHandler { public void loadCategories(File file) throws IOException { HashMap locations = new HashMap(); HashMap categories = new HashMap(); - NBTTagCompound nbttagcompound1 = CompressedStreamTools.readCompressed(new FileInputStream(file)); + NBTTagCompound nbttagcompound1; + try (FileInputStream fis = new FileInputStream(file)) { + nbttagcompound1 = CompressedStreamTools.readCompressed(fis); + } lastUsedID = nbttagcompound1.getInteger("lastID"); NBTTagList list = nbttagcompound1.getTagList("NPCTransportCategories", 10); if (list == null) { diff --git a/src/main/java/noppes/npcs/controllers/data/AnimationData.java b/src/main/java/noppes/npcs/controllers/data/AnimationData.java index 43fe42016..c537d94e1 100644 --- a/src/main/java/noppes/npcs/controllers/data/AnimationData.java +++ b/src/main/java/noppes/npcs/controllers/data/AnimationData.java @@ -45,7 +45,7 @@ public class AnimationData implements IAnimationData { } public static AnimationData getData(Entity entity) { - if (entity == null) { + if (entity == null || entity.worldObj == null) { return null; } if (entity.worldObj.isRemote) { @@ -88,7 +88,7 @@ public class AnimationData implements IAnimationData { public void updateClient(EntityPlayer... excludedPlayers) { EntityLivingBase sendingEntity = parent instanceof PlayerData ? ((PlayerData) parent).player : parent instanceof DataDisplay ? ((DataDisplay) parent).npc : null; float range = parent instanceof PlayerData ? 160 : 60; - if (sendingEntity != null) { + if (sendingEntity != null && sendingEntity.worldObj != null) { if (sendingEntity.dimension != sendingEntity.worldObj.provider.dimensionId) sendingEntity.dimension = sendingEntity.worldObj.provider.dimensionId; @@ -235,7 +235,7 @@ public class AnimationData implements IAnimationData { public void readFromNBT(NBTTagCompound compound) { Entity entity = this.getMCEntity(); - boolean isServer = entity != null && !entity.worldObj.isRemote; + boolean isServer = entity != null && entity.worldObj != null && !entity.worldObj.isRemote; if (compound.hasKey("IsClientAnimating") && isServer) { this.isClientAnimating = compound.getBoolean("IsClientAnimating"); if (this.isClientAnimating) { @@ -272,14 +272,14 @@ public class AnimationData implements IAnimationData { } - if (this.getMCEntity() != null && this.getMCEntity().worldObj.isRemote && newAnim != null) { + if (this.getMCEntity() != null && this.getMCEntity().worldObj != null && this.getMCEntity().worldObj.isRemote && newAnim != null) { this.animatingTime = 0; } Animation prevAnim = this.animation; this.animation = newAnim; - if (this.getMCEntity() != null && this.getMCEntity().worldObj.isRemote && + if (this.getMCEntity() != null && this.getMCEntity().worldObj != null && this.getMCEntity().worldObj.isRemote && this.isActive() && prevAnim != null && newAnim != null && !newAnim.frames.isEmpty()) { Frame frame = (Frame) prevAnim.currentFrame(); if (frame != null) { diff --git a/src/main/java/noppes/npcs/controllers/data/Availability.java b/src/main/java/noppes/npcs/controllers/data/Availability.java index ffc59bd3f..dcf5dacd6 100644 --- a/src/main/java/noppes/npcs/controllers/data/Availability.java +++ b/src/main/java/noppes/npcs/controllers/data/Availability.java @@ -10,7 +10,11 @@ import noppes.npcs.ICompatibilty; import noppes.npcs.VersionCompatibility; import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.handler.data.IAvailability; -import noppes.npcs.constants.*; +import noppes.npcs.constants.EnumAvailabilityDialog; +import noppes.npcs.constants.EnumAvailabilityFaction; +import noppes.npcs.constants.EnumAvailabilityFactionType; +import noppes.npcs.constants.EnumAvailabilityQuest; +import noppes.npcs.constants.EnumDayTime; import noppes.npcs.controllers.FactionController; import noppes.npcs.controllers.PlayerQuestController; import noppes.npcs.controllers.QuestController; diff --git a/src/main/java/noppes/npcs/controllers/data/CustomEffect.java b/src/main/java/noppes/npcs/controllers/data/CustomEffect.java index dbe49560d..3834bef08 100644 --- a/src/main/java/noppes/npcs/controllers/data/CustomEffect.java +++ b/src/main/java/noppes/npcs/controllers/data/CustomEffect.java @@ -254,7 +254,6 @@ public class CustomEffect implements ICustomEffect { compound.setString("icon", icon); compound.setBoolean("lossOnDeath", lossOnDeath); -// if (saveScripts && scriptContainer != null) { if (saveScripts) { NBTTagCompound scriptData = new NBTTagCompound(); EffectScript handler = getScriptHandler(); diff --git a/src/main/java/noppes/npcs/controllers/data/DataScript.java b/src/main/java/noppes/npcs/controllers/data/DataScript.java index 514da2dac..bf4327d38 100644 --- a/src/main/java/noppes/npcs/controllers/data/DataScript.java +++ b/src/main/java/noppes/npcs/controllers/data/DataScript.java @@ -27,7 +27,13 @@ import noppes.npcs.scripted.constants.RoleType; import noppes.npcs.scripted.entity.ScriptNpc; import javax.script.ScriptEngine; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; public class DataScript implements INpcScriptHandler { public List eventScripts = new ArrayList<>(); diff --git a/src/main/java/noppes/npcs/controllers/data/Dialog.java b/src/main/java/noppes/npcs/controllers/data/Dialog.java index 884822098..e68fe717e 100644 --- a/src/main/java/noppes/npcs/controllers/data/Dialog.java +++ b/src/main/java/noppes/npcs/controllers/data/Dialog.java @@ -5,7 +5,12 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import noppes.npcs.ICompatibilty; import noppes.npcs.VersionCompatibility; -import noppes.npcs.api.handler.data.*; +import noppes.npcs.api.handler.data.IAvailability; +import noppes.npcs.api.handler.data.IDialog; +import noppes.npcs.api.handler.data.IDialogCategory; +import noppes.npcs.api.handler.data.IDialogImage; +import noppes.npcs.api.handler.data.IDialogOption; +import noppes.npcs.api.handler.data.IQuest; import noppes.npcs.config.ConfigMain; import noppes.npcs.constants.EnumOptionType; import noppes.npcs.controllers.DialogController; diff --git a/src/main/java/noppes/npcs/controllers/data/EffectScript.java b/src/main/java/noppes/npcs/controllers/data/EffectScript.java index a6e66bec8..bd2b75dae 100644 --- a/src/main/java/noppes/npcs/controllers/data/EffectScript.java +++ b/src/main/java/noppes/npcs/controllers/data/EffectScript.java @@ -13,7 +13,12 @@ import noppes.npcs.controllers.ScriptController; import noppes.npcs.scripted.event.player.PlayerEvent; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; public class EffectScript implements INpcScriptHandler { public ScriptContainer container; diff --git a/src/main/java/noppes/npcs/controllers/data/GlobalNPCDataScript.java b/src/main/java/noppes/npcs/controllers/data/GlobalNPCDataScript.java index c1a468279..335256e0f 100644 --- a/src/main/java/noppes/npcs/controllers/data/GlobalNPCDataScript.java +++ b/src/main/java/noppes/npcs/controllers/data/GlobalNPCDataScript.java @@ -15,7 +15,16 @@ import noppes.npcs.scripted.NpcAPI; import javax.annotation.CheckForNull; import java.lang.reflect.Array; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.OptionalDouble; +import java.util.OptionalInt; +import java.util.OptionalLong; +import java.util.TreeMap; public class GlobalNPCDataScript implements INpcScriptHandler { public List scripts = new ArrayList(); diff --git a/src/main/java/noppes/npcs/controllers/data/LinkedItemScript.java b/src/main/java/noppes/npcs/controllers/data/LinkedItemScript.java index 64c3dd7ff..cce8df255 100644 --- a/src/main/java/noppes/npcs/controllers/data/LinkedItemScript.java +++ b/src/main/java/noppes/npcs/controllers/data/LinkedItemScript.java @@ -12,7 +12,12 @@ import noppes.npcs.controllers.ScriptContainer; import noppes.npcs.controllers.ScriptController; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; public class LinkedItemScript implements INpcScriptHandler { public ScriptContainer container; diff --git a/src/main/java/noppes/npcs/controllers/data/Party.java b/src/main/java/noppes/npcs/controllers/data/Party.java index df826bb9e..66e293dd4 100644 --- a/src/main/java/noppes/npcs/controllers/data/Party.java +++ b/src/main/java/noppes/npcs/controllers/data/Party.java @@ -23,7 +23,11 @@ import noppes.npcs.controllers.QuestController; import java.io.BufferedReader; import java.io.InputStreamReader; import java.net.URL; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.UUID; public class Party implements IParty { private final UUID partyUUID; @@ -215,9 +219,13 @@ public class Party implements IParty { @Override public String getPartyLeaderName() { if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) { - return this.partyLeaderName; + return this.partyLeaderName == null ? "" : this.partyLeaderName; } else { - return this.getPartyLeader().getCommandSenderName(); + EntityPlayer leader = this.getPartyLeader(); + if (leader != null) + return leader.getCommandSenderName(); + String name = this.partyMembers.get(this.partyLeader); + return name == null ? "" : name; } } @@ -426,12 +434,14 @@ public class Party implements IParty { for (UUID uuid : this.partyOrder) { NBTTagCompound uuidCompound = new NBTTagCompound(); uuidCompound.setString("UUID", uuid.toString()); - uuidCompound.setString("PlayerName", this.partyMembers.get(uuid)); + String name = this.partyMembers.get(uuid); + uuidCompound.setString("PlayerName", name == null ? "" : name); list.appendTag(uuidCompound); } compound.setTag("PartyMembers", list); - compound.setString("PartyLeader", getPartyLeader().getCommandSenderName()); + EntityPlayer leader = getPartyLeader(); + compound.setString("PartyLeader", leader != null ? leader.getCommandSenderName() : ""); Quest quest = (Quest) QuestController.Instance.get(this.getCurrentQuestID()); if (quest != null) { compound.setString("QuestName", quest.getName()); @@ -459,6 +469,15 @@ public class Party implements IParty { this.currentQuestID = compound.getInteger("PartyQuestID"); this.currentQuestName = compound.getString("PartyQuestName"); this.friendlyFire = compound.getBoolean("FriendlyFire"); + + NBTTagList list = compound.getTagList("PartyMembers", 10); + for (int i = 0; i < list.tagCount(); i++) { + NBTTagCompound tagCompound = list.getCompoundTagAt(i); + UUID uuid = UUID.fromString(tagCompound.getString("UUID")); + String playerName = tagCompound.getString("PlayerName"); + this.partyOrder.add(uuid); + this.partyMembers.put(uuid, playerName); + } } public NBTTagCompound writeClientNBT() { @@ -466,6 +485,16 @@ public class Party implements IParty { compound.setInteger("PartyQuestID", this.currentQuestID); compound.setString("PartyQuestName", this.currentQuestName); compound.setBoolean("FriendlyFire", this.friendlyFire); + + NBTTagList list = new NBTTagList(); + for (UUID uuid : this.partyOrder) { + NBTTagCompound uuidCompound = new NBTTagCompound(); + uuidCompound.setString("UUID", uuid.toString()); + String name = this.partyMembers.get(uuid); + uuidCompound.setString("PlayerName", name == null ? "" : name); + list.appendTag(uuidCompound); + } + compound.setTag("PartyMembers", list); return compound; } } diff --git a/src/main/java/noppes/npcs/controllers/data/PlayerData.java b/src/main/java/noppes/npcs/controllers/data/PlayerData.java index bd97b85d0..5f6a5e00d 100644 --- a/src/main/java/noppes/npcs/controllers/data/PlayerData.java +++ b/src/main/java/noppes/npcs/controllers/data/PlayerData.java @@ -16,12 +16,20 @@ import net.minecraftforge.common.IExtendedEntityProperties; import noppes.npcs.CustomNpcs; import noppes.npcs.LogWriter; import noppes.npcs.api.entity.ICustomNpc; -import noppes.npcs.api.handler.*; +import noppes.npcs.api.handler.IPlayerBankData; +import noppes.npcs.api.handler.IPlayerData; +import noppes.npcs.api.handler.IPlayerDialogData; +import noppes.npcs.api.handler.IPlayerFactionData; +import noppes.npcs.api.handler.IPlayerItemGiverData; +import noppes.npcs.api.handler.IPlayerMailData; +import noppes.npcs.api.handler.IPlayerQuestData; +import noppes.npcs.api.handler.IPlayerTransportData; import noppes.npcs.config.ConfigMain; import noppes.npcs.constants.EnumRoleType; import noppes.npcs.controllers.CustomEffectController; import noppes.npcs.controllers.PartyController; import noppes.npcs.controllers.PlayerDataController; +import noppes.npcs.controllers.data.action.ActionManager; import noppes.npcs.entity.EntityCustomNpc; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.entity.data.DataSkinOverlays; @@ -29,7 +37,6 @@ import noppes.npcs.entity.data.DataTimers; import noppes.npcs.roles.RoleCompanion; import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.ScreenSize; -import noppes.npcs.scripted.ScriptedActionManager; import noppes.npcs.util.CustomNPCsThreader; import noppes.npcs.util.NBTJsonUtil; @@ -52,7 +59,7 @@ public class PlayerData implements IExtendedEntityProperties, IPlayerData { public DataSkinOverlays skinOverlays = new DataSkinOverlays(this); public MagicData magicData = new MagicData(); - public ScriptedActionManager actionManager = new ScriptedActionManager(); + public ActionManager actionManager = new ActionManager(); public PlayerDataScript scriptData; public EntityNPCInterface editingNpc; diff --git a/src/main/java/noppes/npcs/controllers/data/PlayerDataScript.java b/src/main/java/noppes/npcs/controllers/data/PlayerDataScript.java index 2a8efced4..a425bdcd4 100644 --- a/src/main/java/noppes/npcs/controllers/data/PlayerDataScript.java +++ b/src/main/java/noppes/npcs/controllers/data/PlayerDataScript.java @@ -17,8 +17,18 @@ import noppes.npcs.scripted.event.player.PlayerEvent; import javax.annotation.CheckForNull; import java.lang.reflect.Array; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; +import java.util.Objects; +import java.util.Optional; +import java.util.OptionalDouble; +import java.util.OptionalInt; +import java.util.OptionalLong; +import java.util.TreeMap; public class PlayerDataScript implements INpcScriptHandler { public List scripts = new ArrayList(); diff --git a/src/main/java/noppes/npcs/controllers/data/Quest.java b/src/main/java/noppes/npcs/controllers/data/Quest.java index 02f3e3f87..1f9097d8a 100644 --- a/src/main/java/noppes/npcs/controllers/data/Quest.java +++ b/src/main/java/noppes/npcs/controllers/data/Quest.java @@ -6,19 +6,34 @@ import kamkeel.npcs.network.packets.data.QuestCompletionPacket; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.*; +import noppes.npcs.ICompatibilty; +import noppes.npcs.NoppesUtilPlayer; +import noppes.npcs.NoppesUtilServer; +import noppes.npcs.NpcMiscInventory; +import noppes.npcs.VersionCompatibility; import noppes.npcs.api.IContainer; import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.handler.IPlayerData; import noppes.npcs.api.handler.IPlayerQuestData; -import noppes.npcs.api.handler.data.*; +import noppes.npcs.api.handler.data.IPartyOptions; +import noppes.npcs.api.handler.data.IProfileOptions; +import noppes.npcs.api.handler.data.IQuest; +import noppes.npcs.api.handler.data.IQuestCategory; +import noppes.npcs.api.handler.data.IQuestInterface; +import noppes.npcs.api.handler.data.IQuestObjective; +import noppes.npcs.api.handler.data.ISlot; import noppes.npcs.config.ConfigMain; import noppes.npcs.constants.EnumProfileSync; import noppes.npcs.constants.EnumQuestCompletion; import noppes.npcs.constants.EnumQuestRepeat; import noppes.npcs.constants.EnumQuestType; import noppes.npcs.controllers.QuestController; -import noppes.npcs.quests.*; +import noppes.npcs.quests.QuestDialog; +import noppes.npcs.quests.QuestInterface; +import noppes.npcs.quests.QuestItem; +import noppes.npcs.quests.QuestKill; +import noppes.npcs.quests.QuestLocation; +import noppes.npcs.quests.QuestManual; import noppes.npcs.scripted.CustomNPCsException; import noppes.npcs.scripted.NpcAPI; diff --git a/src/main/java/noppes/npcs/controllers/data/RecipeAnvil.java b/src/main/java/noppes/npcs/controllers/data/RecipeAnvil.java index fe6fd0905..f2bd33807 100644 --- a/src/main/java/noppes/npcs/controllers/data/RecipeAnvil.java +++ b/src/main/java/noppes/npcs/controllers/data/RecipeAnvil.java @@ -2,9 +2,11 @@ package noppes.npcs.controllers.data; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.util.Constants; import noppes.npcs.NoppesUtilPlayer; import noppes.npcs.NoppesUtilServer; import noppes.npcs.api.handler.data.IAnvilRecipe; +import noppes.npcs.controllers.RecipeController; public class RecipeAnvil implements IAnvilRecipe { public int id = -1; @@ -21,8 +23,6 @@ public class RecipeAnvil implements IAnvilRecipe { public int xpCost; public float repairPercentage; - private boolean isAnvil = true; - public RecipeAnvil() { } @@ -34,23 +34,31 @@ public class RecipeAnvil implements IAnvilRecipe { this.repairPercentage = repairPercentage; } - public static RecipeAnvil read(NBTTagCompound compound) { - RecipeAnvil recipe = new RecipeAnvil(); - recipe.id = compound.getInteger("ID"); - recipe.name = compound.getString("Name"); - recipe.availability.readFromNBT(compound.getCompoundTag("Availability")); - recipe.xpCost = compound.getInteger("XPCost"); - recipe.repairPercentage = compound.getFloat("RepairPercentage"); - recipe.itemToRepair = NoppesUtilServer.readItem(compound.getCompoundTag("ItemToRepair")); - recipe.repairMaterial = NoppesUtilServer.readItem(compound.getCompoundTag("RepairMaterial")); - recipe.ignoreRepairMaterialNBT = compound.getBoolean("IgnoreRepairMatNBT"); - recipe.ignoreRepairItemNBT = compound.getBoolean("IgnoreRepairItemNBT"); - recipe.ignoreRepairMaterialDamage = compound.getBoolean("IgnoreRepairMatDamage"); - recipe.isAnvil = true; - return recipe; + public void readNBT(NBTTagCompound compound) { + this.id = compound.getInteger("ID"); + this.name = compound.getString("Name"); + this.availability.readFromNBT(compound.getCompoundTag("Availability")); + this.xpCost = compound.getInteger("XPCost"); + this.repairPercentage = compound.getFloat("RepairPercentage"); + this.itemToRepair = NoppesUtilServer.readItem(compound.getCompoundTag("ItemToRepair")); + this.repairMaterial = NoppesUtilServer.readItem(compound.getCompoundTag("RepairMaterial")); + this.ignoreRepairMaterialNBT = compound.getBoolean("IgnoreRepairMatNBT"); + this.ignoreRepairItemNBT = compound.getBoolean("IgnoreRepairItemNBT"); + this.ignoreRepairMaterialDamage = compound.getBoolean("IgnoreRepairMatDamage"); + + if (compound.hasKey("ScriptData", Constants.NBT.TAG_COMPOUND)) { + RecipeScript handler = new RecipeScript(); + handler.readFromNBT(compound.getCompoundTag("ScriptData")); + setScriptHandler(handler); + } } public NBTTagCompound writeNBT() { + return writeNBT(true); + } + + + public NBTTagCompound writeNBT(boolean saveScripts) { NBTTagCompound compound = new NBTTagCompound(); compound.setInteger("ID", id); compound.setString("Name", name); @@ -67,6 +75,14 @@ public class RecipeAnvil implements IAnvilRecipe { compound.setBoolean("IgnoreRepairItemNBT", ignoreRepairItemNBT); compound.setBoolean("IgnoreRepairMatDamage", ignoreRepairMaterialDamage); compound.setBoolean("IsAnvil", true); + + if (saveScripts) { + NBTTagCompound scriptData = new NBTTagCompound(); + RecipeScript handler = getScriptHandler(); + if (handler != null) + handler.writeToNBT(scriptData); + compound.setTag("ScriptData", scriptData); + } return compound; } @@ -146,7 +162,21 @@ public class RecipeAnvil implements IAnvilRecipe { this.ignoreRepairItemNBT = recipe.ignoreRepairItemNBT; this.ignoreRepairMaterialNBT = recipe.ignoreRepairMaterialNBT; this.repairPercentage = recipe.repairPercentage; - ; this.xpCost = recipe.xpCost; } + + public RecipeScript getScriptHandler() { + return RecipeController.Instance.anvilScripts.get(this.id); + } + + public void setScriptHandler(RecipeScript handler) { + RecipeController.Instance.anvilScripts.put(this.id, handler); + } + + public RecipeScript getOrCreateScriptHandler() { + RecipeScript data = getScriptHandler(); + if (data == null) + setScriptHandler(data = new RecipeScript()); + return data; + } } diff --git a/src/main/java/noppes/npcs/controllers/data/RecipeCarpentry.java b/src/main/java/noppes/npcs/controllers/data/RecipeCarpentry.java index da03b548c..5821b99a6 100644 --- a/src/main/java/noppes/npcs/controllers/data/RecipeCarpentry.java +++ b/src/main/java/noppes/npcs/controllers/data/RecipeCarpentry.java @@ -7,6 +7,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.ShapedRecipes; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; +import net.minecraftforge.common.util.Constants; import noppes.npcs.NBTTags; import noppes.npcs.NoppesUtilPlayer; import noppes.npcs.NoppesUtilServer; @@ -24,7 +25,6 @@ public class RecipeCarpentry extends ShapedRecipes implements IRecipe { public boolean ignoreDamage = false; public boolean ignoreNBT = false; - public RecipeCarpentry(int width, int height, ItemStack[] recipe, ItemStack result) { super(width, height, recipe, result); } @@ -34,20 +34,33 @@ public class RecipeCarpentry extends ShapedRecipes implements IRecipe { this.name = name; } - public static RecipeCarpentry read(NBTTagCompound compound) { - RecipeCarpentry recipe = new RecipeCarpentry(compound.getInteger("Width"), compound.getInteger("Height"), + public static RecipeCarpentry create(NBTTagCompound compound) { + return new RecipeCarpentry(compound.getInteger("Width"), compound.getInteger("Height"), NBTTags.getItemStackArray(compound.getTagList("Materials", 10)), NoppesUtilServer.readItem(compound.getCompoundTag("Item"))); - recipe.name = compound.getString("Name"); - recipe.id = compound.getInteger("ID"); - recipe.availability.readFromNBT(compound.getCompoundTag("Availability")); - recipe.ignoreDamage = compound.getBoolean("IgnoreDamage"); - recipe.ignoreNBT = compound.getBoolean("IgnoreNBT"); - recipe.isGlobal = compound.getBoolean("Global"); + } - return recipe; + public void readNBT(NBTTagCompound compound) { + this.name = compound.getString("Name"); + this.id = compound.getInteger("ID"); + this.availability.readFromNBT(compound.getCompoundTag("Availability")); + this.ignoreDamage = compound.getBoolean("IgnoreDamage"); + this.ignoreNBT = compound.getBoolean("IgnoreNBT"); + this.isGlobal = compound.getBoolean("Global"); + + if (!isGlobal) { + if (compound.hasKey("ScriptData", Constants.NBT.TAG_COMPOUND)) { + RecipeScript handler = new RecipeScript(); + handler.readFromNBT(compound.getCompoundTag("ScriptData")); + setScriptHandler(handler); + } + } } public NBTTagCompound writeNBT() { + return writeNBT(true); + } + + public NBTTagCompound writeNBT(boolean saveScripts) { NBTTagCompound compound = new NBTTagCompound(); compound.setInteger("ID", id); compound.setInteger("Width", recipeWidth); @@ -60,6 +73,13 @@ public class RecipeCarpentry extends ShapedRecipes implements IRecipe { compound.setBoolean("Global", isGlobal); compound.setBoolean("IgnoreDamage", ignoreDamage); compound.setBoolean("IgnoreNBT", ignoreNBT); + if (saveScripts) { + NBTTagCompound scriptData = new NBTTagCompound(); + RecipeScript handler = getScriptHandler(); + if (handler != null) + handler.writeToNBT(scriptData); + compound.setTag("ScriptData", scriptData); + } return compound; } @@ -253,7 +273,7 @@ public class RecipeCarpentry extends ShapedRecipes implements IRecipe { public void save() { try { - RecipeController.Instance.saveRecipe(this.writeNBT()); + RecipeController.Instance.saveRecipe(this.writeNBT(true)); } catch (IOException var2) { } @@ -270,4 +290,19 @@ public class RecipeCarpentry extends ShapedRecipes implements IRecipe { public int getId() { return this.id; } + + public RecipeScript getScriptHandler() { + return RecipeController.Instance.carpentryScripts.get(this.id); + } + + public void setScriptHandler(RecipeScript handler) { + RecipeController.Instance.carpentryScripts.put(this.id, handler); + } + + public RecipeScript getOrCreateScriptHandler() { + RecipeScript data = getScriptHandler(); + if (data == null) + setScriptHandler(data = new RecipeScript()); + return data; + } } diff --git a/src/main/java/noppes/npcs/controllers/data/RecipeScript.java b/src/main/java/noppes/npcs/controllers/data/RecipeScript.java new file mode 100644 index 000000000..b94acfbc6 --- /dev/null +++ b/src/main/java/noppes/npcs/controllers/data/RecipeScript.java @@ -0,0 +1,159 @@ +package noppes.npcs.controllers.data; + +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.eventhandler.Event; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.util.ByteBufUtils; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.util.Constants; +import noppes.npcs.config.ConfigScript; +import noppes.npcs.constants.EnumScriptType; +import noppes.npcs.controllers.ScriptContainer; +import noppes.npcs.controllers.ScriptController; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; + +public class RecipeScript implements INpcScriptHandler { + public ScriptContainer container; + public String scriptLanguage = "ECMAScript"; + public boolean enabled = false; + + public NBTTagCompound writeToNBT(NBTTagCompound compound) { + compound.setString("ScriptLanguage", scriptLanguage); + compound.setBoolean("ScriptEnabled", enabled); + if (container != null) + compound.setTag("ScriptContent", container.writeToNBT(new NBTTagCompound())); + return compound; + } + + public RecipeScript readFromNBT(NBTTagCompound compound) { + scriptLanguage = compound.getString("ScriptLanguage"); + enabled = compound.getBoolean("ScriptEnabled"); + if (compound.hasKey("ScriptContent", Constants.NBT.TAG_COMPOUND)) { + container = new ScriptContainer(this); + container.readFromNBT(compound.getCompoundTag("ScriptContent")); + } + return this; + } + + public boolean isEnabled() { + return this.enabled && ScriptController.HasStart && container != null && ConfigScript.ScriptingEnabled; + } + + @Override + public void callScript(EnumScriptType type, Event event) { + this.callScript(type.function, event); + } + + @Override + public void callScript(String s, Event event) { + if (!this.isEnabled()) + return; + container.run(s, event); + } + + @Override + public boolean isClient() { + return FMLCommonHandler.instance().getEffectiveSide().isClient(); + } + + @Override + public boolean getEnabled() { + return this.enabled; + } + + @Override + public void setEnabled(boolean b) { + this.enabled = b; + } + + @Override + public String getLanguage() { + return this.scriptLanguage; + } + + @Override + public void setLanguage(String s) { + this.scriptLanguage = s; + } + + @Override + public void setScripts(List list) { + if (list == null || list.isEmpty()) { + container = null; + return; + } + container = list.get(0); + } + + @Override + public List getScripts() { + if (container == null) + return new ArrayList<>(); + return Collections.singletonList(container); + } + + @Override + public String noticeString() { + return "RecipeScript"; + } + + @Override + public Map getConsoleText() { + TreeMap map = new TreeMap<>(); + int tab = 0; + for (ScriptContainer script : this.getScripts()) { + ++tab; + for (Map.Entry entry : script.console.entrySet()) { + map.put(entry.getKey(), " tab " + tab + ":\n" + entry.getValue()); + } + } + return map; + } + + @Override + public void clearConsole() { + for (ScriptContainer script : this.getScripts()) { + script.console.clear(); + } + } + + public void saveScript(ByteBuf buffer) throws IOException { + int tab = buffer.readInt(); + int totalScripts = buffer.readInt(); + if (totalScripts == 0) + this.container = null; + if (tab == 0) { + NBTTagCompound tabCompound = ByteBufUtils.readNBT(buffer); + ScriptContainer script = new ScriptContainer(this); + script.readFromNBT(tabCompound); + this.container = script; + } else { + NBTTagCompound compound = ByteBufUtils.readNBT(buffer); + this.setLanguage(compound.getString("ScriptLanguage")); + if (!ScriptController.Instance.languages.containsKey(this.getLanguage())) { + if (!ScriptController.Instance.languages.isEmpty()) { + this.setLanguage((String) ScriptController.Instance.languages.keySet().toArray()[0]); + } else { + this.setLanguage("ECMAScript"); + } + } + this.setEnabled(compound.getBoolean("ScriptEnabled")); + } + } + + public enum ScriptType { + PRE("pre"), + POST("post"); + public final String function; + + ScriptType(String functionName) { + this.function = functionName; + } + } +} diff --git a/src/main/java/noppes/npcs/controllers/data/SpawnData.java b/src/main/java/noppes/npcs/controllers/data/SpawnData.java index 821a0e3aa..f82d9b225 100644 --- a/src/main/java/noppes/npcs/controllers/data/SpawnData.java +++ b/src/main/java/noppes/npcs/controllers/data/SpawnData.java @@ -12,7 +12,13 @@ import noppes.npcs.api.handler.data.INaturalSpawn; import noppes.npcs.scripted.CustomNPCsException; import noppes.npcs.scripted.NpcAPI; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; public class SpawnData extends WeightedRandom.Item implements INaturalSpawn { public List biomes = new ArrayList<>(); diff --git a/src/main/java/noppes/npcs/controllers/data/TagMap.java b/src/main/java/noppes/npcs/controllers/data/TagMap.java index 073439d50..e4c0ad57f 100644 --- a/src/main/java/noppes/npcs/controllers/data/TagMap.java +++ b/src/main/java/noppes/npcs/controllers/data/TagMap.java @@ -4,7 +4,12 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.UUID; public class TagMap { public int cloneTab; diff --git a/src/main/java/noppes/npcs/controllers/data/action/Action.java b/src/main/java/noppes/npcs/controllers/data/action/Action.java index 9bf4e745e..729603019 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/Action.java +++ b/src/main/java/noppes/npcs/controllers/data/action/Action.java @@ -1,124 +1,203 @@ package noppes.npcs.controllers.data.action; +import noppes.npcs.api.handler.IActionManager; import noppes.npcs.api.handler.data.IAction; -import noppes.npcs.scripted.ScriptedActionManager; +import noppes.npcs.api.handler.data.IActionQueue; +import noppes.npcs.api.handler.data.actions.IConditionalAction; +import noppes.npcs.controllers.ScriptContainer; +import noppes.npcs.scripted.CustomNPCsException; import java.util.HashMap; import java.util.Map; import java.util.function.Consumer; +import java.util.function.Function; public class Action implements IAction { - protected final ScriptedActionManager manager; + protected final ActionManager manager; + protected IActionQueue queue; + protected boolean isScheduled; protected final String name; protected int startAfterTicks; - protected int count; - protected int duration; - protected int maxDuration = -1; + protected int count, maxCount = -1; + protected int duration, maxDuration = -1; protected int updateEveryXTick = 5; - protected Consumer task; - private boolean done; - private final Map dataStore = new HashMap<>(); + protected Consumer task, onStart, onDone; + protected boolean done; + protected final Map dataStore = new HashMap<>(); + protected boolean isThreaded; + protected ActionThread actionThread; + protected ScriptContainer reportTo; - public Action(ScriptedActionManager manager, String name) { + //allows chaining .before() and .after() on unscheduled actions + protected ActionList unscheduledList; + + public Action(ActionManager manager, String name) { this.manager = manager; this.name = name; + + if (ScriptContainer.Current != null) + reportTo = ScriptContainer.Current; } - public Action(ScriptedActionManager manager, Consumer task) { - this(manager, task.toString(), task); + public Action(ActionManager manager, Consumer task) { + this(manager, Integer.toHexString(task.hashCode()), task); } - public Action(ScriptedActionManager manager, String name, int maxDuration, int startAfterTicks, Consumer task) { - this.manager = manager; - this.name = name; - this.maxDuration = maxDuration; - this.startAfterTicks = startAfterTicks; - this.task = task; - } - - public Action(ScriptedActionManager manager, String name, int startAfterTicks, Consumer task) { - this(manager, name, task); - this.startAfterTicks = startAfterTicks; - } - - public Action(ScriptedActionManager manager, String name, Consumer task) { + public Action(ActionManager manager, String name, Consumer task) { this(manager, name); this.task = task; } - public Action(ScriptedActionManager manager, int startAfterTicks, Consumer task) { + public Action(ActionManager manager, int startAfterTicks, Consumer task) { this(manager, task); this.startAfterTicks = startAfterTicks; } - @Override - public IAction setTask(Consumer task) { - this.task = task; - return this; + public Action(ActionManager manager, String name, int startAfterTicks, Consumer task) { + this(manager, name, task); + this.startAfterTicks = startAfterTicks; } - public void tick(int ticksExisted) { - if (done) return; - if (startAfterTicks > 0) { - startAfterTicks--; - return; - } - if (maxDuration != -1 && duration >= maxDuration) { - markDone(); - return; - } - if (ticksExisted % updateEveryXTick == 0 && task != null) { - try { - task.accept(this); - count++; - } catch (Throwable t) { - System.err.println("Scripted action '" + name + "' threw an exception:"); - t.printStackTrace(); - markDone(); - } - } - duration++; + public Action(ActionManager manager, int maxDuration, int startAfterTicks, Consumer task) { + this(manager, startAfterTicks, task); + this.maxDuration = maxDuration; + } + + public Action(ActionManager manager, String name, int maxDuration, int startAfterTicks, Consumer task) { + this(manager, name, startAfterTicks, task); + this.maxDuration = maxDuration; } @Override - public ScriptedActionManager getManager() { + public IActionManager getManager() { return manager; } - @Override - public int getCount() { - return count; - } - - @Override - public int getDuration() { - return duration; - } - @Override public String getName() { return name; } + @Override + public IActionQueue getQueue() { + return queue; + } + + public String getQueueName() { + return queue != null ? queue.getName() : "null"; + } + + @Override + public IAction setQueue(IActionQueue queue) { + if (this.queue == queue) + return this; + + if (this.queue != null) + this.queue.getQueue().remove(this); + + this.queue = queue; + queue.schedule(this); + return this; + } + + protected void schedule(IActionQueue queue) { + queue.getQueue().add(this); + + this.queue = queue; + this.isScheduled = true; + + if (manager.debug) + manager.LOGGER.log(String.format("Scheduled %s", getIdentifier()), queue); + } + + @Override + public boolean isScheduled() { + return isScheduled; + } + + @Override + public IAction setTask(Consumer task) { + this.task = task; + return this; + } + + @Override + public IAction onStart(Consumer task) { + this.onStart = task; + return this; + } + + @Override + public IAction onDone(Consumer task) { + this.onDone = task; + return this; + } + + @Override + public int getDuration() { + return duration; + } + + @Override public int getMaxDuration() { return maxDuration; } @Override - public IAction setMaxDuration(int x) { - this.maxDuration = x; + public IAction setMaxDuration(int ticks) { + this.maxDuration = Math.max(-1, ticks); return this; } @Override - public void markDone() { - done = true; + public int getStartAfterTicks() { + return startAfterTicks; } @Override - public boolean isDone() { - return done; + public int getUpdateEvery() { + return updateEveryXTick; + } + + @Override + public IAction updateEvery(int x) { + this.updateEveryXTick = Math.max(1, x); + return this; + } + + @Override + public IAction everyTick() { + this.updateEveryXTick = 1; + return this; + } + + @Override + public IAction everySecond() { + this.updateEveryXTick = 20; + return this; + } + + @Override + public int getCount() { + return count; + } + + @Override + public int getMaxCount() { + return maxCount; + } + + @Override + public IAction times(int n) { + this.maxCount = Math.max(-1, n); + return this; + } + + @Override + public IAction once() { + this.maxCount = 1; + return this; } @Override @@ -138,37 +217,269 @@ public class Action implements IAction { return this; } + @Override + public IAction copyDataTo(IAction to) { + ((Action) to).dataStore.putAll(dataStore); + return this; + } + + @Override + public String printData() { + if (dataStore.isEmpty()) { + return String.format("Action[name=%s] dataStore is empty", name); + } + + StringBuilder sb = new StringBuilder(); + sb.append(String.format("Action[name=%s] dataStore contents:\n", name)); + + for (Map.Entry entry : dataStore.entrySet()) { + sb.append(String.format(" %s = %s\n", entry.getKey(), entry.getValue())); + } + + return sb.toString(); + } + @Override public boolean hasData(String key) { return dataStore.containsKey(key); } @Override - public int getUpdateEveryXTick() { - return updateEveryXTick; + public void markDone() { + done = true; + + if (manager.debug) + manager.LOGGER.log("Marked done!", this); } @Override - public IAction setUpdateEveryXTick(int x) { - this.updateEveryXTick = x; + public boolean isDone() { + return done; + } + + /////////////////////////////////////////////////// + ////////////////////////////////////////////////// + // Listener + +// public IAction listenTo(String hook, Object object) { +// return listenTo(hook, manager.getOrCreateListener(object)); +// } +// +// public IAction listenTo(String hook, IActionListener listener) { +// return listenTo(listener.getOrCreateHook(hook)); +// } +// +// public IAction listenTo(ActionListener.Hook hook) { +// hook.schedule(this); +// return this; +// } + + /////////////////////////////////////////////////// + ////////////////////////////////////////////////// + // Handling + + @Override + public IAction start() { + manager.start(); + return this; + } + + public void tick() { + if (done) + return; + + if (startAfterTicks > 0) { + manager.LOGGER.log(String.format("Starts after %s ticks...", startAfterTicks), this); + startAfterTicks--; + return; + } + + if (duration == 0 && onStart != null) + execute("onStart", this::executeOnStart); + + if (done) + return; + + duration++; + + inheritedTick(); + + if (maxDuration > -1 && duration >= maxDuration || maxCount == 0) { + if (manager.debug) + manager.LOGGER.log("Reached max duration", this); + + markDone(); + return; + } + + + if (maxCount > -1 && count >= maxCount) { + if (manager.debug) + manager.LOGGER.log("Reached max count", this); + + markDone(); + } + + } + + public void inheritedTick() { + if (manager.debug) + manager.LOGGER.log(String.format("Ticking... (duration = %s/%s, count = %s/%s)", duration, maxDuration, count, maxCount), this); + + + if (duration % updateEveryXTick == 0 && task != null) + execute("task", this::executeTask); + } + + public void execute(String taskName, Runnable task) { + if (isThreaded) + actionThread.execute(taskName, task); + else + task.run(); + } + + protected void executeOnStart() { + if (manager.debug) + manager.LOGGER.log("Executing onStart task...", this); + + try { + onStart.accept(this); + } catch (Throwable t) { + manager.LOGGER.error("onStart Task of " + this + " threw an exception:", t); + } + + if (manager.debug) + manager.LOGGER.log("Finished executing onStart task", this); + } + + protected void executeTask() { + if (manager.debug) + manager.LOGGER.log("Executing task...", this); + + try { + task.accept(this); + count++; + } catch (Throwable t) { + manager.LOGGER.error("Task of " + this + " threw an exception:", t); + markDone(); + } + + if (manager.debug) + manager.LOGGER.log(String.format("Finished executing task (count = %s/%s)", count, maxCount), this); + } + + protected void executeOnDone() { + if (manager.debug) + manager.LOGGER.log("Executing onDone task...", this); + + try { + onDone.accept(this); + } catch (Throwable t) { + manager.LOGGER.error("onDone Task of " + this + " threw an exception:", t); + } + + if (manager.debug) + manager.LOGGER.log("Finished executing onDone task", this); + } + + + @Override + public void kill() { + if (manager.debug) + manager.LOGGER.log(String.format("Killing %s...", getIdentifier()), queue); + + if (actionThread != null) + actionThread.stop(); + + dataStore.clear(); + isScheduled = false; + done = true; + + } + + @Override + public String getIdentifier() { + return String.format("%s '%s'", getClass().getSimpleName(), name); + } + + public String toString() { + return String.format("%s [queue='%s', scheduled=%s, done=%s, paused=%s, updateEvery=%s, duration=%d/%d, count=%d/%d, threaded=%s]", getIdentifier(), getQueueName(), isScheduled, done, isPaused(), updateEveryXTick, duration, maxDuration, count, maxCount, isThreaded); + } + /////////////////////////////////////////////////// + ////////////////////////////////////////////////// + // Thread + + @Override + public IAction threadify() { + if (!isThreaded) { + isThreaded = true; + actionThread = new ActionThread(this); + } + return this; } @Override - public int getStartAfterTicks() { - return startAfterTicks; + public void resume() { + if (isThreaded) + actionThread.resume(); + } + + @Override + public void pause() { + if (isThreaded) + actionThread.pause(); + else + throw new CustomNPCsException("Must threadify() IAction before pausing!"); } @Override public IAction pauseFor(int ticks) { - this.startAfterTicks = ticks; + if (isThreaded) + actionThread.pauseFor(ticks); + else + this.startAfterTicks = ticks; + return this; } + @Override + public IAction pauseFor(long millis) { + if (isThreaded) { + actionThread.pauseFor(millis); + return this; + } + + return pauseFor((int) (millis / 50)); + } + + @Override + public void pauseUntil(Function until) { + if (isThreaded) + actionThread.pauseUntil(until); + else + throw new CustomNPCsException("Must threadify() IAction before pausing!"); + } + + @Override + public boolean isPaused() { + if (isThreaded) + return actionThread.isPaused(); + + return startAfterTicks > 0; + } + + /////////////////////////////////////////////////// + /////////////////////////////////////////////////// + // Sequential + @Override public IAction getNext() { + if (queue == null) + return null; + boolean seenMe = false; - for (IAction a : manager.getActionQueue()) { + for (IAction a : queue.getQueue()) { if (seenMe) { return a; } @@ -181,8 +492,11 @@ public class Action implements IAction { @Override public IAction getPrevious() { + if (queue == null) + return null; + IAction prev = null; - for (IAction a : manager.getActionQueue()) { + for (IAction a : queue.getQueue()) { if (a == this) { return prev; } @@ -193,11 +507,37 @@ public class Action implements IAction { @Override public IAction after(IAction after) { - int idx = manager.getIndex(this); - if (idx >= 0) manager.scheduleActionAt(idx + 1, after); + if (after instanceof IConditionalAction) + return conditional((IConditionalAction) after); + + int idx = queue == null ? -1 : queue.getIndex(this); + if (idx >= 0 && !queue.isParallel()) + queue.scheduleActionAt(idx + 1, after); + else { + if (unscheduledList == null) + unscheduledList = new ActionList(this); + + unscheduledList.after(this, (Action) after); + } return after; } + @Override + public void after(IAction... actions) { + for (int i = 0; i < actions.length - 1; i++) + actions[i].after(actions[i + 1]); + } + + @Override + public void after(Consumer... tasks) { + IAction[] actions = new IAction[tasks.length]; + + for (int i = 0; i < tasks.length; i++) + actions[i] = manager.create(tasks[i]); + + after(actions); + } + @Override public IAction after(String name, int maxDuration, int delay, Consumer t) { return after(manager.create(name, maxDuration, delay, t)); @@ -225,8 +565,18 @@ public class Action implements IAction { @Override public IAction before(IAction before) { - int idx = manager.getIndex(this); - if (idx >= 0) manager.scheduleActionAt(Math.max(0, idx), before); + if (before instanceof IConditionalAction) + return conditional((IConditionalAction) before); + + int idx = queue == null ? -1 : queue.getIndex(this); + if (idx >= 0 && !queue.isParallel()) + queue.scheduleActionAt(Math.max(0, idx), before); + else { + if (unscheduledList == null) + unscheduledList = new ActionList(this); + + unscheduledList.before(this, (Action) before); + } return before; } @@ -254,4 +604,106 @@ public class Action implements IAction { public IAction before(Consumer t) { return before(manager.create(t)); } + + + /////////////////////////////////////////////////// + /////////////////////////////////////////////////// + // Parallels + + @Override + public IAction parallel(IAction act) { + if (unscheduledList != null) + ((Action) act).unscheduledList = unscheduledList; + + if (queue != null && queue.isParallel() && queue != manager.conditionalQueue) + return queue.schedule(act); + + return manager.scheduleParallel(act); + } + + @Override + public void parallel(IAction... actions) { + for (IAction act : actions) + parallel(act); + } + + @Override + public IAction parallel(Consumer task) { + return parallel(manager.create(task)); + } + + @Override + public void parallel(Consumer... tasks) { + for (Consumer task : tasks) + parallel(task); + } + + @Override + public IAction parallel(int delay, Consumer task) { + return parallel(manager.create(delay, task)); + } + + @Override + public IAction parallel(String name, Consumer task) { + return parallel(manager.create(name, task)); + } + + @Override + public IAction parallel(String name, int startAfterTicks, Consumer task) { + return parallel(manager.create(name, startAfterTicks, task)); + } + + @Override + public IAction parallel(String name, int maxDuration, int delay, Consumer t) { + return parallel(manager.create(name, maxDuration, delay, t)); + } + + /////////////////////////////////////////////////// + /////////////////////////////////////////////////// + // Conditionals + + @Override + public IConditionalAction conditional(IConditionalAction after) { + if (unscheduledList != null) + ((Action) after).unscheduledList = unscheduledList; + + return manager.schedule(after); + } + + @Override + public void conditional(IConditionalAction... actions) { + for (IConditionalAction act : actions) + conditional(act); + } + + @Override + public IConditionalAction conditional(Function condition, Consumer task) { + return conditional(manager.create(condition, task)); + } + + @Override + public IConditionalAction conditional(String name, Function condition, Consumer task) { + return conditional(manager.create(name, condition, task)); + } + + @Override + public IConditionalAction conditional(Function condition, Consumer task, Function terminateWhen) { + return conditional(manager.create(condition, task, terminateWhen)); + } + + @Override + public IConditionalAction conditional(String name, Function condition, Consumer task, Function terminateWhen) { + return conditional(manager.create(name, condition, task, terminateWhen)); + } + + @Override + public IConditionalAction conditional(Function condition, Consumer task, Function terminateWhen, Consumer onTermination) { + return conditional(manager.create(condition, task, terminateWhen, onTermination)); + } + + @Override + public IConditionalAction conditional(String name, Function condition, Consumer task, Function terminateWhen, Consumer onTermination) { + return conditional(manager.create(name, condition, task, terminateWhen, onTermination)); + } + } diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionChain.java b/src/main/java/noppes/npcs/controllers/data/action/ActionChain.java deleted file mode 100644 index 572748a69..000000000 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionChain.java +++ /dev/null @@ -1,41 +0,0 @@ -package noppes.npcs.controllers.data.action; - -import noppes.npcs.api.handler.data.IAction; -import noppes.npcs.api.handler.data.IActionChain; -import noppes.npcs.scripted.ScriptedActionManager; - -import java.util.function.Consumer; - -/** - * helper to build a back‐to‐back chain of one‐shot actions - */ -public class ActionChain implements IActionChain { - private final ScriptedActionManager scriptedActionManager; - private int offset = 0, index = 0; - - public ActionChain(ScriptedActionManager scriptedActionManager) { - this.scriptedActionManager = scriptedActionManager; - } - - /** - * schedule the next task ‘delay’ ticks after the previous one - */ - @Override - public IActionChain after(int delay, String name, Consumer task) { - offset += delay; - Consumer wrapper = act -> { - task.accept(act); - act.markDone(); - }; - IAction a = scriptedActionManager.create(name, offset, wrapper); - index++; - a.setUpdateEveryXTick(1); - scriptedActionManager.scheduleAction(a); - return this; - } - - @Override - public IActionChain after(int delay, Consumer task) { - return after(delay, "chain#" + index, task); - } -} diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionList.java b/src/main/java/noppes/npcs/controllers/data/action/ActionList.java new file mode 100644 index 000000000..68a44ad43 --- /dev/null +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionList.java @@ -0,0 +1,58 @@ +package noppes.npcs.controllers.data.action; + +import noppes.npcs.api.handler.data.IActionQueue; + +import java.util.LinkedList; +import java.util.function.Consumer; + +public class ActionList { + + protected final LinkedList list = new LinkedList<>(); + protected final Action first; + protected IActionQueue originalQueue; + + public ActionList(Action action) { + list.addFirst(first = action); + originalQueue = action.getQueue(); + } + + public Action after(Action current, Action aft) { + int currentIndex = list.indexOf(current); + + if (currentIndex == -1) + list.addLast(aft); + else + list.add(currentIndex + 1, aft); + + aft.unscheduledList = this; + return aft; + } + + public Action before(Action current, Action bef) { + int currentIndex = list.indexOf(current); + + if (currentIndex == -1) + list.addLast(bef); + else + list.add(Math.max(0, currentIndex), bef); + + bef.unscheduledList = this; + return bef; + } + + public ActionList scheduleAll(IActionQueue queue) { + list.forEach(act -> act.schedule(queue)); + + return this; + } + + public ActionList forEach(Consumer task) { + list.forEach(task); + return this; + } + + public ActionList kill() { + list.clear(); + return this; + } +} diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionListener.java b/src/main/java/noppes/npcs/controllers/data/action/ActionListener.java new file mode 100644 index 000000000..01b557a5e --- /dev/null +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionListener.java @@ -0,0 +1,91 @@ +package noppes.npcs.controllers.data.action; + +import noppes.npcs.api.handler.data.IAction; +import noppes.npcs.api.handler.data.IActionListener; +import noppes.npcs.api.handler.data.IActionQueue; + +import java.util.Iterator; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +public class ActionListener implements IActionListener { + private static final ActionManager manager = ActionManager.GLOBAL; + + private final Object object; //object listener is attached to + private final Map hooks = new ConcurrentHashMap<>(); + + public ActionListener(Object target) { + this.object = target; + } + + public void tick() { + Iterator> it = hooks.entrySet().iterator(); + while (it.hasNext()) { + Map.Entry entry = it.next(); + Hook hook = entry.getValue(); + ActionQueue hookQueue = (ActionQueue) hook.queue; + hookQueue.tick(); + + if (hookQueue.isDead()) { + hookQueue.clear(); + if (manager.debug) + manager.LOGGER.log(String.format("Removing queue '%s'", hookQueue.getName()), manager); + it.remove(); + } + } + } + + public Object getObject() { + return object; + } + + // @Override + public Hook getOrCreateHook(String hookName) { + return hooks.computeIfAbsent(hookName, Hook::new); + } + + // @Override + public Hook getHook(String hookName) { + return hooks.get(hookName); + } + + // @Override + public boolean fire(String hookName) { + Hook hook = hooks.get(hookName); + if (hook != null) { + hook.fire(); + return true; + } + + return false; + } + + public IAction schedule(String hookName, IAction action) { + return getOrCreateHook(hookName).schedule(action); + } + + public class Hook { + public final String name; + public final IActionQueue queue; + + public Hook(String hookName) { + this.name = hookName; + + String queueName = String.format("ActionListener#%s:%s", object, hookName); + this.queue = manager.createQueue(queueName).stopWhenEmpty(true).killWhenEmpty(false); + } + + public String getName() { + return name; + } + + public void fire() { + queue.getManager().start(); // just in case, ensures the manager is ticking + queue.start(); + } + + public IAction schedule(IAction action) { + return queue.schedule(action); + } + } +} diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionLogger.java b/src/main/java/noppes/npcs/controllers/data/action/ActionLogger.java new file mode 100644 index 000000000..753419970 --- /dev/null +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionLogger.java @@ -0,0 +1,204 @@ +package noppes.npcs.controllers.data.action; + +import noppes.npcs.LogWriter; +import noppes.npcs.api.handler.data.IAction; +import noppes.npcs.api.handler.data.IActionQueue; +import noppes.npcs.config.ConfigDebug; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.exception.ExceptionUtils; + +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.Date; +import java.util.Deque; +import java.util.List; +import java.util.ListIterator; + +public class ActionLogger { + // private final Map> snapshot = new HashMap<>(); + private final ActionManager manager; + private final Deque stack = new ArrayDeque<>(); + private TreeNode root, currentNode; + + static class TreeNode { + public final Object component; //ActionManager, or ActionQueue, or Action, etc... + public final List children = new ArrayList<>(); + public TreeNode parent; + + public boolean isLastChild() { + if (parent == null) + return true; + List siblings = parent.children; + return siblings.get(siblings.size() - 1) == this; + } + + public TreeNode(Object component) { + this.component = component; + } + + public TreeNode addChild(Object component) { + TreeNode child = new TreeNode(component); + children.add(child); + child.parent = this; + return child; + } + } + + public ActionLogger(ActionManager manager) { + this.manager = manager; + } + + public ActionLogger beginTick(ActionManager manager) { + stack.clear(); + + root = currentNode = new TreeNode(manager); + for (IActionQueue queue : manager.getAllQueues()) { + if (!queue.hasActiveTasks()) + continue; + TreeNode queueNode = root.addChild(queue); + + for (IAction action : queue.getQueue()) + queueNode.addChild(action); + } + + return this; + } + + public ActionLogger push(Object component) { + for (TreeNode child : currentNode.children) { + if (child.component.equals(component)) { + currentNode = child; + break; + } + } + + stack.push(currentNode); + return this; + } + + public ActionLogger pop() { + if (!stack.isEmpty()) + currentNode = stack.pop(); + + return this; + } + + public ActionLogger finish(String finished, Object component) { + log(finished, component); + log(StringUtils.repeat("-", finished.length()), component, true); + return this; + } + + public ActionLogger log(String message, Object source) { + return log(message, source, false); + } + + public ActionLogger log(String message, Object source, boolean isLast) { + StringBuilder prefix = new StringBuilder(); + + ListIterator it = new ArrayList<>(stack).listIterator(stack.size()); + + while (it.hasPrevious()) { + TreeNode node = it.previous(); + if (it.hasPrevious()) + prefix.append("│ "); + else + prefix.append(isLast ? "└──── " : "├──── "); + } + + String header = getLogHeader(source); + println(prefix + header + message); + return this; + } + + public void error(String err, Throwable t) { + if (manager.reportTo != null) + manager.reportTo.appendConsole(err + (t != null ? "\n" + ExceptionUtils.getStackTrace(t) : "")); + + LogWriter.error(err); + if (t != null) + t.printStackTrace(); + } + + private String getLogHeader(Object obj) { + String type = obj.getClass().getSimpleName(); + String name = ""; + + if (obj instanceof ActionManager) { + name = ((ActionManager) obj).getName(); + } else if (obj instanceof IActionQueue) { + name = ((IActionQueue) obj).getName(); + } else if (obj instanceof IAction) { + name = ((IAction) obj).getName(); + } else if (obj instanceof ActionThread) { + name = ((ActionThread) obj).getAction().getName(); + } + + return String.format("[%s/'%s'] ", type, name); + } + + private static final String ANSI_CYAN = "\u001B[96m"; + private static final String ANSI_GOLD = "\u001B[93m"; + private static final String ANSI_RESET = "\u001B[0m"; + + public void println(String str) { + if (ConfigDebug.LogActionManager) + System.out.printf("[%tT] %s[%s]:%s %s%s%n", new Date(), ANSI_CYAN, Thread.currentThread().getName(), ANSI_GOLD, str, ANSI_RESET); + } + + // public ActionLogger beginTick1(ActionManager manager) { + // snapshot.clear(); + // stack.clear(); + // + // List queues = Arrays.stream(manager.getAllQueues()).filter(IActionQueue::hasActiveTasks).collect(Collectors.toList()); + // snapshot.put(manager, queues); + // + // for (IActionQueue queue : queues) { + // LinkedList contents = new LinkedList<>(); + // contents.add(queue); + // + // for (IAction a : queue.getQueue()) + // contents.add(a); + // + // // Actions only (not the queue itself) + // snapshot.put(queue, contents.subList(1, contents.size())); + // } + // + // return this; + // } + + // + // private Object getParent() { + // return stack.isEmpty() ? null : stack.peek().component; + // } + + // public ActionLogger push1(Object component) { + // List siblings = snapshot.get(getParent()); + // boolean isLast = siblings != null && !siblings.isEmpty() && siblings.get(siblings.size() - 1).equals(component); + // + // stack.push(new TreeNode(component)); + // return this; + // } + + // + // public void log(String message, Object source, int in) { + // StringBuilder prefix = new StringBuilder(); + // Deque branches = branchStack.get(); + // int depth = branches.size(); + // + // Iterator iter = branches.descendingIterator(); + // for (int i = 0; i < depth - 1; i++) { + // prefix.append(iter.next() ? " " : "│ "); + // } + // + // if (depth > 0) { + // prefix.append(branches.peek() ? "└── " : "├── "); + // } + // + // String header = getHeader(source); + // int pad = Math.max(0, maxHeaderLength - header.length()); + // String formatted = prefix + header + StringUtils.repeat(" ", pad) + message; + // + // output.accept(formatted); + // } +} diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java new file mode 100644 index 000000000..7f4e8412e --- /dev/null +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java @@ -0,0 +1,557 @@ +package noppes.npcs.controllers.data.action; + +import noppes.npcs.api.handler.IActionManager; +import noppes.npcs.api.handler.data.IAction; +import noppes.npcs.api.handler.data.IActionChain; +import noppes.npcs.api.handler.data.IActionListener; +import noppes.npcs.api.handler.data.IActionQueue; +import noppes.npcs.api.handler.data.actions.IConditionalAction; +import noppes.npcs.controllers.ScriptContainer; +import noppes.npcs.controllers.data.action.action.ConditionalAction; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.function.Consumer; +import java.util.function.Function; + +/** + * Full-featured ActionManager: + * - delayed start, max-duration, tick-interval + * - chaining (getNext, getPrevious, scheduleAfter/Before) + * - per-action data + * - conditional actions + * - cancellation & clearing + */ +public class ActionManager implements IActionManager { + public static final ActionManager GLOBAL = new ActionManager("GLOBAL"); + private static final Map listeners = new ConcurrentHashMap<>(); + + protected boolean isWorking = false; + public ActionLogger LOGGER = new ActionLogger(this); + protected String name = ""; + + protected final ActionQueue sequentialQueue = new ActionQueue(this, "mainSequential"); + protected final ActionQueue parallelQueue = new ActionQueue(this, "mainParallel", true); + protected final ActionQueue conditionalQueue = new ActionQueue(this, "mainConditional", true); + protected final Map otherQueues = new HashMap<>(); + + protected boolean debug = false; + protected ScriptContainer reportTo; + + public ActionManager() { + } + + public ActionManager(String name) { + this.name = name; + } + + + @Override + public IActionManager start() { + isWorking = true; + return this; + } + + @Override + public IActionManager stop() { + isWorking = false; + return this; + } + + @Override + public String getName() { + return name; + } + + @Override + public IActionManager setName(String name) { + this.name = name; + return this; + } + + @Override + public boolean inDebugMode() { + return debug; + } + + @Override + public IActionManager setDebugMode(boolean debug) { + this.debug = debug; + + if (debug) + LOGGER.log("Enabled debug mode", this); + return this; + } + + /////////////////////////////////////////////////// + /////////////////////////////////////////////////// + // Listeners + + // IActionListener Comments +// public IActionListener getOrCreateListener(Object obj) { +// return listeners.computeIfAbsent(obj, o -> new ActionListener(o)); +// } + +// public IActionListener getListener(Object obj) { +// return listeners.get(obj); +// } + +// public boolean removeListener(Object obj) { +// if (listeners.containsKey(obj)) { +// listeners.remove(obj); +// return true; +// } +// +// return false; +// } + +// public boolean fireListener(String hookName, Object obj) { +// IActionListener listener = getListener(obj); +// if (listener != null) +// return listener.fire(hookName); +// +// return false; +// } + + /////////////////////////////////////////////////// + /////////////////////////////////////////////////// + // Creators + + @Override + public IAction create(String name) { + return new Action(this, name); + } + + @Override + public IAction create(Consumer t) { + return new Action(this, t); + } + + @Override + public IAction create(int maxDuration, int delay, Consumer task) { + return new Action(this, maxDuration, delay, task); + } + + @Override + public IAction create(String name, int maxDuration, int delay, Consumer task) { + return new Action(this, name, maxDuration, delay, task); + } + + @Override + public IAction create(String name, int delay, Consumer t) { + return new Action(this, name, delay, t); + } + + @Override + public IAction create(int delay, Consumer t) { + return new Action(this, delay, t); + } + + @Override + public IAction create(String name, Consumer t) { + return new Action(this, name, t); + } + + @Override + public IConditionalAction create(Function condition, Consumer task) { + return new ConditionalAction(this, condition, task); + } + + @Override + public IConditionalAction create(String name, Function condition, Consumer task) { + return new ConditionalAction(this, name, condition, task); + } + + @Override + public IConditionalAction create(Function condition, Consumer task, Function terminateWhen) { + return new ConditionalAction(this, condition, task, terminateWhen); + } + + @Override + public IConditionalAction create(String name, Function condition, Consumer task, Function terminateWhen) { + return new ConditionalAction(this, name, condition, task, terminateWhen); + } + + @Override + public IConditionalAction create(Function condition, Consumer task, Function terminateWhen, Consumer onTermination) { + return new ConditionalAction(this, condition, task, terminateWhen, onTermination); + } + + @Override + public IConditionalAction create(String name, Function condition, Consumer task, Function terminateWhen, Consumer onTermination) { + return new ConditionalAction(this, name, condition, task, terminateWhen, onTermination); + } + + /////////////////////////////////////////////////// + /////////////////////////////////////////////////// + // Queues + + @Override + public IActionQueue createQueue(String name) { + return createQueue(name, false); + } + + @Override + public IActionQueue createQueue(String name, boolean isParallel) { + IActionQueue queue = new ActionQueue(this, name, isParallel).killWhenEmpty(true); + otherQueues.put(name, queue); + return queue; + } + + @Override + public IActionQueue getOrCreateQueue(String name) { + return getOrCreateQueue(name, false); + } + + @Override + public IActionQueue getOrCreateQueue(String name, boolean isParallel) { + IActionQueue queue = getQueue(name); + + if (queue == null) + queue = createQueue(name, isParallel); + return queue; + } + + @Override + public IActionQueue getQueue(String name) { + return otherQueues.get(name); + } + + @Override + public boolean hasQueue(String name) { + return otherQueues.containsKey(name); + } + + @Override + public boolean removeQueue(String name) { + IActionQueue queue = otherQueues.get(name); + + if (queue == null) + return false; + + queue.kill(); + return true; + } + + /////////////////////////////////////////////////// + /////////////////////////////////////////////////// + // Sequential + + @Override + public IActionQueue getSequentialQueue() { + return sequentialQueue; + } + + @Override + public IAction schedule(IAction action) { + if (action instanceof IConditionalAction) + return conditionalQueue.schedule(action); + + return sequentialQueue.schedule(action); + } + + @Override + public void schedule(IAction... actions) { + sequentialQueue.schedule(actions); + } + + @Override + public void schedule(Consumer... tasks) { + sequentialQueue.schedule(tasks); + } + + @Override + public IAction schedule(Consumer task) { + return sequentialQueue.schedule(task); + } + + @Override + public IAction schedule(int delay, Consumer task) { + return sequentialQueue.schedule(delay, task); + } + + @Override + public IAction schedule(int maxDuration, int delay, Consumer task) { + return sequentialQueue.schedule(maxDuration, delay, task); + } + + @Override + public IAction schedule(String name, Consumer task) { + return sequentialQueue.schedule(name, task); + } + + @Override + public IAction schedule(String name, int delay, Consumer task) { + return sequentialQueue.schedule(name, delay, task); + } + + @Override + public IAction schedule(String name, int maxDuration, int delay, Consumer task) { + return sequentialQueue.schedule(name, maxDuration, delay, task); + } + + @Override + public IAction scheduleActionAt(int index, IAction action) { + return sequentialQueue.scheduleActionAt(index, action); + } + + /////////////////////////////////////////////////// + /////////////////////////////////////////////////// + // Parallels + + @Override + public IActionQueue getParallelQueue() { + return parallelQueue; + } + + @Override + public IAction scheduleParallel(IAction action) { + return parallelQueue.schedule(action); + } + + @Override + public void scheduleParallel(IAction... actions) { + parallelQueue.schedule(actions); + } + + @Override + public void scheduleParallel(Consumer... tasks) { + parallelQueue.schedule(tasks); + } + + @Override + public IAction scheduleParallel(Consumer task) { + return parallelQueue.schedule(task); + } + + @Override + public IAction scheduleParallel(int delay, Consumer task) { + return parallelQueue.schedule(delay, task); + } + + @Override + public IAction scheduleParallel(int maxDuration, int delay, Consumer task) { + return parallelQueue.schedule(maxDuration, delay, task); + } + + @Override + public IAction scheduleParallel(String name, Consumer task) { + return parallelQueue.schedule(name, task); + } + + @Override + public IAction scheduleParallel(String name, int delay, Consumer task) { + return parallelQueue.schedule(delay, task); + } + + @Override + public IAction scheduleParallel(String name, int maxDuration, int delay, Consumer task) { + return parallelQueue.schedule(name, maxDuration, delay, task); + } + + /////////////////////////////////////////////////// + /////////////////////////////////////////////////// + // Conditionals + + @Override + public IActionQueue getConditionalQueue() { + return conditionalQueue; + } + + @Override + public IConditionalAction schedule(IConditionalAction action) { + return (IConditionalAction) conditionalQueue.schedule(action); + } + + @Override + public void schedule(IConditionalAction... actions) { + conditionalQueue.schedule(actions); + } + + @Override + public IConditionalAction schedule(Function condition, Consumer task) { + return schedule(new ConditionalAction(this, condition, task)); + } + + @Override + public IConditionalAction schedule(Function condition, Consumer task, Function terminateWhen) { + return schedule(new ConditionalAction(this, condition, task, terminateWhen)); + } + + @Override + public IConditionalAction schedule(Function condition, Consumer task, Function terminateWhen, Consumer onTermination) { + return schedule(new ConditionalAction(this, condition, task, terminateWhen, onTermination)); + } + + + @Override + public IConditionalAction schedule(String name, Function condition, Consumer task) { + return schedule(new ConditionalAction(this, name, condition, task)); + } + + @Override + public IConditionalAction schedule(String name, Function condition, Consumer task, Function terminateWhen) { + return schedule(new ConditionalAction(this, name, condition, task, terminateWhen)); + } + + @Override + public IConditionalAction schedule(String name, Function condition, Consumer task, Function terminateWhen, Consumer onTermination) { + return schedule(new ConditionalAction(this, name, condition, task, terminateWhen, onTermination)); + } + + /////////////////////////////////////////////////// + /////////////////////////////////////////////////// + // Handling + + @Override + public IActionQueue[] getAllQueues() { + ArrayList allQueues = new ArrayList<>(); + + allQueues.add(sequentialQueue); + allQueues.add(parallelQueue); + allQueues.add(conditionalQueue); + + allQueues.addAll(otherQueues.values()); + + return allQueues.toArray(new IActionQueue[0]); + } + + public boolean hasActiveTasks() { + return Arrays.stream(getAllQueues()).anyMatch(queue -> queue.hasActiveTasks()); + } + + @Override + public boolean hasAny(String name) { + return getAny(name) != null; + } + + @Override + public IAction getAny(String name) { + IAction act = sequentialQueue.get(name); + if (act != null) + return act; + + act = parallelQueue.get(name); + if (act != null) + return act; + + act = conditionalQueue.get(name); + if (act != null) + return act; + + for (IActionQueue q : otherQueues.values()) { + act = q.get(name); + if (act != null) + return act; + } + + return null; + } + + @Override + public boolean cancelAny(String name) { + boolean canceled = sequentialQueue.cancel(name); + if (canceled) + return true; + + canceled = parallelQueue.cancel(name); + if (canceled) + return true; + + canceled = conditionalQueue.cancel(name); + if (canceled) + return true; + + for (IActionQueue queue : otherQueues.values()) + if (queue.cancel(name)) + return true; + + return false; + } + + /** + * Call once per tick from your main loop. + */ + public void tick() { + if (!isWorking) return; + + boolean active = hasActiveTasks(); + if (debug && active) + LOGGER.beginTick(this).log("Started Tick Cycle", this); + + // ─── Sequential (head only) ───────────────────────────────── + sequentialQueue.tick(); + + // ─── Parallel (all) ─────────────────────────────────────── + parallelQueue.tick(); + + // ─── Conditionals ───────────────────────────────────────── + conditionalQueue.tick(); + + // ─── Other Queues ───────────────────────────────────────── + Iterator it = otherQueues.values().iterator(); + while (it.hasNext()) { + IActionQueue other = it.next(); + ((ActionQueue) other).tick(); + + if (other.isDead()) { + other.clear(); + if (debug) + LOGGER.log(String.format("Removing queue '%s' from '%s'", other.getName(), getInternalName()), this); + it.remove(); + } + } + // ─── All Listeners ───────────────────────────────────────── + // IActionListener Comments +// if (this == GLOBAL) { +// listeners.forEach((obj, listener) -> ((ActionListener) listener).tick()); +// } + + if (debug && active) + LOGGER.finish("Finished Tick Cycle", this); + } + + @Override + public void clear() { + sequentialQueue.clear(); + parallelQueue.clear(); + conditionalQueue.clear(); + otherQueues.forEach((name, queue) -> queue.clear()); + + if (debug) + LOGGER.log("Cleared all queues!", this); + } + + public String getInternalName() { + return name.isEmpty() ? "Action Manager" : name; + } + + @Override + public IActionChain chain() { + return sequentialQueue.chain(); + } + + @Override + public IActionChain parallelChain() { + return parallelQueue.chain(); + } + + @Override + public String printQueues() { + + StringBuilder sb = new StringBuilder(); + sb.append(String.format("ActionManager [working=%s]\n", isWorking)); + + + int i = 0; + for (IActionQueue action : getAllQueues()) { + sb.append(String.format(" [%d] %s\n", i++, action.toString())); + } + + return sb.toString(); + } +} diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java b/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java new file mode 100644 index 000000000..0b3d0b483 --- /dev/null +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java @@ -0,0 +1,399 @@ +package noppes.npcs.controllers.data.action; + +import noppes.npcs.api.handler.IActionManager; +import noppes.npcs.api.handler.data.IAction; +import noppes.npcs.api.handler.data.IActionChain; +import noppes.npcs.api.handler.data.IActionQueue; +import noppes.npcs.controllers.data.action.chain.ActionChain; + +import java.util.ArrayList; +import java.util.Deque; +import java.util.Iterator; +import java.util.List; +import java.util.Queue; +import java.util.concurrent.ConcurrentLinkedDeque; +import java.util.function.Consumer; + +public class ActionQueue implements IActionQueue { + protected final Deque queue = new ConcurrentLinkedDeque<>(); + protected final ActionManager manager; + protected final String name; + + protected boolean isWorking = true; + protected boolean isParallel; + + protected boolean isDead; + protected boolean stopWhenEmpty; + + protected boolean killWhenEmpty; + protected int killWhenEmptyAfter = 100; + + protected Action autoKill; + + public ActionQueue(ActionManager manager, String name) { + this.manager = manager; + this.name = name; + } + + public ActionQueue(ActionManager manager, String name, boolean isParallel) { + this(manager, name); + this.isParallel = isParallel; + } + + @Override + public IActionQueue start() { + isWorking = true; + return this; + } + + @Override + public IActionQueue stop() { + isWorking = false; + return this; + } + + @Override + public IActionManager getManager() { + return manager; + } + + @Override + public String getName() { + return name; + } + + @Override + public Queue getQueue() { + return queue; + } + + @Override + public boolean isParallel() { + return isParallel; + } + + @Override + public IActionQueue setParallel(boolean parallel) { + isParallel = parallel; + return this; + } + + @Override + public boolean isStoppedWhenEmpty() { + return stopWhenEmpty; + } + + @Override + public IActionQueue stopWhenEmpty(boolean stopWhenEmpty) { + this.stopWhenEmpty = stopWhenEmpty; + return this; + } + + @Override + public boolean isKilledWhenEmpty() { + return killWhenEmpty; + } + + @Override + public int getKillWhenEmptyAfter() { + return killWhenEmptyAfter; + } + + @Override + public IActionQueue killWhenEmpty(boolean killWhenEmpty) { + this.killWhenEmpty = killWhenEmpty; + return this; + } + + @Override + public IActionQueue killWhenEmptyAfter(int ticks) { + this.killWhenEmptyAfter = ticks; + return this; + } + + @Override + public boolean isDead() { + return isDead; + } + + @Override + public IActionQueue kill() { + this.isDead = true; + + if (manager.debug) + manager.LOGGER.log(String.format("Killing queue '%s' on '%s'", name, manager.getInternalName()), this); + return this; + } + + /////////////////////////////////////////////////// + /////////////////////////////////////////////////// + // Schedulers + + @Override + public IAction schedule(IAction action) { + Action act = (Action) action; + + if (!isParallel && act.unscheduledList != null) { + act.unscheduledList.scheduleAll(this).forEach((act1) -> act1.unscheduledList = null).kill(); + return action; + } + + act.schedule(this); + return action; + } + + @Override + public void schedule(IAction... actions) { + for (IAction act : actions) + schedule(act); + } + + @Override + public IAction schedule(Consumer task) { + return schedule(manager.create(task)); + } + + @Override + public void schedule(Consumer... tasks) { + for (Consumer task : tasks) + schedule(task); + } + + + @Override + public IAction schedule(int delay, Consumer task) { + return schedule(manager.create(delay, task)); + } + + @Override + public IAction schedule(int maxDuration, int delay, Consumer task) { + return schedule(manager.create(maxDuration, delay, task)); + } + + @Override + public IAction schedule(String name, Consumer task) { + return schedule(manager.create(name, task)); + } + + @Override + public IAction schedule(String name, int delay, Consumer task) { + return schedule(manager.create(name, delay, task)); + } + + @Override + public IAction schedule(String name, int maxDuration, int delay, Consumer task) { + return schedule(manager.create(name, maxDuration, delay, task)); + } + + @Override + public IAction scheduleActionAt(int index, IAction action) { + int size = queue.size(); + if (index <= 0) { + queue.addFirst(action); + } else if (index >= size) { + queue.addLast(action); + } else { + List tmp = new ArrayList<>(queue); + tmp.add(index, action); + queue.clear(); + queue.addAll(tmp); + } + ((Action) action).queue = this; + ((Action) action).isScheduled = true; + return action; + } + + /////////////////////////////////////////////////// + /////////////////////////////////////////////////// + // Queue Data + + @Override + public boolean hasActiveTasks() { + return !queue.isEmpty(); + } + + @Override + public int getIndex(IAction action) { + int i = 0; + for (IAction a : queue) { + if (a.equals(action)) + return i; + i++; + } + return -1; + } + + @Override + public IAction getCurrentAction() { + return queue.peekFirst(); + } + + @Override + public boolean has(IAction action) { + return has(action.getName()); + } + + @Override + public boolean has(String actionName) { + for (IAction act : queue) + if (act.getName().equals(actionName)) + return true; + + return false; + } + + @Override + public IAction get(String actionName) { + for (IAction action : queue) { + if (action.getName().equals(actionName)) + return action; + } + + return null; + } + + @Override + public boolean cancel(IAction action) { + if (queue.remove(action)) { + action.kill(); + return true; + } + + return false; + } + + @Override + public boolean cancel(String actionName) { + Iterator acts = queue.iterator(); + while (acts.hasNext()) { + IAction act = acts.next(); + if (act.getName().equals(actionName)) { + act.kill(); + acts.remove(); + return true; + } + } + return false; + } + + /////////////////////////////////////////////////// + /////////////////////////////////////////////////// + // Handling + + public boolean finish(Action a) { + if (a.isDone()) { + if (a.onDone != null) + a.execute("onDone", a::executeOnDone); + + a.kill(); + + if (manager.debug) + manager.LOGGER.finish(String.format("Removing %s from queue", a.getIdentifier()), this); + return true; + } + + return false; + } + + protected boolean tick(Action a) { + if (a == null) + return false; + + boolean wasDone = a.isDone(); + if (manager.debug && !wasDone) + manager.LOGGER.push(this).log(String.format("Started ticking %s", a.getIdentifier(), a.name), this).push(a); + + a.tick(); + + if (manager.debug && !wasDone) + manager.LOGGER.pop().finish(String.format("Finished ticking %s", a.getIdentifier(), a.name), this).pop(); + + return finish(a); + } + + protected void tick() { + if (!isWorking || isDead) + return; + + boolean active = hasActiveTasks(); + if (manager.debug && active) + manager.LOGGER.push(manager).log(String.format("Started ticking queue '%s' ", name), manager).push(this); + + if (!isParallel) { + if (tick((Action) getCurrentAction())) + queue.pollFirst(); + } else { + Iterator pit = queue.iterator(); + while (pit.hasNext()) + if (tick((Action) pit.next())) + pit.remove(); + } + + if (stopWhenEmpty && !hasActiveTasks()) + stop(); + + killWhenEmpty(); + + if (manager.debug && active) + manager.LOGGER.pop().finish(String.format("Finished ticking queue '%s' ", name), manager).pop(); + } + + protected void killWhenEmpty() { + if (killWhenEmpty && !hasActiveTasks() && autoKill == null) { + if (manager.debug) + manager.LOGGER.log(String.format("Queue is empty! Killing in %s ticks", killWhenEmptyAfter), this); + + autoKill = (Action) manager.create(String.format("Kill '%s'", name), killWhenEmptyAfter, (act) -> { + if (hasActiveTasks()) { + if (manager.debug) + manager.LOGGER.log("Scheduled Actions found! Aborted kill process", this); + return; + } + + manager.removeQueue(name); + }).everyTick().once(); + } + + if (autoKill != null) { + autoKill.tick(); + if (autoKill.isDone()) + autoKill = null; + } + } + + @Override + public void clear() { + queue.forEach((act) -> act.kill()); + queue.clear(); + + if (manager.debug) + manager.LOGGER.log("Cleared queue!", this); + } + + @Override + public IActionChain chain() { + return new ActionChain(manager, this, isParallel ? "parallel#" : "sequential#"); + } + + @Override + public String printQueue() { + if (queue.isEmpty()) { + return String.format("ActionQueue[name=%s] is empty", name); + } + + StringBuilder sb = new StringBuilder(); + sb.append(String.format("%s\n", this)); + + int i = 0; + for (IAction action : queue) { + sb.append(String.format(" [%d] %s\n", i++, action.toString())); + } + + return sb.toString(); + } + + public String toString() { + return String.format("ActionQueue '%s' [size=%d, parallel=%s, working=%s, dead=%s, killWhenEmpty=%s, killAfter=%d]", name, queue.size(), isParallel, isWorking, isDead, killWhenEmpty, killWhenEmptyAfter); + } + +} diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java b/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java new file mode 100644 index 000000000..37e06c982 --- /dev/null +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java @@ -0,0 +1,168 @@ +package noppes.npcs.controllers.data.action; + +import noppes.npcs.api.handler.data.IAction; + +import java.util.Queue; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentLinkedQueue; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.concurrent.atomic.AtomicReference; +import java.util.function.Function; + +public class ActionThread { + private Action action; + + private final Object lock = new Object(); + private Thread thread; + ExecutorService executor; + + private final Queue> runningTasks = new ConcurrentLinkedQueue<>(); + private final Set runningKeys = ConcurrentHashMap.newKeySet(); + + private volatile boolean threadPaused, threadSleeping; + + private Function pauseUntil; + + public ActionThread(Action action) { + this.action = action; + executor = Executors.newSingleThreadExecutor(r -> { + thread = new Thread(r); + thread.setName(String.format("ActionThread (%s)", action.getName())); + return thread; + }); + + if (action.manager.debug) + action.manager.LOGGER.log("Created Action thread!", this); + } + + public void stop() { + runningTasks.forEach((task) -> { + if (!task.isDone()) + task.cancel(true); + }); + + executor.shutdown(); + + + if (action.manager.debug) + action.manager.LOGGER.log("Stopping thread", this); + } + + public Action getAction() { + return action; + } + + public void pauseFor(long millis) { + if (isPaused() || !inActionThread()) + return; + + try { + threadSleeping = true; + if (action.manager.debug) + action.manager.LOGGER.log(String.format("Sleeping thread for %s ticks", millis / 50), this); + + Thread.sleep(millis); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + } finally { + threadSleeping = false; + + if (action.manager.debug) + action.manager.LOGGER.log(String.format("Woken up thread after sleeping for %s ticks", millis / 50), this); + } + } + + public void pauseFor(int ticks) { + pauseFor(ticks * 50L); + } + + public void pause() { + if (!inActionThread() || isPaused()) + return; + + threadPaused = true; + synchronized (lock) { + while (threadPaused) { + try { + if (action.manager.debug) + action.manager.LOGGER.log(String.format("Pausing thread"), this); + + lock.wait(); // Wait until notified + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + } + } + } + } + + public void pauseUntil(Function until) { + this.pauseUntil = until; + pause(); + } + + public void resume() { + synchronized (lock) { + if (threadPaused) { + threadPaused = false; + lock.notify(); + + if (action.manager.debug) + action.manager.LOGGER.log(String.format("Resumed thread"), this); + } + + if (threadSleeping) + thread.interrupt(); + } + } + + public boolean isTaskRunning(String taskKey) { + return runningKeys.contains(taskKey); + } + + public boolean inActionThread() { + return Thread.currentThread() == thread; + } + + public boolean isPaused() { + return threadPaused || threadSleeping; + } + + public boolean isThreadRunning() { + return runningTasks.stream().anyMatch(task -> !task.isDone()); + } + + public void execute(String taskKey, Runnable task) { + if (threadPaused && pauseUntil != null && pauseUntil.apply(action)) + resume(); + + if (!runningKeys.add(taskKey)) + return; + + if (action.manager.debug) + action.manager.LOGGER.log(String.format("Delegating task '%s' to Action thread...", taskKey), action); + + final AtomicReference> taskRef = new AtomicReference<>(); + taskRef.set(executor.submit(() -> { + if (action.manager.debug) + action.manager.LOGGER.log(String.format("Started executing task '%s' on Action thread...", taskKey), this); + + runningTasks.add(taskRef.get()); + try { + task.run(); + } finally { + runningTasks.remove(taskRef.get()); + runningKeys.remove(taskKey); + + if (action.manager.debug) + action.manager.LOGGER.log(String.format("Finished executing task '%s' on Action thread", taskKey), this); + + if (((ActionQueue) action.queue).finish(action)) + action.queue.getQueue().remove(action); + + } + })); + } +} diff --git a/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java b/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java deleted file mode 100644 index 9baf1d999..000000000 --- a/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java +++ /dev/null @@ -1,158 +0,0 @@ -package noppes.npcs.controllers.data.action; - -import noppes.npcs.api.handler.data.IAction; -import noppes.npcs.api.handler.data.actions.IConditionalAction; -import noppes.npcs.scripted.ScriptedActionManager; - -import java.util.function.Consumer; -import java.util.function.Supplier; - -public class ConditionalAction extends Action implements IConditionalAction { - private Supplier condition; - private Supplier terminateWhen; - private Consumer onTermination; - private int maxChecks = -1; - private int checkCount; - private boolean taskExecuted; - - public ConditionalAction(ScriptedActionManager manager, Supplier condition, Consumer task) { - super(manager, "conditional", task); - this.condition = condition; - } - - public ConditionalAction(ScriptedActionManager manager, String name, Supplier condition, Consumer task) { - super(manager, name, task); - this.condition = condition; - } - - public ConditionalAction(ScriptedActionManager manager, Supplier condition, Consumer task, Supplier terminateWhen) { - this(manager, condition, task); - this.terminateWhen = terminateWhen; - } - - public ConditionalAction(ScriptedActionManager manager, String name, Supplier condition, Consumer task, Supplier terminateWhen) { - this(manager, name, condition, task); - this.terminateWhen = terminateWhen; - } - - public ConditionalAction(ScriptedActionManager manager, Supplier condition, Consumer task, Supplier terminateWhen, Consumer onTermination) { - this(manager, condition, task, terminateWhen); - this.onTermination = onTermination; - } - - public ConditionalAction(ScriptedActionManager manager, String name, Supplier condition, Consumer task, Supplier terminateWhen, Consumer onTermination) { - this(manager, name, condition, task, terminateWhen); - this.onTermination = onTermination; - } - - @Override - public void tick(int ticksExisted) { - if (isDone()) return; - - try { - if (ticksExisted % updateEveryXTick == 0) { - checkCount++; - boolean terminated = terminateWhen != null && terminateWhen.get(); - - if (terminated && onTermination != null) { - try { - onTermination.accept(this); - } catch (Throwable t) { - System.err.println("Error in onTermination for conditional '" + getName() + "':"); - t.printStackTrace(); - } - } - - if ((maxChecks >= 0 && checkCount > maxChecks) || terminated) { - markDone(); - return; - } - - if (condition != null && condition.get()) { - task.accept(this); - taskExecuted = true; - } - } - } catch (Throwable t) { - System.err.println("Scripted conditional '" + getName() + "' threw an exception:"); - t.printStackTrace(); - markDone(); - } finally { - duration++; - } - } - - @Override - public IConditionalAction setMaxChecks(int maxChecks) { - this.maxChecks = maxChecks; - return this; - } - - @Override - public IConditionalAction setCondition(Supplier condition) { - this.condition = condition; - return this; - } - - @Override - public IConditionalAction terminateWhen(Supplier terminateWhen) { - this.terminateWhen = terminateWhen; - return this; - } - - @Override - public IConditionalAction onTermination(Consumer onTermination) { - this.onTermination = onTermination; - return this; - } - - @Override - public boolean wasTaskExecuted() { - return taskExecuted; - } - - @Override - public int getCheckCount() { - return checkCount; - } - - @Override - public int getMaxChecks() { - return maxChecks; - } - - @Override - public IConditionalAction after(IConditionalAction after) { - return ((ScriptedActionManager) manager).scheduleAction(after); - } - - @Override - public IConditionalAction after(Supplier condition, Consumer task) { - return after(manager.create(condition, task)); - } - - @Override - public IConditionalAction after(String name, Supplier condition, Consumer task) { - return after(manager.create(name, condition, task)); - } - - @Override - public IConditionalAction after(Supplier condition, Consumer task, Supplier terminateWhen) { - return after(manager.create(condition, task, terminateWhen)); - } - - @Override - public IConditionalAction after(String name, Supplier condition, Consumer task, Supplier terminateWhen) { - return after(manager.create(name, condition, task, terminateWhen)); - } - - @Override - public IConditionalAction after(Supplier condition, Consumer task, Supplier terminateWhen, Consumer onTermination) { - return after(manager.create(condition, task, terminateWhen, onTermination)); - } - - @Override - public IConditionalAction after(String name, Supplier condition, Consumer task, Supplier terminateWhen, Consumer onTermination) { - return after(manager.create(name, condition, task, terminateWhen, onTermination)); - } -} diff --git a/src/main/java/noppes/npcs/controllers/data/action/ParallelActionChain.java b/src/main/java/noppes/npcs/controllers/data/action/ParallelActionChain.java deleted file mode 100644 index d437d80b1..000000000 --- a/src/main/java/noppes/npcs/controllers/data/action/ParallelActionChain.java +++ /dev/null @@ -1,40 +0,0 @@ -package noppes.npcs.controllers.data.action; - -import noppes.npcs.api.handler.data.IAction; -import noppes.npcs.api.handler.data.IActionChain; -import noppes.npcs.scripted.ScriptedActionManager; - -import java.util.function.Consumer; - -public class ParallelActionChain implements IActionChain { - private final ScriptedActionManager scriptedActionManager; - private int offset = 0, idx = 0; - - public ParallelActionChain(ScriptedActionManager scriptedActionManager) { - this.scriptedActionManager = scriptedActionManager; - } - - /** - * schedule the next task ‘delay’ ticks after the previous one, fully in parallel - */ - @Override - public IActionChain after(int delay, String name, Consumer task) { - offset += delay; - Consumer wrapper = act -> { - task.accept(act); - act.markDone(); - }; - IAction a = scriptedActionManager.create(name, - offset, - wrapper); - idx++; - a.setUpdateEveryXTick(1); - scriptedActionManager.scheduleParallelAction(a); - return this; - } - - @Override - public IActionChain after(int delay, Consumer task) { - return after(delay, "parallel#" + idx, task); - } -} diff --git a/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java b/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java new file mode 100644 index 000000000..7bcd0ef97 --- /dev/null +++ b/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java @@ -0,0 +1,173 @@ +package noppes.npcs.controllers.data.action.action; + +import noppes.npcs.api.handler.data.IAction; +import noppes.npcs.api.handler.data.actions.IConditionalAction; +import noppes.npcs.controllers.data.action.Action; +import noppes.npcs.controllers.data.action.ActionManager; + +import java.util.function.Consumer; +import java.util.function.Function; + + +public class ConditionalAction extends Action implements IConditionalAction { + protected Function condition; + protected Function terminateWhen; + protected Consumer onTermination; + protected int maxChecks = -1; + protected int checkCount; + protected boolean taskExecuted; + + public ConditionalAction(ActionManager manager, Function condition, Consumer task) { + super(manager, task); + this.condition = condition; + } + + public ConditionalAction(ActionManager manager, String name, Function condition, Consumer task) { + super(manager, name, task); + this.condition = condition; + } + + public ConditionalAction(ActionManager manager, Function condition, Consumer task, Function terminateWhen) { + this(manager, condition, task); + this.terminateWhen = terminateWhen; + } + + public ConditionalAction(ActionManager manager, String name, Function condition, Consumer task, Function terminateWhen) { + this(manager, name, condition, task); + this.terminateWhen = terminateWhen; + } + + public ConditionalAction(ActionManager manager, Function condition, Consumer task, Function terminateWhen, Consumer onTermination) { + this(manager, condition, task, terminateWhen); + this.onTermination = onTermination; + } + + public ConditionalAction(ActionManager manager, String name, Function condition, Consumer task, Function terminateWhen, Consumer onTermination) { + this(manager, name, condition, task, terminateWhen); + this.onTermination = onTermination; + } + + @Override + public int getCheckCount() { + return checkCount; + } + + @Override + public int getMaxChecks() { + return maxChecks; + } + + @Override + public IConditionalAction setMaxChecks(int maxChecks) { + this.maxChecks = Math.max(-1, maxChecks); + return this; + } + + @Override + public IConditionalAction setCondition(Function condition) { + this.condition = condition; + return this; + } + + @Override + public IConditionalAction terminateWhen(Function terminateWhen) { + this.terminateWhen = terminateWhen; + return this; + } + + @Override + public IConditionalAction onTermination(Consumer onTermination) { + this.onTermination = onTermination; + return this; + } + + @Override + public boolean wasTaskExecuted() { + return taskExecuted; + } + + @Override + public boolean isTerminated() { + return terminateWhen != null && terminateWhen.apply(this); + } + + public void inheritedTick() { + if (manager.inDebugMode()) + manager.LOGGER.log(String.format("Ticking... (duration = %s/%s, count = %s/%s, checkCount = %s/%s)", duration, maxDuration, count, maxCount, checkCount, maxChecks), this); + + if (maxChecks > -1 && checkCount >= maxChecks) { + if (manager.inDebugMode()) + manager.LOGGER.log("Reached max check count", this); + + markDone(); + return; + } + + if (duration % updateEveryXTick == 0) { + checkCount++; + + Runnable execute = () -> { + if (condition != null && condition.apply(this)) + executeTask(); + + if (isTerminated()) { + if (onTermination != null) + executeOnTermination(); + markDone(); + } + }; + + execute("task", execute); + } + } + + protected void executeTask() { + if (manager.inDebugMode()) + manager.LOGGER.log("Executing task...", this); + + try { + task.accept(this); + count++; + taskExecuted = true; + } catch (Throwable t) { + manager.LOGGER.error("Task of " + this + " threw an exception:", t); + markDone(); + } + + if (manager.inDebugMode()) + manager.LOGGER.log(String.format("Finished executing task (count = %s/%s)", count, maxCount), this); + + } + + protected void executeOnTermination() { + if (manager.inDebugMode()) + manager.LOGGER.log("Executing onTermination task...", this); + + try { + onTermination.accept(this); + } catch (Throwable t) { + manager.LOGGER.error("Termination Task of " + this + " threw an exception:", t); + } + + if (manager.inDebugMode()) + manager.LOGGER.log("Finished executing onTermination task", this); + } + + + public String toString() { + return String.format("%s [queue='%s', scheduled=%s, done=%s, paused=%s, updateEvery=%s, duration=%d/%d, count=%d/%d, checks=%d/%d, taskExecuted=%s, threaded=%s]", getIdentifier(), getQueueName(), + isScheduled, + done, + isPaused(), + updateEveryXTick, + duration, + maxDuration, + count, + maxCount, + checkCount, + maxChecks, + taskExecuted, + isThreaded + ); + } +} diff --git a/src/main/java/noppes/npcs/controllers/data/action/chain/ActionChain.java b/src/main/java/noppes/npcs/controllers/data/action/chain/ActionChain.java new file mode 100644 index 000000000..c5940a2a6 --- /dev/null +++ b/src/main/java/noppes/npcs/controllers/data/action/chain/ActionChain.java @@ -0,0 +1,63 @@ +package noppes.npcs.controllers.data.action.chain; + +import noppes.npcs.api.handler.data.IAction; +import noppes.npcs.api.handler.data.IActionChain; +import noppes.npcs.api.handler.data.IActionQueue; +import noppes.npcs.controllers.data.action.ActionManager; + +import java.util.function.Consumer; + +/** + * helper to build a back‐to‐back chain of one‐shot actions + */ +public class ActionChain implements IActionChain { + protected final ActionManager manager; + protected final IActionQueue queue; + protected String name; + protected int index = 0, offset; + + public ActionChain(ActionManager manager, IActionQueue queue, String name) { + this.manager = manager; + this.queue = queue; + this.name = name; + } + + @Override + public IActionQueue getQueue() { + return queue; + } + + @Override + public String getName() { + return name; + } + + @Override + public IActionChain setName(String name) { + this.name = name; + return this; + } + + @Override + public IActionChain start() { + manager.start(); + return this; + } + + /** + * schedule the next task ‘delay’ ticks after the previous one + */ + @Override + public IActionChain after(int delay, String name, Consumer task) { + offset = queue.isParallel() ? offset + delay : delay; + queue.schedule(name, offset, task).everyTick().once(); + index++; + return this; + } + + @Override + public IActionChain after(int delay, Consumer task) { + return after(delay, name + index, task); + } + +} diff --git a/src/main/java/noppes/npcs/entity/EntityNPCFlying.java b/src/main/java/noppes/npcs/entity/EntityNPCFlying.java index fde3a2561..92ad030c5 100644 --- a/src/main/java/noppes/npcs/entity/EntityNPCFlying.java +++ b/src/main/java/noppes/npcs/entity/EntityNPCFlying.java @@ -35,6 +35,11 @@ public abstract class EntityNPCFlying extends EntityNPCInterface { return false; } + @Override + public void onLivingUpdate() { + super.onLivingUpdate(); + } + public void moveEntityWithHeading(float p_70612_1_, float p_70612_2_) { if (!this.canFly() || this.hurtTime != 0 || !this.canBreathe()) { super.moveEntityWithHeading(p_70612_1_, p_70612_2_); diff --git a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java index c79354347..bc35d2038 100644 --- a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java +++ b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java @@ -21,9 +21,24 @@ import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; import net.minecraft.command.ICommandSender; import net.minecraft.command.IEntitySelector; -import net.minecraft.entity.*; -import net.minecraft.entity.ai.*; +import net.minecraft.entity.DataWatcher; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityCreature; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.EnumCreatureAttribute; +import net.minecraft.entity.IRangedAttackMob; +import net.minecraft.entity.NPCEntityHelper; +import net.minecraft.entity.SharedMonsterAttributes; +import net.minecraft.entity.ai.EntityAIAttackOnCollide; +import net.minecraft.entity.ai.EntityAIBase; +import net.minecraft.entity.ai.EntityAIHurtByTarget; +import net.minecraft.entity.ai.EntityAILeapAtTarget; +import net.minecraft.entity.ai.EntityAIOpenDoor; +import net.minecraft.entity.ai.EntityAIRestrictSun; +import net.minecraft.entity.ai.EntityAISwimming; +import net.minecraft.entity.ai.EntityAITasks; import net.minecraft.entity.ai.EntityAITasks.EntityAITaskEntry; +import net.minecraft.entity.ai.EntityMoveHelper; import net.minecraft.entity.boss.IBossDisplayData; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.monster.EntityMob; @@ -42,18 +57,60 @@ import net.minecraft.network.play.server.S0BPacketAnimation; import net.minecraft.pathfinding.PathNavigate; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; -import net.minecraft.util.*; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.DamageSource; +import net.minecraft.util.IChatComponent; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraft.world.WorldServer; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.event.ServerChatEvent; -import noppes.npcs.*; +import noppes.npcs.CustomItems; +import noppes.npcs.CustomNpcs; +import noppes.npcs.DataAI; +import noppes.npcs.DataAdvanced; +import noppes.npcs.DataDisplay; +import noppes.npcs.DataInventory; +import noppes.npcs.DataStats; +import noppes.npcs.EventHooks; +import noppes.npcs.IChatMessages; +import noppes.npcs.NBTTags; +import noppes.npcs.NoppesUtilPlayer; +import noppes.npcs.NoppesUtilServer; +import noppes.npcs.NpcDamageSource; +import noppes.npcs.VersionCompatibility; +import noppes.npcs.ai.CombatHandler; +import noppes.npcs.ai.EntityAIAmbushTarget; +import noppes.npcs.ai.EntityAIAnimation; +import noppes.npcs.ai.EntityAIAttackTarget; +import noppes.npcs.ai.EntityAIAvoidTarget; +import noppes.npcs.ai.EntityAIBustDoor; +import noppes.npcs.ai.EntityAIDodgeShoot; +import noppes.npcs.ai.EntityAIFindShade; +import noppes.npcs.ai.EntityAIFollow; +import noppes.npcs.ai.EntityAIJob; +import noppes.npcs.ai.EntityAILook; import noppes.npcs.ai.EntityAIMoveIndoors; +import noppes.npcs.ai.EntityAIMovingPath; +import noppes.npcs.ai.EntityAIOrbitTarget; import noppes.npcs.ai.EntityAIPanic; +import noppes.npcs.ai.EntityAIPounceTarget; +import noppes.npcs.ai.EntityAIRangedAttack; +import noppes.npcs.ai.EntityAIReturn; +import noppes.npcs.ai.EntityAIRole; +import noppes.npcs.ai.EntityAISprintToTarget; +import noppes.npcs.ai.EntityAIStalkTarget; +import noppes.npcs.ai.EntityAITransform; import noppes.npcs.ai.EntityAIWander; import noppes.npcs.ai.EntityAIWatchClosest; -import noppes.npcs.ai.*; +import noppes.npcs.ai.EntityAIWaterNav; +import noppes.npcs.ai.EntityAIWorldLines; +import noppes.npcs.ai.EntityAIZigZagTarget; import noppes.npcs.ai.pathfinder.FlyingMoveHelper; import noppes.npcs.ai.pathfinder.PathNavigateFlying; import noppes.npcs.ai.selector.NPCAttackSelector; @@ -66,21 +123,47 @@ import noppes.npcs.api.handler.data.ILine; import noppes.npcs.api.item.IItemStack; import noppes.npcs.client.EntityUtil; import noppes.npcs.config.ConfigMain; -import noppes.npcs.constants.*; +import noppes.npcs.config.ConfigScript; +import noppes.npcs.constants.EnumAnimation; +import noppes.npcs.constants.EnumCombatPolicy; +import noppes.npcs.constants.EnumJobType; +import noppes.npcs.constants.EnumMovingType; +import noppes.npcs.constants.EnumNavType; +import noppes.npcs.constants.EnumPotionType; +import noppes.npcs.constants.EnumRoleType; +import noppes.npcs.constants.EnumStandingType; import noppes.npcs.controllers.FactionController; import noppes.npcs.controllers.LinkedNpcController; import noppes.npcs.controllers.LinkedNpcController.LinkedData; -import noppes.npcs.controllers.data.*; +import noppes.npcs.controllers.data.DataScript; +import noppes.npcs.controllers.data.DataTransform; +import noppes.npcs.controllers.data.Dialog; +import noppes.npcs.controllers.data.DialogOption; +import noppes.npcs.controllers.data.Faction; +import noppes.npcs.controllers.data.Line; +import noppes.npcs.controllers.data.Party; +import noppes.npcs.controllers.data.PlayerData; +import noppes.npcs.controllers.data.PlayerQuestData; +import noppes.npcs.controllers.data.QuestData; +import noppes.npcs.controllers.data.action.ActionManager; import noppes.npcs.entity.data.DataTimers; -import noppes.npcs.roles.*; +import noppes.npcs.roles.JobBard; +import noppes.npcs.roles.JobFollower; +import noppes.npcs.roles.JobInterface; +import noppes.npcs.roles.RoleCompanion; +import noppes.npcs.roles.RoleFollower; +import noppes.npcs.roles.RoleInterface; import noppes.npcs.scripted.NpcAPI; -import noppes.npcs.scripted.ScriptedActionManager; import noppes.npcs.scripted.entity.ScriptNpc; import noppes.npcs.scripted.event.NpcEvent; import noppes.npcs.util.GameProfileAlt; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.ConcurrentModificationException; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; public abstract class EntityNPCInterface extends EntityCreature implements IEntityAdditionalSpawnData, ICommandSender, IRangedAttackMob, IBossDisplayData { public ICustomNpc wrappedNPC; @@ -97,7 +180,7 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti public DataTimers timers; public CombatHandler combatHandler = new CombatHandler(this); - public ScriptedActionManager actionManager = new ScriptedActionManager(); + public ActionManager actionManager = new ActionManager(); public String linkedName = ""; public long linkedLast = 0; @@ -366,7 +449,7 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti combatHandler.update(); onCollide(); - actionManager.tick(ticksExisted); + actionManager.tick(); } if (wasKilled != isKilled() && wasKilled) { @@ -643,18 +726,21 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti if (entity instanceof EntityPlayer && DBCAddon.instance.isKO(this, (EntityPlayer) entity)) return; if (!isRemote()) { - if (getAttackTarget() != entity && entity != null) { - NpcEvent.TargetEvent event = new NpcEvent.TargetEvent(wrappedNPC, entity); - if (EventHooks.onNPCTarget(this, event)) - return; + if (getAttackTarget() != entity) { + if (entity != null) { + NpcEvent.TargetEvent event = new NpcEvent.TargetEvent(wrappedNPC, entity); + if (EventHooks.onNPCTarget(this, event)) + return; - if (event.getTarget() == null) - entity = null; - else - entity = event.getTarget().getMCEntity(); - } else { - if (EventHooks.onNPCTargetLost(this, getAttackTarget(), entity)) - return; + if (event.getTarget() == null) + entity = null; + else + entity = event.getTarget().getMCEntity(); + } + if (getAttackTarget() != null) { + if (EventHooks.onNPCTargetLost(this, getAttackTarget(), entity)) + return; + } } if (entity != null && entity != this && ais.onAttack != 3 && !isAttacking()) { Line line = advanced.getAttackLine(); @@ -1168,7 +1254,8 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti setHealth(getMaxHealth()); dataWatcher.updateObject(14, 0); // animation Normal dataWatcher.updateObject(15, 0); - actionManager.clear(); + if (ConfigScript.ClearActionsOnDeath) + actionManager.clear(); combatHandler.reset(); this.setAttackTarget(null); this.setRevengeTarget(null); @@ -1405,6 +1492,8 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti roleInterface.delete(); if (advanced.job != EnumJobType.None && jobInterface != null) jobInterface.delete(); + actionManager.clear(); + super.setDead(); } diff --git a/src/main/java/noppes/npcs/entity/EntityProjectile.java b/src/main/java/noppes/npcs/entity/EntityProjectile.java index 412d4813c..5391ff487 100644 --- a/src/main/java/noppes/npcs/entity/EntityProjectile.java +++ b/src/main/java/noppes/npcs/entity/EntityProjectile.java @@ -23,8 +23,14 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.network.play.server.S27PacketExplosion; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; -import net.minecraft.util.*; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.DamageSource; +import net.minecraft.util.IChatComponent; +import net.minecraft.util.MathHelper; +import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.MovingObjectPosition.MovingObjectType; +import net.minecraft.util.Vec3; import net.minecraft.world.Explosion; import net.minecraft.world.World; import noppes.npcs.DataStats; diff --git a/src/main/java/noppes/npcs/entity/data/ModelPartData.java b/src/main/java/noppes/npcs/entity/data/ModelPartData.java index 53a9a5b19..3aa06ef86 100644 --- a/src/main/java/noppes/npcs/entity/data/ModelPartData.java +++ b/src/main/java/noppes/npcs/entity/data/ModelPartData.java @@ -10,7 +10,7 @@ public class ModelPartData { public byte pattern = 0; public boolean playerTexture; - private ResourceLocation location; + public ResourceLocation location; public ModelPartData() { playerTexture = true; diff --git a/src/main/java/noppes/npcs/items/ItemNpcTool.java b/src/main/java/noppes/npcs/items/ItemNpcTool.java index d4286d8a5..82d528eb2 100644 --- a/src/main/java/noppes/npcs/items/ItemNpcTool.java +++ b/src/main/java/noppes/npcs/items/ItemNpcTool.java @@ -144,16 +144,41 @@ public class ItemNpcTool extends Item { } public static boolean isPaintbrush(ItemStack itemStack) { - if(itemStack == null) + if (itemStack == null) return false; + + if (itemStack.getItem() == null) + return false; + + if (!(itemStack.getItem() instanceof ItemNpcTool)) + return false; + return itemStack.getItemDamage() == 1; } public static boolean isHammer(ItemStack itemStack) { + if (itemStack == null) + return false; + + if (itemStack.getItem() == null) + return false; + + if (!(itemStack.getItem() instanceof ItemNpcTool)) + return false; + return itemStack.getItemDamage() == 0; } public static boolean isMagicBook(ItemStack itemStack) { + if (itemStack == null) + return false; + + if (itemStack.getItem() == null) + return false; + + if (!(itemStack.getItem() instanceof ItemNpcTool)) + return false; + return itemStack.getItemDamage() == 2; } diff --git a/src/main/java/noppes/npcs/quests/QuestDialog.java b/src/main/java/noppes/npcs/quests/QuestDialog.java index ea6bf3e73..6bcedde91 100644 --- a/src/main/java/noppes/npcs/quests/QuestDialog.java +++ b/src/main/java/noppes/npcs/quests/QuestDialog.java @@ -16,7 +16,13 @@ import noppes.npcs.controllers.data.Party; import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.scripted.CustomNPCsException; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.UUID; +import java.util.Vector; public class QuestDialog extends QuestInterface implements IQuestDialog { diff --git a/src/main/java/noppes/npcs/quests/QuestItem.java b/src/main/java/noppes/npcs/quests/QuestItem.java index a9302ff66..1e320258d 100644 --- a/src/main/java/noppes/npcs/quests/QuestItem.java +++ b/src/main/java/noppes/npcs/quests/QuestItem.java @@ -14,7 +14,13 @@ import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.scripted.CustomNPCsException; import noppes.npcs.util.ValueUtil; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import java.util.Vector; public class QuestItem extends QuestInterface implements IQuestItem { public NpcMiscInventory items = new NpcMiscInventory(3); diff --git a/src/main/java/noppes/npcs/quests/QuestKill.java b/src/main/java/noppes/npcs/quests/QuestKill.java index 70f283938..c83a95209 100644 --- a/src/main/java/noppes/npcs/quests/QuestKill.java +++ b/src/main/java/noppes/npcs/quests/QuestKill.java @@ -15,7 +15,13 @@ import noppes.npcs.controllers.data.PlayerQuestData; import noppes.npcs.controllers.data.QuestData; import noppes.npcs.scripted.CustomNPCsException; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; +import java.util.Vector; public class QuestKill extends QuestInterface implements IQuestKill { public TreeMap targets = new TreeMap(); diff --git a/src/main/java/noppes/npcs/quests/QuestManual.java b/src/main/java/noppes/npcs/quests/QuestManual.java index 80a59709e..c9b14a165 100644 --- a/src/main/java/noppes/npcs/quests/QuestManual.java +++ b/src/main/java/noppes/npcs/quests/QuestManual.java @@ -14,8 +14,12 @@ import noppes.npcs.controllers.data.PlayerQuestData; import noppes.npcs.controllers.data.QuestData; import noppes.npcs.scripted.CustomNPCsException; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; import java.util.Map.Entry; +import java.util.TreeMap; +import java.util.Vector; public class QuestManual extends QuestInterface { public TreeMap manuals = new TreeMap(); diff --git a/src/main/java/noppes/npcs/roles/JobSpawner.java b/src/main/java/noppes/npcs/roles/JobSpawner.java index a533a7625..42a509e5a 100644 --- a/src/main/java/noppes/npcs/roles/JobSpawner.java +++ b/src/main/java/noppes/npcs/roles/JobSpawner.java @@ -11,7 +11,11 @@ import noppes.npcs.compat.PixelmonHelper; import noppes.npcs.entity.EntityNPCInterface; import org.apache.commons.lang3.RandomStringUtils; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; public class JobSpawner extends JobInterface { diff --git a/src/main/java/noppes/npcs/roles/RoleCompanion.java b/src/main/java/noppes/npcs/roles/RoleCompanion.java index 39209c238..93fdd9723 100644 --- a/src/main/java/noppes/npcs/roles/RoleCompanion.java +++ b/src/main/java/noppes/npcs/roles/RoleCompanion.java @@ -8,8 +8,13 @@ import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemArmor.ArmorMaterial; +import net.minecraft.item.ItemBow; +import net.minecraft.item.ItemFood; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemSword; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.util.DamageSource; @@ -17,14 +22,28 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.Vec3; import noppes.npcs.NoppesUtilServer; import noppes.npcs.NpcMiscInventory; -import noppes.npcs.constants.*; +import noppes.npcs.constants.EnumAnimation; +import noppes.npcs.constants.EnumCompanionJobs; +import noppes.npcs.constants.EnumCompanionStage; +import noppes.npcs.constants.EnumCompanionTalent; +import noppes.npcs.constants.EnumGuiType; import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.entity.EntityCustomNpc; import noppes.npcs.entity.EntityNPCInterface; -import noppes.npcs.roles.companion.*; +import noppes.npcs.roles.companion.CompanionFarmer; +import noppes.npcs.roles.companion.CompanionFoodStats; +import noppes.npcs.roles.companion.CompanionGuard; +import noppes.npcs.roles.companion.CompanionJobInterface; +import noppes.npcs.roles.companion.CompanionTrader; -import java.util.*; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; +import java.util.Random; +import java.util.TreeMap; +import java.util.UUID; public class RoleCompanion extends RoleInterface { public NpcMiscInventory inventory; diff --git a/src/main/java/noppes/npcs/scripted/NpcAPI.java b/src/main/java/noppes/npcs/scripted/NpcAPI.java index 54d86963d..79a6c2fa6 100644 --- a/src/main/java/noppes/npcs/scripted/NpcAPI.java +++ b/src/main/java/noppes/npcs/scripted/NpcAPI.java @@ -17,10 +17,18 @@ import net.minecraft.entity.passive.EntityAnimal; import net.minecraft.entity.passive.EntityTameable; import net.minecraft.entity.passive.EntityVillager; import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.projectile.EntityArrow; +import net.minecraft.entity.projectile.EntityFishHook; +import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.init.Items; import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemEditableBook; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemWritableBook; import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagString; @@ -32,14 +40,39 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.WorldServer; import net.minecraft.world.biome.BiomeGenBase; +import net.minecraftforge.common.BiomeDictionary; +import net.minecraftforge.common.BiomeDictionary.Type; import noppes.npcs.CustomNpcs; import noppes.npcs.NoppesUtilServer; -import noppes.npcs.api.*; +import noppes.npcs.api.AbstractNpcAPI; +import noppes.npcs.api.IBlock; +import noppes.npcs.api.ICommand; +import noppes.npcs.api.IContainer; +import noppes.npcs.api.IDamageSource; +import noppes.npcs.api.INbt; +import noppes.npcs.api.IParticle; +import noppes.npcs.api.IPos; +import noppes.npcs.api.ISkinOverlay; +import noppes.npcs.api.ITileEntity; +import noppes.npcs.api.IWorld; import noppes.npcs.api.entity.ICustomNpc; import noppes.npcs.api.entity.IEntity; import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.gui.ICustomGui; -import noppes.npcs.api.handler.*; +import noppes.npcs.api.handler.IActionManager; +import noppes.npcs.api.handler.IAnimationHandler; +import noppes.npcs.api.handler.IAttributeHandler; +import noppes.npcs.api.handler.ICloneHandler; +import noppes.npcs.api.handler.ICustomEffectHandler; +import noppes.npcs.api.handler.IDialogHandler; +import noppes.npcs.api.handler.IFactionHandler; +import noppes.npcs.api.handler.IMagicHandler; +import noppes.npcs.api.handler.INaturalSpawnsHandler; +import noppes.npcs.api.handler.IPartyHandler; +import noppes.npcs.api.handler.IProfileHandler; +import noppes.npcs.api.handler.IQuestHandler; +import noppes.npcs.api.handler.IRecipeHandler; +import noppes.npcs.api.handler.ITransportHandler; import noppes.npcs.api.handler.data.IAnimation; import noppes.npcs.api.handler.data.IFrame; import noppes.npcs.api.handler.data.IFramePart; @@ -50,26 +83,74 @@ import noppes.npcs.compat.PixelmonHelper; import noppes.npcs.config.ConfigScript; import noppes.npcs.constants.EnumAnimationPart; import noppes.npcs.containers.ContainerNpcInterface; -import noppes.npcs.controllers.*; +import noppes.npcs.controllers.AnimationController; +import noppes.npcs.controllers.ChunkController; +import noppes.npcs.controllers.CustomEffectController; +import noppes.npcs.controllers.DialogController; +import noppes.npcs.controllers.FactionController; +import noppes.npcs.controllers.MagicController; +import noppes.npcs.controllers.PartyController; +import noppes.npcs.controllers.QuestController; +import noppes.npcs.controllers.RecipeController; +import noppes.npcs.controllers.ScriptController; +import noppes.npcs.controllers.ScriptEntityData; +import noppes.npcs.controllers.ServerCloneController; +import noppes.npcs.controllers.SpawnController; +import noppes.npcs.controllers.TransportController; import noppes.npcs.controllers.data.Animation; import noppes.npcs.controllers.data.Frame; import noppes.npcs.controllers.data.FramePart; import noppes.npcs.controllers.data.SkinOverlay; +import noppes.npcs.controllers.data.action.ActionManager; import noppes.npcs.entity.EntityCustomNpc; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.entity.EntityProjectile; import noppes.npcs.items.ItemLinked; import noppes.npcs.items.ItemScripted; -import noppes.npcs.scripted.entity.*; +import noppes.npcs.scripted.entity.ScriptAnimal; +import noppes.npcs.scripted.entity.ScriptArrow; +import noppes.npcs.scripted.entity.ScriptDBCPlayer; +import noppes.npcs.scripted.entity.ScriptEntity; +import noppes.npcs.scripted.entity.ScriptEntityItem; +import noppes.npcs.scripted.entity.ScriptFishHook; +import noppes.npcs.scripted.entity.ScriptLiving; +import noppes.npcs.scripted.entity.ScriptLivingBase; +import noppes.npcs.scripted.entity.ScriptMonster; +import noppes.npcs.scripted.entity.ScriptPixelmon; +import noppes.npcs.scripted.entity.ScriptPlayer; +import noppes.npcs.scripted.entity.ScriptProjectile; +import noppes.npcs.scripted.entity.ScriptThrowable; +import noppes.npcs.scripted.entity.ScriptVillager; import noppes.npcs.scripted.gui.ScriptGui; -import noppes.npcs.scripted.item.*; +import noppes.npcs.scripted.item.ScriptCustomItem; +import noppes.npcs.scripted.item.ScriptItemArmor; +import noppes.npcs.scripted.item.ScriptItemBlock; +import noppes.npcs.scripted.item.ScriptItemBook; +import noppes.npcs.scripted.item.ScriptItemStack; +import noppes.npcs.scripted.item.ScriptLinkedItem; import noppes.npcs.scripted.overlay.ScriptOverlay; -import noppes.npcs.util.*; +import noppes.npcs.util.CacheHashMap; +import noppes.npcs.util.JsonException; +import noppes.npcs.util.LRUHashMap; +import noppes.npcs.util.NBTJsonUtil; +import noppes.npcs.util.SizeOfObjectUtil; -import java.io.*; +import java.io.BufferedReader; +import java.io.DataOutputStream; +import java.io.File; +import java.io.IOException; +import java.io.InputStreamReader; import java.net.HttpURLConnection; import java.net.URL; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -278,7 +359,15 @@ public class NpcAPI extends AbstractNpcAPI { @Override public String[] getAllBiomeNames() { List biomes = new ArrayList<>(); + Set allBiomes = new HashSet(); + for (Type type : BiomeDictionary.Type.values()) { + Collections.addAll(allBiomes, BiomeDictionary.getBiomesForType(type)); + } for (BiomeGenBase base : BiomeGenBase.getBiomeGenArray()) { + if (base != null) + allBiomes.add(base); + } + for (BiomeGenBase base : allBiomes) { if (base != null && base.biomeName != null) { biomes.add(base.biomeName); } @@ -319,6 +408,12 @@ public class NpcAPI extends AbstractNpcAPI { data = new ScriptEntityData(new ScriptProjectile<>((EntityProjectile) entity)); else if (entity instanceof EntityItem) data = new ScriptEntityData(new ScriptEntityItem<>((EntityItem) entity)); + else if (entity instanceof EntityThrowable) + data = new ScriptEntityData(new ScriptThrowable<>((EntityThrowable) entity)); + else if (entity instanceof EntityArrow) + data = new ScriptEntityData(new ScriptArrow<>((EntityArrow) entity)); + else if (entity instanceof EntityFishHook) + data = new ScriptEntityData(new ScriptFishHook<>((EntityFishHook) entity)); else data = new ScriptEntityData(new ScriptEntity<>(entity)); entity.registerExtendedProperties("ScriptedObject", data); @@ -559,6 +654,10 @@ public class NpcAPI extends AbstractNpcAPI { return container instanceof ContainerNpcInterface ? ContainerNpcInterface.getOrCreateIContainer((ContainerNpcInterface) container) : new ScriptContainer(container); } + public IActionManager getActionManager() { + return ActionManager.GLOBAL; + } + private void checkWorld() { if (CustomNpcs.getServer() == null || CustomNpcs.getServer().isServerStopped()) { throw new CustomNPCsException("No world is loaded right now"); diff --git a/src/main/java/noppes/npcs/scripted/ScriptBlock.java b/src/main/java/noppes/npcs/scripted/ScriptBlock.java index 074ba4269..5d50d4543 100644 --- a/src/main/java/noppes/npcs/scripted/ScriptBlock.java +++ b/src/main/java/noppes/npcs/scripted/ScriptBlock.java @@ -8,7 +8,12 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import noppes.npcs.api.*; +import noppes.npcs.api.IBlock; +import noppes.npcs.api.IContainer; +import noppes.npcs.api.INbt; +import noppes.npcs.api.IPos; +import noppes.npcs.api.ITileEntity; +import noppes.npcs.api.IWorld; public class ScriptBlock implements IBlock { protected IWorld world; diff --git a/src/main/java/noppes/npcs/scripted/ScriptNbt.java b/src/main/java/noppes/npcs/scripted/ScriptNbt.java index 88471dc94..fcc26ac7f 100644 --- a/src/main/java/noppes/npcs/scripted/ScriptNbt.java +++ b/src/main/java/noppes/npcs/scripted/ScriptNbt.java @@ -1,6 +1,13 @@ package noppes.npcs.scripted; -import net.minecraft.nbt.*; +import net.minecraft.nbt.NBTBase; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagDouble; +import net.minecraft.nbt.NBTTagFloat; +import net.minecraft.nbt.NBTTagInt; +import net.minecraft.nbt.NBTTagIntArray; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.nbt.NBTTagString; import noppes.npcs.api.INbt; import noppes.npcs.util.NBTJsonUtil; diff --git a/src/main/java/noppes/npcs/scripted/ScriptParticle.java b/src/main/java/noppes/npcs/scripted/ScriptParticle.java index 11f8676be..9fb6689d1 100644 --- a/src/main/java/noppes/npcs/scripted/ScriptParticle.java +++ b/src/main/java/noppes/npcs/scripted/ScriptParticle.java @@ -1,6 +1,11 @@ package noppes.npcs.scripted; -import net.minecraft.nbt.*; +import net.minecraft.nbt.NBTTagByte; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagDouble; +import net.minecraft.nbt.NBTTagFloat; +import net.minecraft.nbt.NBTTagInt; +import net.minecraft.nbt.NBTTagString; import noppes.npcs.NoppesUtilServer; import noppes.npcs.api.IParticle; import noppes.npcs.api.IPos; diff --git a/src/main/java/noppes/npcs/scripted/ScriptSound.java b/src/main/java/noppes/npcs/scripted/ScriptSound.java index 6afbb494f..b849ab2f6 100644 --- a/src/main/java/noppes/npcs/scripted/ScriptSound.java +++ b/src/main/java/noppes/npcs/scripted/ScriptSound.java @@ -1,6 +1,11 @@ package noppes.npcs.scripted; -import net.minecraft.nbt.*; +import net.minecraft.nbt.NBTTagByte; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagDouble; +import net.minecraft.nbt.NBTTagFloat; +import net.minecraft.nbt.NBTTagInt; +import net.minecraft.nbt.NBTTagString; import noppes.npcs.api.IPos; import noppes.npcs.api.entity.IEntity; import noppes.npcs.api.handler.data.ISound; diff --git a/src/main/java/noppes/npcs/scripted/ScriptTileEntity.java b/src/main/java/noppes/npcs/scripted/ScriptTileEntity.java index 89dbbd2e3..a5293d251 100644 --- a/src/main/java/noppes/npcs/scripted/ScriptTileEntity.java +++ b/src/main/java/noppes/npcs/scripted/ScriptTileEntity.java @@ -2,7 +2,11 @@ package noppes.npcs.scripted; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import noppes.npcs.api.*; +import noppes.npcs.api.IBlock; +import noppes.npcs.api.INbt; +import noppes.npcs.api.IPos; +import noppes.npcs.api.ITileEntity; +import noppes.npcs.api.IWorld; public class ScriptTileEntity implements ITileEntity { protected T tileEntity; diff --git a/src/main/java/noppes/npcs/scripted/ScriptWorld.java b/src/main/java/noppes/npcs/scripted/ScriptWorld.java index e2396e1bb..c9b806ca9 100644 --- a/src/main/java/noppes/npcs/scripted/ScriptWorld.java +++ b/src/main/java/noppes/npcs/scripted/ScriptWorld.java @@ -11,7 +11,11 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntitySign; -import net.minecraft.util.*; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.ChatComponentText; +import net.minecraft.util.MathHelper; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.Vec3; import net.minecraft.world.WorldServer; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.BlockSnapshot; @@ -19,7 +23,11 @@ import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.event.world.BlockEvent; import noppes.npcs.CustomNpcs; import noppes.npcs.NoppesUtilServer; -import noppes.npcs.api.*; +import noppes.npcs.api.IBlock; +import noppes.npcs.api.IParticle; +import noppes.npcs.api.IPos; +import noppes.npcs.api.ITileEntity; +import noppes.npcs.api.IWorld; import noppes.npcs.api.entity.IEntity; import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.handler.data.ISound; @@ -30,7 +38,12 @@ import noppes.npcs.controllers.ServerCloneController; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.scripted.scoreboard.ScriptScoreboard; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; +import java.util.UUID; public class ScriptWorld implements IWorld { public WorldServer world; diff --git a/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java b/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java deleted file mode 100644 index 9d62fffac..000000000 --- a/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java +++ /dev/null @@ -1,265 +0,0 @@ -package noppes.npcs.scripted; - -import noppes.npcs.api.handler.IActionManager; -import noppes.npcs.api.handler.data.IAction; -import noppes.npcs.api.handler.data.IActionChain; -import noppes.npcs.api.handler.data.actions.IConditionalAction; -import noppes.npcs.controllers.data.action.Action; -import noppes.npcs.controllers.data.action.ActionChain; -import noppes.npcs.controllers.data.action.ConditionalAction; -import noppes.npcs.controllers.data.action.ParallelActionChain; - -import java.util.*; -import java.util.concurrent.ConcurrentLinkedDeque; -import java.util.function.Consumer; -import java.util.function.Supplier; - -/** - * Full-featured ActionManager: - * - delayed start, max-duration, tick-interval - * - chaining (getNext, getPrevious, scheduleAfter/Before) - * - per-action data - * - conditional actions - * - cancellation & clearing - */ -public class ScriptedActionManager implements IActionManager { - private boolean isWorking = false; - - private final Deque actionQueue = new ConcurrentLinkedDeque<>(); - private final Deque parallelActions = new ConcurrentLinkedDeque<>(); - private final Deque conditionalActions = new ConcurrentLinkedDeque<>(); - - @Override - public IAction create(String name) { - return new Action(this, name); - } - - @Override - public IAction create(Consumer t) { - return new Action(this, t); - } - - @Override - public IAction create(String name, int maxDuration, int startAfterTicks, Consumer task) { - return new Action(this, name, maxDuration, startAfterTicks, task); - } - - @Override - public IAction create(String name, int delay, Consumer t) { - return new Action(this, name, delay, t); - } - - @Override - public IAction create(int delay, Consumer t) { - return new Action(this, delay, t); - } - - @Override - public IAction create(String name, Consumer t) { - return new Action(this, name, t); - } - - @Override - public IConditionalAction create(Supplier condition, Consumer task) { - return new ConditionalAction(this, condition, task); - } - - @Override - public IConditionalAction create(String name, Supplier condition, Consumer task) { - return new ConditionalAction(this, name, condition, task); - } - - @Override - public IConditionalAction create(Supplier condition, Consumer task, Supplier terminateWhen) { - return new ConditionalAction(this, condition, task, terminateWhen); - } - - @Override - public IConditionalAction create(String name, Supplier condition, Consumer task, Supplier terminateWhen) { - return new ConditionalAction(this, name, condition, task, terminateWhen); - } - - @Override - public IConditionalAction create(Supplier condition, Consumer task, Supplier terminateWhen, Consumer onTermination) { - return new ConditionalAction(this, condition, task, terminateWhen, onTermination); - } - - @Override - public IConditionalAction create(String name, Supplier condition, Consumer task, Supplier terminateWhen, Consumer onTermination) { - return new ConditionalAction(this, name, condition, task, terminateWhen, onTermination); - } - - @Override - public void start() { - isWorking = true; - } - - @Override - public void stop() { - isWorking = false; - } - - @Override - public IAction scheduleAction(IAction action) { - actionQueue.addLast(action); - return action; - } - - @Override - public IAction scheduleAction(String name, int maxDuration, int startAfterTicks, Consumer task) { - return scheduleAction(create(name, maxDuration, startAfterTicks, task)); - } - - @Override - public IAction scheduleActionAt(int index, IAction action) { - int size = actionQueue.size(); - if (index <= 0) { - actionQueue.addFirst(action); - } else if (index >= size) { - actionQueue.addLast(action); - } else { - List tmp = new ArrayList<>(actionQueue); - tmp.add(index, action); - actionQueue.clear(); - actionQueue.addAll(tmp); - } - return action; - } - - @Override - public int getIndex(IAction action) { - int i = 0; - for (IAction a : actionQueue) { - if (a.equals(action)) return i; - i++; - } - return -1; - } - - @Override - public IAction getCurrentAction() { - return actionQueue.peekFirst(); - } - - @Override - public Queue getActionQueue() { - return actionQueue; - } - - @Override - public void clear() { - actionQueue.clear(); - parallelActions.clear(); - conditionalActions.clear(); - } - - @Override - public boolean cancelAction(String name) { - Iterator acts = actionQueue.iterator(); - while (acts.hasNext()) { - IAction act = acts.next(); - if (act.getName().equals(name)) { - acts.remove(); - return true; - } - } - - Iterator pit = parallelActions.iterator(); - while (pit.hasNext()) { - if (pit.next().getName().equals(name)) { - pit.remove(); - return true; - } - } - - Iterator cons = conditionalActions.iterator(); - while (cons.hasNext()) { - IConditionalAction con = cons.next(); - if (con.getName().equals(name)) { - cons.remove(); - return true; - } - } - return false; - } - - /////////////////////////////////////////////////// - /////////////////////////////////////////////////// - // Conditionals - @Override - public IConditionalAction scheduleAction(String name, Supplier condition, Consumer task) { - return scheduleAction(new ConditionalAction(this, name, condition, task)); - } - - @Override - public IConditionalAction scheduleAction(String name, Supplier condition, Consumer task, Supplier terminateWhen) { - return scheduleAction(new ConditionalAction(this, name, condition, task, terminateWhen)); - } - - @Override - public IConditionalAction scheduleAction(String name, Supplier condition, Consumer task, Supplier terminateWhen, Consumer onTermination) { - return scheduleAction(new ConditionalAction(this, name, condition, task, terminateWhen, onTermination)); - } - - - @Override - public IConditionalAction scheduleAction(IConditionalAction action) { - conditionalActions.add(action); - return action; - } - - @Override - public List getConditionalActions() { - return new ArrayList<>(conditionalActions); - } - - @Override - public IAction scheduleParallelAction(IAction action) { - parallelActions.add(action); - return action; - } - - - /** - * Call once per tick from your main loop. - * - * @param ticksExisted the global tick count, used for modulo checks. - */ - public void tick(int ticksExisted) { - if (!isWorking) return; - - // ─── Sequential (head only) ───────────────────────────────── - IAction current = getCurrentAction(); - if (current instanceof Action) { - Action cab = (Action) current; - cab.tick(ticksExisted); - if (cab.isDone()) actionQueue.pollFirst(); - } - - // ─── Parallel (all) ─────────────────────────────────────── - Iterator pit = parallelActions.iterator(); - while (pit.hasNext()) { - Action a = (Action) pit.next(); - a.tick(ticksExisted); - if (a.isDone()) pit.remove(); - } - - // ─── Conditionals ───────────────────────────────────────── - Iterator cit = conditionalActions.iterator(); - while (cit.hasNext()) { - ConditionalAction con = (ConditionalAction) cit.next(); - con.tick(ticksExisted); - if (con.isDone()) cit.remove(); - } - } - - @Override - public IActionChain chain() { - return new ActionChain(this); - } - - @Override - public IActionChain parallelChain() { - return new ParallelActionChain(this); - } -} diff --git a/src/main/java/noppes/npcs/scripted/constants/EntityType.java b/src/main/java/noppes/npcs/scripted/constants/EntityType.java index c14aa6786..bfe576856 100644 --- a/src/main/java/noppes/npcs/scripted/constants/EntityType.java +++ b/src/main/java/noppes/npcs/scripted/constants/EntityType.java @@ -11,4 +11,7 @@ public class EntityType { public static final int PROJECTILE = 7; public static final int PIXELMON = 8; public static final int VILLAGER = 9; + public static final int ARROW = 10; + public static final int THROWABLE = 11; + public static final int FISH_HOOK = 12; } diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptArrow.java b/src/main/java/noppes/npcs/scripted/entity/ScriptArrow.java new file mode 100644 index 000000000..d5d5433c7 --- /dev/null +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptArrow.java @@ -0,0 +1,41 @@ +package noppes.npcs.scripted.entity; + +import net.minecraft.entity.projectile.EntityArrow; +import noppes.npcs.api.entity.IArrow; +import noppes.npcs.api.entity.IEntity; +import noppes.npcs.scripted.NpcAPI; +import noppes.npcs.scripted.constants.EntityType; + +public class ScriptArrow extends ScriptEntity implements IArrow { + + public ScriptArrow(T entity) { + super(entity); + } + + @Override + public IEntity getShooter() { + if (entity.shootingEntity != null) + return NpcAPI.Instance().getIEntity(entity.shootingEntity); + return null; + } + + @Override + public double getDamage() { + return entity.getDamage(); + } + + @Override + public void kill() { + entity.setDead(); + } + + @Override + public int getType() { + return EntityType.ARROW; + } + + @Override + public boolean typeOf(int type) { + return type == EntityType.ARROW || super.typeOf(type); + } +} diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptEntity.java b/src/main/java/noppes/npcs/scripted/entity/ScriptEntity.java index 7564562f8..caac8d87d 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptEntity.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptEntity.java @@ -13,6 +13,7 @@ import net.minecraft.nbt.NBTBase.NBTPrimitive; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagIntArray; import net.minecraft.nbt.NBTTagString; +import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.MathHelper; import net.minecraft.world.WorldServer; import noppes.npcs.NoppesUtilServer; @@ -29,7 +30,12 @@ import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.ScriptParticle; import noppes.npcs.scripted.constants.EntityType; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; public class ScriptEntity implements IEntity { protected T entity; @@ -464,6 +470,31 @@ public class ScriptEntity implements IEntity { } } + + @Override + public IEntity[] getCollidingEntities() { + AxisAlignedBB axisalignedbb; + boolean isPl = entity instanceof EntityPlayer; + + if (entity.ridingEntity != null && entity.ridingEntity.isEntityAlive()) { + axisalignedbb = entity.boundingBox.func_111270_a(entity.ridingEntity.boundingBox).expand(isPl ? 0 : 1.0D, 0.0D, isPl ? 0 : 1.0D); + } else { + axisalignedbb = entity.boundingBox.expand(isPl ? 0 : 1.0D, isPl ? 0 : 0.5D, isPl ? 0 : 1.0D); + } + + List entities = (List) entity.worldObj.getEntitiesWithinAABBExcludingEntity(entity, axisalignedbb); + List list = new ArrayList<>(); + + for (Entity living : entities) { + if (living.isEntityAlive()) + list.add(NpcAPI.Instance().getIEntity(living)); + } + + + return list.toArray(new IEntity[list.size()]); + } + + /** * @param range The search range for entities around this entity * @return Array of entities within range diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptFishHook.java b/src/main/java/noppes/npcs/scripted/entity/ScriptFishHook.java new file mode 100644 index 000000000..56d97f4e0 --- /dev/null +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptFishHook.java @@ -0,0 +1,36 @@ +package noppes.npcs.scripted.entity; + +import net.minecraft.entity.projectile.EntityFishHook; +import noppes.npcs.api.entity.IFishHook; +import noppes.npcs.api.entity.IPlayer; +import noppes.npcs.scripted.NpcAPI; +import noppes.npcs.scripted.constants.EntityType; + +public class ScriptFishHook extends ScriptEntity implements IFishHook { + + public ScriptFishHook(T entity) { + super(entity); + } + + @Override + public IPlayer getCaster() { + if (entity.field_146042_b != null) + return (IPlayer) NpcAPI.Instance().getIEntity(entity.field_146042_b); + return null; + } + + @Override + public void kill() { + entity.setDead(); + } + + @Override + public int getType() { + return EntityType.FISH_HOOK; + } + + @Override + public boolean typeOf(int type) { + return type == EntityType.FISH_HOOK || super.typeOf(type); + } +} diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java b/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java index 7ba7136df..66a0c1c1b 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java @@ -11,12 +11,22 @@ import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.entity.data.IModelData; import noppes.npcs.api.handler.IActionManager; import noppes.npcs.api.handler.IOverlayHandler; -import noppes.npcs.api.handler.data.*; +import noppes.npcs.api.handler.data.IAnimationData; +import noppes.npcs.api.handler.data.IDialog; +import noppes.npcs.api.handler.data.IFaction; +import noppes.npcs.api.handler.data.ILines; +import noppes.npcs.api.handler.data.IMagicData; import noppes.npcs.api.item.IItemStack; import noppes.npcs.api.jobs.IJob; import noppes.npcs.api.roles.IRole; import noppes.npcs.config.ConfigMain; -import noppes.npcs.constants.*; +import noppes.npcs.constants.EnumAnimation; +import noppes.npcs.constants.EnumCombatPolicy; +import noppes.npcs.constants.EnumJobType; +import noppes.npcs.constants.EnumMovingType; +import noppes.npcs.constants.EnumNavType; +import noppes.npcs.constants.EnumRoleType; +import noppes.npcs.constants.EnumStandingType; import noppes.npcs.controllers.FactionController; import noppes.npcs.controllers.data.DialogOption; import noppes.npcs.controllers.data.Line; @@ -25,7 +35,21 @@ import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.constants.AnimationType; import noppes.npcs.scripted.constants.EntityType; -import noppes.npcs.scripted.roles.*; +import noppes.npcs.scripted.roles.ScriptJobBard; +import noppes.npcs.scripted.roles.ScriptJobConversation; +import noppes.npcs.scripted.roles.ScriptJobFollower; +import noppes.npcs.scripted.roles.ScriptJobGuard; +import noppes.npcs.scripted.roles.ScriptJobHealer; +import noppes.npcs.scripted.roles.ScriptJobInterface; +import noppes.npcs.scripted.roles.ScriptJobItemGiver; +import noppes.npcs.scripted.roles.ScriptJobSpawner; +import noppes.npcs.scripted.roles.ScriptRoleBank; +import noppes.npcs.scripted.roles.ScriptRoleCompanion; +import noppes.npcs.scripted.roles.ScriptRoleFollower; +import noppes.npcs.scripted.roles.ScriptRoleInterface; +import noppes.npcs.scripted.roles.ScriptRoleMailman; +import noppes.npcs.scripted.roles.ScriptRoleTrader; +import noppes.npcs.scripted.roles.ScriptRoleTransporter; import noppes.npcs.util.ValueUtil; import java.util.ArrayList; @@ -1408,6 +1432,9 @@ public class ScriptNpc extends ScriptLiving imp } public IActionManager getActionManager() { + if (npc.actionManager.getName().isEmpty()) + npc.actionManager.setName(npc.getCommandSenderName()); + return npc.actionManager; } diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java b/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java index fb3d3d9ab..aa7152528 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java @@ -23,20 +23,43 @@ import noppes.npcs.CustomNpcsPermissions; import noppes.npcs.NoppesStringUtils; import noppes.npcs.NoppesUtilPlayer; import noppes.npcs.NoppesUtilServer; -import noppes.npcs.api.*; +import noppes.npcs.api.IBlock; +import noppes.npcs.api.IContainer; +import noppes.npcs.api.IParticle; +import noppes.npcs.api.IPixelmonPlayerData; +import noppes.npcs.api.IPos; +import noppes.npcs.api.IScreenSize; +import noppes.npcs.api.ITimers; +import noppes.npcs.api.IWorld; import noppes.npcs.api.entity.IEntity; import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.gui.ICustomGui; +import noppes.npcs.api.handler.IActionManager; import noppes.npcs.api.handler.IOverlayHandler; -import noppes.npcs.api.handler.data.*; +import noppes.npcs.api.handler.data.IAnimationData; +import noppes.npcs.api.handler.data.IDialog; +import noppes.npcs.api.handler.data.IMagicData; +import noppes.npcs.api.handler.data.IPlayerAttributes; +import noppes.npcs.api.handler.data.IQuest; +import noppes.npcs.api.handler.data.ISound; import noppes.npcs.api.item.IItemStack; import noppes.npcs.api.overlay.ICustomOverlay; import noppes.npcs.compat.PixelmonHelper; import noppes.npcs.config.ConfigScript; import noppes.npcs.constants.EnumQuestType; import noppes.npcs.containers.ContainerCustomGui; -import noppes.npcs.controllers.*; -import noppes.npcs.controllers.data.*; +import noppes.npcs.controllers.CustomGuiController; +import noppes.npcs.controllers.DialogController; +import noppes.npcs.controllers.PartyController; +import noppes.npcs.controllers.PlayerQuestController; +import noppes.npcs.controllers.QuestController; +import noppes.npcs.controllers.data.Dialog; +import noppes.npcs.controllers.data.Party; +import noppes.npcs.controllers.data.PlayerData; +import noppes.npcs.controllers.data.PlayerDialogData; +import noppes.npcs.controllers.data.PlayerQuestData; +import noppes.npcs.controllers.data.Quest; +import noppes.npcs.controllers.data.QuestData; import noppes.npcs.entity.EntityDialogNpc; import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.ScriptPixelmonPlayerData; @@ -846,4 +869,12 @@ public class ScriptPlayer extends ScriptLivingBase public IPlayerAttributes getAttributes() { return AttributeController.getTracker(this.player); } + + @Override + public IActionManager getActionManager() { + if (getData().actionManager.getName().isEmpty()) + data.actionManager.setName(player.getDisplayName()); + + return data.actionManager; + } } diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptThrowable.java b/src/main/java/noppes/npcs/scripted/entity/ScriptThrowable.java new file mode 100644 index 000000000..1c8400d47 --- /dev/null +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptThrowable.java @@ -0,0 +1,36 @@ +package noppes.npcs.scripted.entity; + +import net.minecraft.entity.projectile.EntityThrowable; +import noppes.npcs.api.entity.IEntityLivingBase; +import noppes.npcs.api.entity.IThrowable; +import noppes.npcs.scripted.NpcAPI; +import noppes.npcs.scripted.constants.EntityType; + +public class ScriptThrowable extends ScriptEntity implements IThrowable { + + public ScriptThrowable(T entity) { + super(entity); + } + + @Override + public IEntityLivingBase getThrower() { + if (entity.getThrower() != null) + return (IEntityLivingBase) NpcAPI.Instance().getIEntity(entity.getThrower()); + return null; + } + + @Override + public void kill() { + entity.setDead(); + } + + @Override + public int getType() { + return EntityType.THROWABLE; + } + + @Override + public boolean typeOf(int type) { + return type == EntityType.THROWABLE || super.typeOf(type); + } +} diff --git a/src/main/java/noppes/npcs/scripted/event/RecipeScriptEvent.java b/src/main/java/noppes/npcs/scripted/event/RecipeScriptEvent.java new file mode 100644 index 000000000..fb8ea2698 --- /dev/null +++ b/src/main/java/noppes/npcs/scripted/event/RecipeScriptEvent.java @@ -0,0 +1,106 @@ +package noppes.npcs.scripted.event; + +import cpw.mods.fml.common.eventhandler.Cancelable; +import noppes.npcs.api.entity.IPlayer; +import noppes.npcs.api.event.IRecipeEvent; +import noppes.npcs.api.item.IItemStack; +import noppes.npcs.controllers.data.RecipeScript; +import noppes.npcs.scripted.event.player.PlayerEvent; + +public class RecipeScriptEvent extends PlayerEvent implements IRecipeEvent { + public final Object recipe; + public final IItemStack[] items; + public final boolean isAnvil; + + public RecipeScriptEvent(IPlayer player, Object recipe, boolean anvil, IItemStack[] items) { + super(player); + this.recipe = recipe; + this.items = items; + this.isAnvil = anvil; + } + + @Override + public Object getRecipe() { + return recipe; + } + + @Override + public IItemStack[] getItems() { + return items; + } + + @Override + public boolean isAnvil() { + return isAnvil; + } + + @Cancelable + public static class Pre extends RecipeScriptEvent implements IRecipeEvent.Pre { + private String message = ""; + private int xpCost = 0; + private int materialUsage = 0; + + public Pre(IPlayer player, Object recipe, boolean isAnvil, IItemStack[] items) { + super(player, recipe, isAnvil, items); + } + + @Override + public void setMessage(String message) { + this.message = message == null ? "" : message; + } + + @Override + public String getMessage() { + return message; + } + + @Override + public int getXpCost() { + return xpCost; + } + + @Override + public void setXpCost(int xpCost) { + if (this.isAnvil) + this.xpCost = xpCost; + } + + @Override + public int getMaterialUsage() { + return materialUsage; + } + + @Override + public void setMaterialUsage(int materialUsage) { + if (this.isAnvil) + this.materialUsage = materialUsage; + } + + public String getHookName() { + return RecipeScript.ScriptType.PRE.function; + } + } + + public static class Post extends RecipeScriptEvent implements IRecipeEvent.Post { + private IItemStack result; + + public Post(IPlayer player, Object recipe, boolean isAnvil, IItemStack[] items, IItemStack result) { + super(player, recipe, isAnvil, items); + this.result = result; + } + + @Override + public IItemStack getCraft() { + return result; + } + + @Override + public void setResult(IItemStack stack) { + this.result = stack; + } + + public String getHookName() { + return RecipeScript.ScriptType.POST.function; + } + } +} diff --git a/src/main/java/noppes/npcs/scripted/event/player/PlayerEvent.java b/src/main/java/noppes/npcs/scripted/event/player/PlayerEvent.java index bf2225176..e6a303234 100644 --- a/src/main/java/noppes/npcs/scripted/event/player/PlayerEvent.java +++ b/src/main/java/noppes/npcs/scripted/event/player/PlayerEvent.java @@ -13,16 +13,13 @@ import noppes.npcs.api.IDamageSource; import noppes.npcs.api.entity.IEntity; import noppes.npcs.api.entity.IEntityLivingBase; import noppes.npcs.api.entity.IPlayer; -import noppes.npcs.api.event.IItemEvent; import noppes.npcs.api.event.IPlayerEvent; import noppes.npcs.api.handler.data.IPlayerEffect; import noppes.npcs.api.handler.data.IProfile; -import noppes.npcs.api.item.IItemCustomizable; import noppes.npcs.api.item.IItemStack; import noppes.npcs.constants.EnumScriptType; import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.event.CustomNPCsEvent; -import noppes.npcs.scripted.event.ItemEvent; public class PlayerEvent extends CustomNPCsEvent implements IPlayerEvent { public final IPlayer player; diff --git a/src/main/java/noppes/npcs/scripted/gui/ScriptGui.java b/src/main/java/noppes/npcs/scripted/gui/ScriptGui.java index a3d5a62be..0a6535182 100644 --- a/src/main/java/noppes/npcs/scripted/gui/ScriptGui.java +++ b/src/main/java/noppes/npcs/scripted/gui/ScriptGui.java @@ -5,7 +5,15 @@ import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import noppes.npcs.api.entity.IPlayer; -import noppes.npcs.api.gui.*; +import noppes.npcs.api.gui.IButton; +import noppes.npcs.api.gui.ICustomGui; +import noppes.npcs.api.gui.ICustomGuiComponent; +import noppes.npcs.api.gui.IItemSlot; +import noppes.npcs.api.gui.ILabel; +import noppes.npcs.api.gui.ILine; +import noppes.npcs.api.gui.IScroll; +import noppes.npcs.api.gui.ITextField; +import noppes.npcs.api.gui.ITexturedRect; import noppes.npcs.api.item.IItemStack; import noppes.npcs.controllers.CustomGuiController; import noppes.npcs.controllers.ScriptController; diff --git a/src/main/java/noppes/npcs/scripted/item/ScriptCustomItem.java b/src/main/java/noppes/npcs/scripted/item/ScriptCustomItem.java index 7a3e2fdbf..0103a9af2 100644 --- a/src/main/java/noppes/npcs/scripted/item/ScriptCustomItem.java +++ b/src/main/java/noppes/npcs/scripted/item/ScriptCustomItem.java @@ -12,7 +12,11 @@ import noppes.npcs.controllers.ScriptController; import noppes.npcs.controllers.data.INpcScriptHandler; import noppes.npcs.scripted.CustomNPCsException; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.TreeMap; public class ScriptCustomItem extends ScriptCustomizableItem implements IItemCustom, INpcScriptHandler { public List scripts = new ArrayList(); diff --git a/src/main/java/noppes/npcs/scripted/item/ScriptItemStack.java b/src/main/java/noppes/npcs/scripted/item/ScriptItemStack.java index 8e80f3eb6..6736369b9 100644 --- a/src/main/java/noppes/npcs/scripted/item/ScriptItemStack.java +++ b/src/main/java/noppes/npcs/scripted/item/ScriptItemStack.java @@ -9,7 +9,14 @@ import net.minecraft.enchantment.Enchantment; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.init.Blocks; import net.minecraft.init.Items; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemEditableBook; +import net.minecraft.item.ItemFood; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemSword; +import net.minecraft.item.ItemWritableBook; import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTBase.NBTPrimitive; import net.minecraft.nbt.NBTTagCompound; @@ -25,7 +32,11 @@ import noppes.npcs.scripted.CustomNPCsException; import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.ScriptNbt; -import java.util.*; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; public class ScriptItemStack implements IItemStack { public ItemStack item; diff --git a/src/main/java/noppes/npcs/scripted/overlay/ScriptOverlay.java b/src/main/java/noppes/npcs/scripted/overlay/ScriptOverlay.java index 7da5ade14..23ae8a89c 100644 --- a/src/main/java/noppes/npcs/scripted/overlay/ScriptOverlay.java +++ b/src/main/java/noppes/npcs/scripted/overlay/ScriptOverlay.java @@ -4,7 +4,11 @@ import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import noppes.npcs.api.entity.IPlayer; -import noppes.npcs.api.overlay.*; +import noppes.npcs.api.overlay.ICustomOverlay; +import noppes.npcs.api.overlay.ICustomOverlayComponent; +import noppes.npcs.api.overlay.IOverlayLabel; +import noppes.npcs.api.overlay.IOverlayLine; +import noppes.npcs.api.overlay.IOverlayTexturedRect; import noppes.npcs.controllers.CustomGuiController; import java.util.ArrayList; diff --git a/src/main/java/noppes/npcs/scripted/scoreboard/ScriptScoreboard.java b/src/main/java/noppes/npcs/scripted/scoreboard/ScriptScoreboard.java index 8ab5de0b1..08582cb03 100644 --- a/src/main/java/noppes/npcs/scripted/scoreboard/ScriptScoreboard.java +++ b/src/main/java/noppes/npcs/scripted/scoreboard/ScriptScoreboard.java @@ -1,6 +1,10 @@ package noppes.npcs.scripted.scoreboard; -import net.minecraft.scoreboard.*; +import net.minecraft.scoreboard.IScoreObjectiveCriteria; +import net.minecraft.scoreboard.Score; +import net.minecraft.scoreboard.ScoreObjective; +import net.minecraft.scoreboard.ScorePlayerTeam; +import net.minecraft.scoreboard.Scoreboard; import net.minecraft.server.MinecraftServer; import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.scoreboard.IScoreboard; diff --git a/src/main/java/noppes/npcs/util/CustomNPCsThreader.java b/src/main/java/noppes/npcs/util/CustomNPCsThreader.java index 3019fb5b1..6ed04819d 100644 --- a/src/main/java/noppes/npcs/util/CustomNPCsThreader.java +++ b/src/main/java/noppes/npcs/util/CustomNPCsThreader.java @@ -4,5 +4,10 @@ import java.util.concurrent.Executor; import java.util.concurrent.Executors; public class CustomNPCsThreader { + /** + * Executor used for all asynchronous profile and player data saves. + * It is single-threaded so submitted tasks run sequentially and the + * save order for a given player is preserved. + */ public static final Executor customNPCThread = Executors.newSingleThreadExecutor(); } diff --git a/src/main/java/noppes/npcs/util/NBTJsonUtil.java b/src/main/java/noppes/npcs/util/NBTJsonUtil.java index f1696bb56..fb2974f19 100644 --- a/src/main/java/noppes/npcs/util/NBTJsonUtil.java +++ b/src/main/java/noppes/npcs/util/NBTJsonUtil.java @@ -2,11 +2,27 @@ package noppes.npcs.util; import com.google.common.io.Files; import cpw.mods.fml.common.ObfuscationReflectionHelper; -import net.minecraft.nbt.*; +import net.minecraft.nbt.CompressedStreamTools; +import net.minecraft.nbt.NBTBase; +import net.minecraft.nbt.NBTTagByte; +import net.minecraft.nbt.NBTTagByteArray; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagDouble; +import net.minecraft.nbt.NBTTagFloat; +import net.minecraft.nbt.NBTTagInt; +import net.minecraft.nbt.NBTTagIntArray; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.nbt.NBTTagLong; +import net.minecraft.nbt.NBTTagShort; +import net.minecraft.nbt.NBTTagString; import noppes.npcs.LogWriter; import org.apache.commons.io.Charsets; -import java.io.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStreamWriter; import java.util.ArrayList; import java.util.List; @@ -213,8 +229,8 @@ public class NBTJsonUtil { } public static NBTTagCompound loadNBTData(File file) { - try { - return CompressedStreamTools.readCompressed(new FileInputStream(file)); + try (FileInputStream fis = new FileInputStream(file)) { + return CompressedStreamTools.readCompressed(fis); } catch (Exception e) { LogWriter.error("Error loading: " + file.getName(), e); } diff --git a/src/main/java/tconstruct/client/tabs/InventoryTabCustomNpc.java b/src/main/java/tconstruct/client/tabs/InventoryTabCustomNpc.java index e6e63b402..e52742812 100644 --- a/src/main/java/tconstruct/client/tabs/InventoryTabCustomNpc.java +++ b/src/main/java/tconstruct/client/tabs/InventoryTabCustomNpc.java @@ -4,7 +4,12 @@ import net.minecraft.client.Minecraft; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import noppes.npcs.CustomItems; -import noppes.npcs.client.gui.player.inventory.*; +import noppes.npcs.client.gui.player.inventory.GuiCNPCInventory; +import noppes.npcs.client.gui.player.inventory.GuiFaction; +import noppes.npcs.client.gui.player.inventory.GuiParty; +import noppes.npcs.client.gui.player.inventory.GuiProfiles; +import noppes.npcs.client.gui.player.inventory.GuiQuestLog; +import noppes.npcs.client.gui.player.inventory.GuiSettings; public class InventoryTabCustomNpc extends AbstractTab { public InventoryTabCustomNpc() { diff --git a/src/main/resources/assets/customnpcs/lang/cs_CZ.lang b/src/main/resources/assets/customnpcs/lang/cs_CZ.lang index b377588b2..f8f092bbf 100644 --- a/src/main/resources/assets/customnpcs/lang/cs_CZ.lang +++ b/src/main/resources/assets/customnpcs/lang/cs_CZ.lang @@ -437,4 +437,5 @@ item.npcInfantryHelmet.name=Armádní helma item.npcOfficerHelmet.name=důstojnické brnění item.npcCrown.name=Koruna -item.npcCrown2.name=Koruna \ No newline at end of file +item.npcCrown2.name=Koruna +key.npcInventory=NPC inventář diff --git a/src/main/resources/assets/customnpcs/lang/de_DE.lang b/src/main/resources/assets/customnpcs/lang/de_DE.lang index 318e029d4..f88dd2769 100644 --- a/src/main/resources/assets/customnpcs/lang/de_DE.lang +++ b/src/main/resources/assets/customnpcs/lang/de_DE.lang @@ -869,3 +869,5 @@ companion.age=Alter companion.stage=Bühne #German by DewTix + +key.npcInventory=NPC Inventar diff --git a/src/main/resources/assets/customnpcs/lang/en_US.lang b/src/main/resources/assets/customnpcs/lang/en_US.lang index 92f6c1c8e..286f8446f 100644 --- a/src/main/resources/assets/customnpcs/lang/en_US.lang +++ b/src/main/resources/assets/customnpcs/lang/en_US.lang @@ -1,6 +1,7 @@ customnpcs.defaultTextColor=404040 key.categories.customnpc=CustomNPC+ +key.npcInventory=NPC Inventory entity.CustomNpc.name=Custom Npc entity.customnpcs.CustomNpc.name=Custom Npc @@ -405,6 +406,7 @@ spawning.liquidSpawning=Spawns in Liquid spawning.airSpawning=Spawns in Air spawning.minHeight=Minimum Height spawning.maxHeight=Maximum Height +spawning.naturalInfo=Add at least one spawn entry and configure spawn options for the NPC to spawn naturally role.name=Role role.none=No Role diff --git a/src/main/resources/assets/customnpcs/lang/es_AR.lang b/src/main/resources/assets/customnpcs/lang/es_AR.lang index 917abd4f4..27c79cd78 100644 --- a/src/main/resources/assets/customnpcs/lang/es_AR.lang +++ b/src/main/resources/assets/customnpcs/lang/es_AR.lang @@ -8,7 +8,7 @@ tile.npcCarpentyBench.name=Mesa de Carpinteria tile.npcBloodBlock.name=Bloque de Sangre gui.deleteConfirm=Estas Seguro de que quieres eliminar este npc? -gui.add=Añadir +gui.add=Añadir gui.remove=Remover gui.edit=Editar gui.name=Nombre @@ -31,13 +31,13 @@ gui.large=Grande gui.type=Tipo gui.always=Siempre gui.untilclose=HastaCerrar -gui.ignoreDamage=Ignorar daño +gui.ignoreDamage=Ignorar daño display.model=Modelo display.show=Mostrar display.hide=Esconder display.showAttacking=Mostrar cuando ataca -display.size=Tamaño +display.size=Tamaño display.texture=Textura display.textureCape=Textura de capa display.player=Jugador @@ -94,13 +94,13 @@ stats.creaturetype=Tipo de criatura stats.normal=Normal stats.undead=No-Muerto stats.arthropod=Artropodo -stats.nofalldamage=Sin daño de caida +stats.nofalldamage=Sin daño de caida stats.meleeproperties=Opciones de Melee stats.rangedproperties=RangedOptions stats.burninsun=Se quema al sol stats.amplify=Amplificado -stats.size=Tamaño +stats.size=Tamaño stats.speed=Rapidez stats.glows=Brilla stats.hasgravity=Tiene gravedad @@ -497,4 +497,5 @@ item.npcCrossbow.name=Ballesta item.npcCrossBolt.name=Flecha de Ballesta item.npcSlingshot.name=Slingshot item.npcMusket.name=Mosquete -item.npcExcalibur.name=Excalibur \ No newline at end of file +item.npcExcalibur.name=Excalibur +key.npcInventory=Inventario de NPC diff --git a/src/main/resources/assets/customnpcs/lang/es_MX.lang b/src/main/resources/assets/customnpcs/lang/es_MX.lang index 2d34e3827..53bca03af 100644 --- a/src/main/resources/assets/customnpcs/lang/es_MX.lang +++ b/src/main/resources/assets/customnpcs/lang/es_MX.lang @@ -25,19 +25,19 @@ gui.day=Dia gui.night=Noche gui.constant=Constante gui.accelerate=Acelerar -gui.small=Pequeño +gui.small=Pequeño gui.medium=Mediano gui.large=Grande gui.type=Tipo gui.always=Siempre gui.untilclose=HastaCierre -gui.ignoreDamage=Ignorar Daño +gui.ignoreDamage=Ignorar Daño display.model=Modelo display.show=Mostrar display.hide=Esconder display.showAttacking=Mostrar Al Atacar -display.size=Tamaño +display.size=Tamaño display.texture=Textura display.textureCape=Textura de capa display.player=Jugador @@ -94,13 +94,13 @@ stats.creaturetype=Tipo de cratura stats.normal=Normal stats.undead=No-Muerto stats.arthropod=Artropodo -stats.nofalldamage=Sin daño de caida +stats.nofalldamage=Sin daño de caida stats.meleeproperties=Opciones de Melee stats.rangedproperties=PropiedadesDeDistancia stats.burninsun=Se quema al sol stats.amplify=Amplificar -stats.size=Tamaño +stats.size=Tamaño stats.speed=Rapidez stats.glows=Brilla stats.hasgravity=Tiene gravedad @@ -497,4 +497,5 @@ item.npcCrossbow.name=Ballesta item.npcCrossBolt.name=Flecha de Ballesta item.npcSlingshot.name=Slingshot item.npcMusket.name=Mosquete -item.npcExcalibur.name=Excalibur \ No newline at end of file +item.npcExcalibur.name=Excalibur +key.npcInventory=Inventario de NPC diff --git a/src/main/resources/assets/customnpcs/lang/fr_FR.lang b/src/main/resources/assets/customnpcs/lang/fr_FR.lang index 15e98a29f..b22a75ac3 100644 --- a/src/main/resources/assets/customnpcs/lang/fr_FR.lang +++ b/src/main/resources/assets/customnpcs/lang/fr_FR.lang @@ -539,4 +539,5 @@ item.npcCrossbow.name=Arbalète item.npcCrossBolt.name=Carreau d'Arbalète item.npcSlingshot.name=Lance-Pièrre item.npcMusket.name=Mousquet -item.npcExcalibur.name=Excalibur \ No newline at end of file +item.npcExcalibur.name=Excalibur +key.npcInventory=Inventaire Pnj diff --git a/src/main/resources/assets/customnpcs/lang/hu_HU.lang b/src/main/resources/assets/customnpcs/lang/hu_HU.lang index c2873bbcd..1a9fc71f5 100644 --- a/src/main/resources/assets/customnpcs/lang/hu_HU.lang +++ b/src/main/resources/assets/customnpcs/lang/hu_HU.lang @@ -539,4 +539,5 @@ item.npcCrossbow.name=Számszeríj item.npcCrossBolt.name=Tüske item.npcSlingshot.name=Csúzli item.npcMusket.name=Muskéta -item.npcExcalibur.name=Excalibur \ No newline at end of file +item.npcExcalibur.name=Excalibur +key.npcInventory=NPC felszerelés diff --git a/src/main/resources/assets/customnpcs/lang/ko_KR.lang b/src/main/resources/assets/customnpcs/lang/ko_KR.lang index 64c09c92f..993006c34 100644 --- a/src/main/resources/assets/customnpcs/lang/ko_KR.lang +++ b/src/main/resources/assets/customnpcs/lang/ko_KR.lang @@ -794,3 +794,5 @@ enchantment.damage=데미지 enchantment.confusion=혼란 enchantment.infinite=무한 enchantment.poison=독 + +key.npcInventory=NPC 인벤토리 diff --git a/src/main/resources/assets/customnpcs/lang/pl_PL.lang b/src/main/resources/assets/customnpcs/lang/pl_PL.lang index 2721d5fc4..2f1047663 100644 --- a/src/main/resources/assets/customnpcs/lang/pl_PL.lang +++ b/src/main/resources/assets/customnpcs/lang/pl_PL.lang @@ -495,4 +495,5 @@ item.npcCrossbow.name=Kusza item.npcCrossBolt.name=Strzałki do kuszy item.npcSlingshot.name=Proca item.npcMusket.name=Muszkiet -item.npcExcalibur.name=Excalibur \ No newline at end of file +item.npcExcalibur.name=Excalibur +key.npcInventory=Inwentarz npc diff --git a/src/main/resources/assets/customnpcs/lang/pt_BR.lang b/src/main/resources/assets/customnpcs/lang/pt_BR.lang index c8f4d9a7c..c3bbd3c26 100644 --- a/src/main/resources/assets/customnpcs/lang/pt_BR.lang +++ b/src/main/resources/assets/customnpcs/lang/pt_BR.lang @@ -495,4 +495,5 @@ item.npcCrossbow.name=Besta item.npcCrossBolt.name=Flecha de Besta item.npcSlingshot.name=Estilingue item.npcMusket.name=Mosquete -item.npcExcalibur.name=Excalibur \ No newline at end of file +item.npcExcalibur.name=Excalibur +key.npcInventory=Inventário NPC diff --git a/src/main/resources/assets/customnpcs/lang/ru_RU.lang b/src/main/resources/assets/customnpcs/lang/ru_RU.lang index f0f552f84..54d0c2cf4 100644 --- a/src/main/resources/assets/customnpcs/lang/ru_RU.lang +++ b/src/main/resources/assets/customnpcs/lang/ru_RU.lang @@ -1015,3 +1015,5 @@ questgui.rewards=Награды: questgui.experience=Опыт: questgui.reject=Отменить questgui.accept=Принять + +key.npcInventory=Инвентарь NPC diff --git a/src/main/resources/assets/customnpcs/lang/zh_CN.lang b/src/main/resources/assets/customnpcs/lang/zh_CN.lang index d8de7694b..e5d0b172a 100644 --- a/src/main/resources/assets/customnpcs/lang/zh_CN.lang +++ b/src/main/resources/assets/customnpcs/lang/zh_CN.lang @@ -1238,3 +1238,5 @@ tint.hurt=伤害色彩 hitbox.hitbox=碰撞体积 hitbox.width=宽度比例 hitbox.height=身高比例 + +key.npcInventory=NPC物品栏