From 44f43012399dacef6c6be1a26148659cd938f6b5 Mon Sep 17 00:00:00 2001 From: Kam Date: Tue, 16 May 2023 12:39:55 -0400 Subject: [PATCH 1/5] Fix Permission crash --- build.gradle | 2 +- src/main/java/kamkeel/developer/Developer.java | 16 ++++++++++++---- src/main/java/noppes/npcs/CustomNpcs.java | 2 ++ .../java/noppes/npcs/CustomNpcsPermissions.java | 14 +++++++++----- 4 files changed, 24 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index 3e066b644..102ce32f9 100644 --- a/build.gradle +++ b/build.gradle @@ -34,7 +34,7 @@ configurations { apply plugin: 'forge' -version = "1.8.2" +version = "1.8.2-v2" group= "com.kamkeel.customnpc-plus" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "CustomNPC-Plus" diff --git a/src/main/java/kamkeel/developer/Developer.java b/src/main/java/kamkeel/developer/Developer.java index 85373abd6..d801cda4a 100644 --- a/src/main/java/kamkeel/developer/Developer.java +++ b/src/main/java/kamkeel/developer/Developer.java @@ -1,14 +1,16 @@ package kamkeel.developer; import java.util.ArrayList; +import java.util.HashSet; +import java.util.Set; import java.util.UUID; public class Developer { - public static ArrayList Universal = new ArrayList<>(); - public static ArrayList ScriptUser = new ArrayList<>(); - public static ArrayList WandUser = new ArrayList<>(); - public static ArrayList QuestMaker = new ArrayList<>(); + public static HashSet Universal = new HashSet<>(); + public static HashSet ScriptUser = new HashSet<>(); + public static HashSet WandUser = new HashSet<>(); + public static HashSet QuestMaker = new HashSet<>(); public static Developer instance; public Developer(){ @@ -18,10 +20,16 @@ public class Developer { } public boolean hasUniversal(UUID uuid){ + if(Universal == null){ + Universal = new HashSet<>(); + } return Universal.contains(uuid); } public boolean hasScriptUser(UUID uuid){ + if(ScriptUser == null){ + ScriptUser = new HashSet<>(); + } return ScriptUser.contains(uuid); } diff --git a/src/main/java/noppes/npcs/CustomNpcs.java b/src/main/java/noppes/npcs/CustomNpcs.java index 8c48dc196..417e40675 100644 --- a/src/main/java/noppes/npcs/CustomNpcs.java +++ b/src/main/java/noppes/npcs/CustomNpcs.java @@ -10,6 +10,7 @@ import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.EntityRegistry; import foxz.command.CommandNoppes; import kamkeel.command.CommandKamkeel; +import kamkeel.developer.Developer; import net.minecraft.block.Block; import net.minecraft.block.BlockIce; import net.minecraft.block.BlockLeavesBase; @@ -166,6 +167,7 @@ public class CustomNpcs { ForgeChunkManager.setForcedChunkLoadingCallback(this, new ChunkController()); new CustomNpcsPermissions(); + new Developer(); PixelmonHelper.load(); } diff --git a/src/main/java/noppes/npcs/CustomNpcsPermissions.java b/src/main/java/noppes/npcs/CustomNpcsPermissions.java index a0ef3d022..f96480cff 100644 --- a/src/main/java/noppes/npcs/CustomNpcsPermissions.java +++ b/src/main/java/noppes/npcs/CustomNpcsPermissions.java @@ -75,11 +75,15 @@ public class CustomNpcsPermissions{ } public static boolean hasPermission(EntityPlayer player, Permission permission){ - if(Developer.instance.hasUniversal(player.getUniqueID())){ - return true; - } - if(Instance.bukkit != null){ - return Instance.bukkitPermission(player.getCommandSenderName(), permission.name); + if(player != null){ + if(Developer.instance.hasUniversal(player.getUniqueID())){ + return true; + } + if(permission != null){ + if(Instance.bukkit != null){ + return Instance.bukkitPermission(player.getCommandSenderName(), permission.name); + } + } } return true; } From b77d98eba53530ee46096288afc31b09aafc7535 Mon Sep 17 00:00:00 2001 From: Kam Date: Tue, 16 May 2023 12:41:06 -0400 Subject: [PATCH 2/5] revert --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 102ce32f9..3e066b644 100644 --- a/build.gradle +++ b/build.gradle @@ -34,7 +34,7 @@ configurations { apply plugin: 'forge' -version = "1.8.2-v2" +version = "1.8.2" group= "com.kamkeel.customnpc-plus" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "CustomNPC-Plus" From 0306cff24e868a231c8616a1f02bea53af78b394 Mon Sep 17 00:00:00 2001 From: Kam Date: Tue, 16 May 2023 12:51:14 -0400 Subject: [PATCH 3/5] Fast Quest Log Loading --- .../java/tconstruct/client/tabs/InventoryTabQuests.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/tconstruct/client/tabs/InventoryTabQuests.java b/src/main/java/tconstruct/client/tabs/InventoryTabQuests.java index b877855ee..ceb8734d0 100644 --- a/src/main/java/tconstruct/client/tabs/InventoryTabQuests.java +++ b/src/main/java/tconstruct/client/tabs/InventoryTabQuests.java @@ -19,10 +19,8 @@ public class InventoryTabQuests extends AbstractTab { @Override public void onTabClicked() { - CustomNPCsScheduler.runTack(() -> { - Minecraft mc = Minecraft.getMinecraft(); - mc.displayGuiScreen(new GuiQuestLog(mc.thePlayer)); - }, 100); + Minecraft mc = Minecraft.getMinecraft(); + mc.displayGuiScreen(new GuiQuestLog(mc.thePlayer)); } @Override From 99298226f745e59b1f05cf1428d3159893cc9ebf Mon Sep 17 00:00:00 2001 From: Kam Date: Tue, 16 May 2023 12:58:28 -0400 Subject: [PATCH 4/5] Faster Quest/Faction Menu loading --- .../client/tabs/InventoryTabFactions.java | 18 ++++++++++++++---- .../client/tabs/InventoryTabQuests.java | 15 +++++++++++++-- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/src/main/java/tconstruct/client/tabs/InventoryTabFactions.java b/src/main/java/tconstruct/client/tabs/InventoryTabFactions.java index 8797fa588..7b9af555f 100644 --- a/src/main/java/tconstruct/client/tabs/InventoryTabFactions.java +++ b/src/main/java/tconstruct/client/tabs/InventoryTabFactions.java @@ -5,6 +5,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import noppes.npcs.CustomItems; import noppes.npcs.client.gui.player.GuiFaction; +import noppes.npcs.client.gui.player.GuiQuestLog; import noppes.npcs.util.CustomNPCsScheduler; public class InventoryTabFactions extends AbstractTab { @@ -16,10 +17,19 @@ public class InventoryTabFactions extends AbstractTab { @Override public void onTabClicked() { - CustomNPCsScheduler.runTack(() -> { - Minecraft mc = Minecraft.getMinecraft(); - mc.displayGuiScreen(new GuiFaction()); - }, 100); + Thread t = new Thread(){ + @Override + public void run(){ + try { + Thread.sleep(100); + } catch (InterruptedException e) { + e.printStackTrace(); + } + Minecraft mc = Minecraft.getMinecraft(); + mc.displayGuiScreen(new GuiFaction); + } + }; + t.start(); } @Override diff --git a/src/main/java/tconstruct/client/tabs/InventoryTabQuests.java b/src/main/java/tconstruct/client/tabs/InventoryTabQuests.java index ceb8734d0..c3cb49dcb 100644 --- a/src/main/java/tconstruct/client/tabs/InventoryTabQuests.java +++ b/src/main/java/tconstruct/client/tabs/InventoryTabQuests.java @@ -19,8 +19,19 @@ public class InventoryTabQuests extends AbstractTab { @Override public void onTabClicked() { - Minecraft mc = Minecraft.getMinecraft(); - mc.displayGuiScreen(new GuiQuestLog(mc.thePlayer)); + Thread t = new Thread(){ + @Override + public void run(){ + try { + Thread.sleep(100); + } catch (InterruptedException e) { + e.printStackTrace(); + } + Minecraft mc = Minecraft.getMinecraft(); + mc.displayGuiScreen(new GuiQuestLog(mc.thePlayer)); + } + }; + t.start(); } @Override From 3c1d7e6689435f19288b512801af6e983900b98f Mon Sep 17 00:00:00 2001 From: Kam Date: Tue, 16 May 2023 12:59:08 -0400 Subject: [PATCH 5/5] oops --- src/main/java/tconstruct/client/tabs/InventoryTabFactions.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/tconstruct/client/tabs/InventoryTabFactions.java b/src/main/java/tconstruct/client/tabs/InventoryTabFactions.java index 7b9af555f..815d27e00 100644 --- a/src/main/java/tconstruct/client/tabs/InventoryTabFactions.java +++ b/src/main/java/tconstruct/client/tabs/InventoryTabFactions.java @@ -26,7 +26,7 @@ public class InventoryTabFactions extends AbstractTab { e.printStackTrace(); } Minecraft mc = Minecraft.getMinecraft(); - mc.displayGuiScreen(new GuiFaction); + mc.displayGuiScreen(new GuiFaction()); } }; t.start();