Skip to content
Permalink
Browse files

step 4: This is Denizen 1.0.6

also some code cleaning
  • Loading branch information...
mcmonkey4eva committed May 9, 2019
1 parent a7afa10 commit 027e1cfe0c790cb82560146242630021199fa886
Showing with 20 additions and 32 deletions.
  1. +1 −1 README.md
  2. +1 −1 nmshandler/pom.xml
  3. +1 −1 plugin/pom.xml
  4. +0 −2 plugin/src/main/java/net/aufdemrand/denizen/events/core/CuboidEnterExitSmartEvent.java
  5. +0 −4 plugin/src/main/java/net/aufdemrand/denizen/events/entity/ProjectileHitsScriptEvent.java
  6. +0 −2 plugin/src/main/java/net/aufdemrand/denizen/objects/dCuboid.java
  7. +0 −1 plugin/src/main/java/net/aufdemrand/denizen/objects/dPlayer.java
  8. +0 −1 plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityArrowDamage.java
  9. +0 −2 plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityColor.java
  10. +0 −2 plugin/src/main/java/net/aufdemrand/denizen/objects/properties/item/ItemColor.java
  11. +0 −2 plugin/src/main/java/net/aufdemrand/denizen/objects/properties/item/ItemUnbreakable.java
  12. +0 −2 plugin/src/main/java/net/aufdemrand/denizen/scripts/commands/BukkitCommandRegistry.java
  13. +2 −1 plugin/src/main/java/net/aufdemrand/denizen/scripts/containers/core/ItemScriptHelper.java
  14. +2 −1 plugin/src/main/java/net/aufdemrand/denizen/utilities/MetricsLite.java
  15. +2 −1 plugin/src/main/java/net/aufdemrand/denizen/utilities/debugging/DebugSubmit.java
  16. +2 −1 plugin/src/main/java/net/aufdemrand/denizen/utilities/debugging/StatsRecord.java
  17. +2 −2 pom.xml
  18. +1 −1 v1_12_R1/pom.xml
  19. +2 −1 v1_12_R1/src/main/java/net/aufdemrand/denizen/nms/helpers/CustomEntityHelper_v1_12_R1.java
  20. +1 −1 v1_13_R2/pom.xml
  21. +2 −1 v1_13_R2/src/main/java/net/aufdemrand/denizen/nms/helpers/CustomEntityHelper_v1_13_R2.java
  22. +1 −1 v1_14_R1/pom.xml
@@ -1,7 +1,7 @@
Denizen: Helpful Citizens for Bukkit!
-------------------------------------

**Version 1.0.5**: Compatible with Spigot 1.10.2, 1.11.2, 1.12.2, 1.13.2, and 1.14!
**Version 1.0.6**: Compatible with Spigot 1.12.2, 1.13.2, and 1.14!

#### Download Links:

@@ -4,7 +4,7 @@
<parent>
<artifactId>denizen-parent</artifactId>
<groupId>net.aufdemrand</groupId>
<version>1.0.5-SNAPSHOT</version>
<version>1.0.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

@@ -4,7 +4,7 @@
<parent>
<artifactId>denizen-parent</artifactId>
<groupId>net.aufdemrand</groupId>
<version>1.0.5-SNAPSHOT</version>
<version>1.0.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

@@ -1,7 +1,5 @@
package net.aufdemrand.denizen.events.core;

import net.aufdemrand.denizen.nms.NMSHandler;
import net.aufdemrand.denizen.nms.NMSVersion;
import net.aufdemrand.denizen.objects.dCuboid;
import net.aufdemrand.denizen.objects.dEntity;
import net.aufdemrand.denizen.objects.dLocation;
@@ -2,21 +2,17 @@

import net.aufdemrand.denizen.BukkitScriptEntryData;
import net.aufdemrand.denizen.events.BukkitScriptEvent;
import net.aufdemrand.denizen.nms.NMSHandler;
import net.aufdemrand.denizen.nms.NMSVersion;
import net.aufdemrand.denizen.objects.dEntity;
import net.aufdemrand.denizen.objects.dLocation;
import net.aufdemrand.denizen.objects.dMaterial;
import net.aufdemrand.denizencore.objects.dObject;
import net.aufdemrand.denizencore.scripts.ScriptEntryData;
import net.aufdemrand.denizencore.scripts.containers.ScriptContainer;
import net.aufdemrand.denizencore.utilities.CoreUtilities;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.entity.ProjectileHitEvent;
import org.bukkit.util.BlockIterator;

public class ProjectileHitsScriptEvent extends BukkitScriptEvent implements Listener {

@@ -6,7 +6,6 @@
import net.aufdemrand.denizen.nms.interfaces.BlockHelper;
import net.aufdemrand.denizen.objects.notable.NotableManager;
import net.aufdemrand.denizen.utilities.Utilities;
import net.aufdemrand.denizen.utilities.blocks.OldMaterialsHelper;
import net.aufdemrand.denizen.utilities.debugging.dB;
import net.aufdemrand.denizen.utilities.depends.Depends;
import net.aufdemrand.denizencore.objects.*;
@@ -22,7 +21,6 @@
import org.bukkit.World;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.material.MaterialData;

import java.util.ArrayList;
import java.util.HashMap;
@@ -2,7 +2,6 @@

import net.aufdemrand.denizen.flags.FlagManager;
import net.aufdemrand.denizen.nms.NMSHandler;
import net.aufdemrand.denizen.nms.NMSVersion;
import net.aufdemrand.denizen.nms.abstracts.ImprovedOfflinePlayer;
import net.aufdemrand.denizen.nms.abstracts.Sidebar;
import net.aufdemrand.denizen.nms.interfaces.PlayerHelper;
@@ -1,7 +1,6 @@
package net.aufdemrand.denizen.objects.properties.entity;

import net.aufdemrand.denizen.nms.NMSHandler;
import net.aufdemrand.denizen.nms.NMSVersion;
import net.aufdemrand.denizen.objects.dEntity;
import net.aufdemrand.denizencore.objects.Element;
import net.aufdemrand.denizencore.objects.Mechanism;
@@ -1,7 +1,5 @@
package net.aufdemrand.denizen.objects.properties.entity;

import net.aufdemrand.denizen.nms.NMSHandler;
import net.aufdemrand.denizen.nms.NMSVersion;
import net.aufdemrand.denizen.objects.dEntity;
import net.aufdemrand.denizen.utilities.debugging.dB;
import net.aufdemrand.denizen.utilities.entity.LlamaHelper;
@@ -1,7 +1,5 @@
package net.aufdemrand.denizen.objects.properties.item;

import net.aufdemrand.denizen.nms.NMSHandler;
import net.aufdemrand.denizen.nms.NMSVersion;
import net.aufdemrand.denizen.objects.dColor;
import net.aufdemrand.denizen.objects.dItem;
import net.aufdemrand.denizencore.objects.Mechanism;
@@ -1,7 +1,5 @@
package net.aufdemrand.denizen.objects.properties.item;

import net.aufdemrand.denizen.nms.NMSHandler;
import net.aufdemrand.denizen.nms.NMSVersion;
import net.aufdemrand.denizen.objects.dItem;
import net.aufdemrand.denizencore.objects.Element;
import net.aufdemrand.denizencore.objects.Mechanism;
@@ -1,7 +1,5 @@
package net.aufdemrand.denizen.scripts.commands;

import net.aufdemrand.denizen.nms.NMSHandler;
import net.aufdemrand.denizen.nms.NMSVersion;
import net.aufdemrand.denizen.scripts.commands.core.*;
import net.aufdemrand.denizen.scripts.commands.entity.*;
import net.aufdemrand.denizen.scripts.commands.item.*;
@@ -28,6 +28,7 @@
import org.bukkit.inventory.Recipe;

import java.math.BigInteger;
import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
@@ -209,7 +210,7 @@ public static String createItemScriptID(String name) {
colors.append(ItemScriptHashID);
try {
MessageDigest md = MessageDigest.getInstance("MD5");
byte[] bytes = script.getBytes("UTF-8");
byte[] bytes = script.getBytes(StandardCharsets.UTF_8);
md.update(bytes, 0, bytes.length);
String hash = new BigInteger(1, md.digest()).toString(16);
for (int i = 0; i < 16; i++) {
@@ -40,6 +40,7 @@
import java.net.URL;
import java.net.URLConnection;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.util.UUID;
import java.util.logging.Level;
import java.util.zip.GZIPOutputStream;
@@ -392,7 +393,7 @@ else if (response.startsWith("7")) {

try {
gzos = new GZIPOutputStream(baos);
gzos.write(input.getBytes("UTF-8"));
gzos.write(input.getBytes(StandardCharsets.UTF_8));
}
catch (IOException e) {
e.printStackTrace();
@@ -16,6 +16,7 @@
import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;

public class DebugSubmit extends Thread {
public String recording;
@@ -91,7 +92,7 @@ public void run() {
+ "\nOffline Players: " + (dPlayer.getAllPlayers().size() - playerCount)
+ "\nMode: " + (Bukkit.getServer().getOnlineMode() ? "online" : "offline") + (bungee ? " (BungeeCoord)" : "")
+ "\n\n") + recording)
.getBytes("UTF-8"));
.getBytes(StandardCharsets.UTF_8));
// Wait for a response from the server
in = new BufferedReader(new InputStreamReader(uc.getInputStream()));
// Record the response
@@ -11,6 +11,7 @@
import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;

public class StatsRecord extends Thread {
@Override
@@ -34,7 +35,7 @@ public void run() {
uc.getOutputStream().write(("postid=pluginstats&plugin_st_players=" + Bukkit.getOnlinePlayers().size()
+ "&plugin_st_motd=" + URLEncoder.encode(Bukkit.getServer().getMotd().replace(ChatColor.COLOR_CHAR, (char) 0x01))
+ "&plugin_st_known_scripts=" + sb.toString())
.getBytes("UTF-8"));
.getBytes(StandardCharsets.UTF_8));
// Wait for a response from the server
in = new BufferedReader(new InputStreamReader(uc.getInputStream()));
// Record the response
@@ -6,7 +6,7 @@
<groupId>net.aufdemrand</groupId>
<artifactId>denizen-parent</artifactId>
<packaging>pom</packaging>
<version>1.0.5-SNAPSHOT</version>
<version>1.0.6-SNAPSHOT</version>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -15,7 +15,7 @@
<dcore.version>1.40-SNAPSHOT</dcore.version>
<BUILD_NUMBER>Unknown</BUILD_NUMBER>
<BUILD_CLASS>CUSTOM</BUILD_CLASS>
<DENIZEN_VERSION>1.0.5</DENIZEN_VERSION>
<DENIZEN_VERSION>1.0.6</DENIZEN_VERSION>
</properties>

<modules>
@@ -4,7 +4,7 @@
<parent>
<artifactId>denizen-parent</artifactId>
<groupId>net.aufdemrand</groupId>
<version>1.0.5-SNAPSHOT</version>
<version>1.0.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

@@ -24,6 +24,7 @@
import org.bukkit.scoreboard.Team;

import java.math.BigInteger;
import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.util.UUID;

@@ -126,7 +127,7 @@ else if (name.length() > 46) {
String hash = null;
try {
MessageDigest md = MessageDigest.getInstance("MD5");
byte[] bytes = teamName.getBytes("UTF-8");
byte[] bytes = teamName.getBytes(StandardCharsets.UTF_8);
md.update(bytes, 0, bytes.length);
hash = new BigInteger(1, md.digest()).toString(16).substring(0, 16);
}
@@ -4,7 +4,7 @@
<parent>
<artifactId>denizen-parent</artifactId>
<groupId>net.aufdemrand</groupId>
<version>1.0.5-SNAPSHOT</version>
<version>1.0.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

@@ -24,6 +24,7 @@
import org.bukkit.scoreboard.Team;

import java.math.BigInteger;
import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.util.UUID;

@@ -126,7 +127,7 @@ else if (name.length() > 46) {
String hash = null;
try {
MessageDigest md = MessageDigest.getInstance("MD5");
byte[] bytes = teamName.getBytes("UTF-8");
byte[] bytes = teamName.getBytes(StandardCharsets.UTF_8);
md.update(bytes, 0, bytes.length);
hash = new BigInteger(1, md.digest()).toString(16).substring(0, 16);
}
@@ -5,7 +5,7 @@
<parent>
<artifactId>denizen-parent</artifactId>
<groupId>net.aufdemrand</groupId>
<version>1.0.5-SNAPSHOT</version>
<version>1.0.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

0 comments on commit 027e1cf

Please sign in to comment.
You can’t perform that action at this time.