Skip to content

Commit 592f724

Browse files
author
InfinityDevFlo
committed
New Version 1.0.1
1 parent a896771 commit 592f724

File tree

6 files changed

+131
-119
lines changed

6 files changed

+131
-119
lines changed

LICENSE

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -294,17 +294,17 @@ in one of these ways:
294294
from the Corresponding Source as a System Library, need not be
295295
included in conveying the object code work.
296296

297-
A "User Product" is either (1) a "consumer product", which means any
297+
A "User Product" is either (1) a "Consumer product", which means any
298298
tangible personal property which is normally used for personal, family,
299299
or household purposes, or (2) anything designed or sold for incorporation
300-
into a dwelling. In determining whether a product is a consumer product,
300+
into a dwelling. In determining whether a product is a Consumer product,
301301
doubtful cases shall be resolved in favor of coverage. For a particular
302302
product received by a particular user, "normally used" refers to a
303303
typical or common use of that class of product, regardless of the status
304304
of the particular user or of the way in which the particular user
305305
actually uses, or expects or is expected to use, the product. A product
306-
is a consumer product regardless of whether the product has substantial
307-
commercial, industrial or non-consumer uses, unless such uses represent
306+
is a Consumer product regardless of whether the product has substantial
307+
commercial, industrial or non-Consumer uses, unless such uses represent
308308
the only significant mode of use of the product.
309309

310310
"Installation Information" for a User Product means any methods,

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](LICENSE)
44
[![Discord](https://img.shields.io/discord/785956343407181824.svg)](https://discord.gg/wvcX92VyEH)
55

6-
#### The Simple Item Lib is a Library wich allows to easily add eventlistener by a consumer to the ItemStack ( Items are identified by 24char random string set in ItemMeta )
6+
#### The Simple Item Lib is a Library wich allows to easily add eventlistener by a Consumer to the ItemStack ( Items are identified by 24char random string set in ItemMeta )
77

88
---
99

build.gradle

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
import org.apache.tools.ant.filters.ReplaceTokens
2-
31
apply plugin: 'java'
42
apply plugin: 'java-library'
53
apply plugin: 'maven-publish'
64

75
group = 'eu.vironlab'
8-
version = '1.0-SNAPSHOT'
6+
version = '1.0.1'
97

108
sourceCompatibility = '1.8'
119
targetCompatibility = '1.8'
@@ -16,14 +14,20 @@ repositories {
1614
name = 'spigotmc-repo'
1715
url = 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/'
1816
}
17+
maven {
18+
name 'jitpack'
19+
url 'https://jitpack.io'
20+
}
21+
1922
}
2023

2124
dependencies {
2225
compileOnly 'org.bukkit:bukkit:1.15-R0.1-SNAPSHOT'
26+
compile 'com.github.derrop:documents:1.1-RELEASE'
2327
}
2428

25-
processResources {
26-
from(sourceSets.main.resources.srcDirs) {
27-
filter ReplaceTokens, tokens: [version: version]
29+
jar {
30+
from {
31+
configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
2832
}
2933
}

gradlew

Lines changed: 101 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -26,154 +26,154 @@
2626
# Resolve links: $0 may be a link
2727
PRG="$0"
2828
# Need this for relative symlinks.
29-
while [ -h "$PRG" ] ; do
30-
ls=`ls -ld "$PRG"`
31-
link=`expr "$ls" : '.*-> \(.*\)$'`
32-
if expr "$link" : '/.*' > /dev/null; then
33-
PRG="$link"
34-
else
35-
PRG=`dirname "$PRG"`"/$link"
36-
fi
29+
while [ -h "$PRG" ]; do
30+
ls=$(ls -ld "$PRG")
31+
link=$(expr "$ls" : '.*-> \(.*\)$')
32+
if expr "$link" : '/.*' >/dev/null; then
33+
PRG="$link"
34+
else
35+
PRG=$(dirname "$PRG")"/$link"
36+
fi
3737
done
38-
SAVED="`pwd`"
39-
cd "`dirname \"$PRG\"`/" >/dev/null
40-
APP_HOME="`pwd -P`"
38+
SAVED="$(pwd)"
39+
cd "$(dirname \"$PRG\")/" >/dev/null
40+
APP_HOME="$(pwd -P)"
4141
cd "$SAVED" >/dev/null
4242

4343
APP_NAME="Gradle"
44-
APP_BASE_NAME=`basename "$0"`
44+
APP_BASE_NAME=$(basename "$0")
4545

4646
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
4747
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
4848

4949
# Use the maximum available, or set MAX_FD != -1 to use that value.
5050
MAX_FD="maximum"
5151

52-
warn () {
53-
echo "$*"
52+
warn() {
53+
echo "$*"
5454
}
5555

56-
die () {
57-
echo
58-
echo "$*"
59-
echo
60-
exit 1
56+
die() {
57+
echo
58+
echo "$*"
59+
echo
60+
exit 1
6161
}
6262

6363
# OS specific support (must be 'true' or 'false').
6464
cygwin=false
6565
msys=false
6666
darwin=false
6767
nonstop=false
68-
case "`uname`" in
69-
CYGWIN* )
70-
cygwin=true
71-
;;
72-
Darwin* )
73-
darwin=true
74-
;;
75-
MINGW* )
76-
msys=true
77-
;;
78-
NONSTOP* )
79-
nonstop=true
80-
;;
68+
case "$(uname)" in
69+
CYGWIN*)
70+
cygwin=true
71+
;;
72+
Darwin*)
73+
darwin=true
74+
;;
75+
MINGW*)
76+
msys=true
77+
;;
78+
NONSTOP*)
79+
nonstop=true
80+
;;
8181
esac
8282

8383
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
8484

8585
# Determine the Java command to use to start the JVM.
86-
if [ -n "$JAVA_HOME" ] ; then
87-
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
88-
# IBM's JDK on AIX uses strange locations for the executables
89-
JAVACMD="$JAVA_HOME/jre/sh/java"
90-
else
91-
JAVACMD="$JAVA_HOME/bin/java"
92-
fi
93-
if [ ! -x "$JAVACMD" ] ; then
94-
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
86+
if [ -n "$JAVA_HOME" ]; then
87+
if [ -x "$JAVA_HOME/jre/sh/java" ]; then
88+
# IBM's JDK on AIX uses strange locations for the executables
89+
JAVACMD="$JAVA_HOME/jre/sh/java"
90+
else
91+
JAVACMD="$JAVA_HOME/bin/java"
92+
fi
93+
if [ ! -x "$JAVACMD" ]; then
94+
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
9595
9696
Please set the JAVA_HOME variable in your environment to match the
9797
location of your Java installation."
98-
fi
98+
fi
9999
else
100-
JAVACMD="java"
101-
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
100+
JAVACMD="java"
101+
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
102102
103103
Please set the JAVA_HOME variable in your environment to match the
104104
location of your Java installation."
105105
fi
106106

107107
# Increase the maximum file descriptors if we can.
108-
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
109-
MAX_FD_LIMIT=`ulimit -H -n`
110-
if [ $? -eq 0 ] ; then
111-
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
112-
MAX_FD="$MAX_FD_LIMIT"
113-
fi
114-
ulimit -n $MAX_FD
115-
if [ $? -ne 0 ] ; then
116-
warn "Could not set maximum file descriptor limit: $MAX_FD"
117-
fi
118-
else
119-
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
108+
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ]; then
109+
MAX_FD_LIMIT=$(ulimit -H -n)
110+
if [ $? -eq 0 ]; then
111+
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ]; then
112+
MAX_FD="$MAX_FD_LIMIT"
120113
fi
114+
ulimit -n $MAX_FD
115+
if [ $? -ne 0 ]; then
116+
warn "Could not set maximum file descriptor limit: $MAX_FD"
117+
fi
118+
else
119+
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
120+
fi
121121
fi
122122

123123
# For Darwin, add options to specify how the application appears in the dock
124124
if $darwin; then
125-
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
125+
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
126126
fi
127127

128128
# For Cygwin or MSYS, switch paths to Windows format before running java
129-
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
130-
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
131-
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
132-
JAVACMD=`cygpath --unix "$JAVACMD"`
133-
134-
# We build the pattern for arguments to be converted via cygpath
135-
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
136-
SEP=""
137-
for dir in $ROOTDIRSRAW ; do
138-
ROOTDIRS="$ROOTDIRS$SEP$dir"
139-
SEP="|"
140-
done
141-
OURCYGPATTERN="(^($ROOTDIRS))"
142-
# Add a user-defined pattern to the cygpath arguments
143-
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
144-
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
129+
if [ "$cygwin" = "true" -o "$msys" = "true" ]; then
130+
APP_HOME=$(cygpath --path --mixed "$APP_HOME")
131+
CLASSPATH=$(cygpath --path --mixed "$CLASSPATH")
132+
JAVACMD=$(cygpath --unix "$JAVACMD")
133+
134+
# We build the pattern for arguments to be converted via cygpath
135+
ROOTDIRSRAW=$(find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null)
136+
SEP=""
137+
for dir in $ROOTDIRSRAW; do
138+
ROOTDIRS="$ROOTDIRS$SEP$dir"
139+
SEP="|"
140+
done
141+
OURCYGPATTERN="(^($ROOTDIRS))"
142+
# Add a user-defined pattern to the cygpath arguments
143+
if [ "$GRADLE_CYGPATTERN" != "" ]; then
144+
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
145+
fi
146+
# Now convert the arguments - kludge to limit ourselves to /bin/sh
147+
i=0
148+
for arg in "$@"; do
149+
CHECK=$(echo "$arg" | egrep -c "$OURCYGPATTERN" -)
150+
CHECK2=$(echo "$arg" | egrep -c "^-") ### Determine if an option
151+
152+
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ]; then ### Added a condition
153+
eval $(echo args$i)=$(cygpath --path --ignore --mixed "$arg")
154+
else
155+
eval $(echo args$i)="\"$arg\""
145156
fi
146-
# Now convert the arguments - kludge to limit ourselves to /bin/sh
147-
i=0
148-
for arg in "$@" ; do
149-
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
150-
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
151-
152-
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
153-
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
154-
else
155-
eval `echo args$i`="\"$arg\""
156-
fi
157-
i=$((i+1))
158-
done
159-
case $i in
160-
(0) set -- ;;
161-
(1) set -- "$args0" ;;
162-
(2) set -- "$args0" "$args1" ;;
163-
(3) set -- "$args0" "$args1" "$args2" ;;
164-
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
165-
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
166-
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
167-
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
168-
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
169-
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
170-
esac
157+
i=$((i + 1))
158+
done
159+
case $i in
160+
0) set -- ;;
161+
1) set -- "$args0" ;;
162+
2) set -- "$args0" "$args1" ;;
163+
3) set -- "$args0" "$args1" "$args2" ;;
164+
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
165+
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
166+
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
167+
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
168+
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
169+
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
170+
esac
171171
fi
172172

173173
# Escape application args
174-
save () {
175-
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
176-
echo " "
174+
save() {
175+
for i; do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/"; done
176+
echo " "
177177
}
178178
APP_ARGS=$(save "$@")
179179

src/main/java/eu/vironlab/simpleitemlib/SimpleItemBuilder.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,4 +213,12 @@ public SimpleItemStack build() {
213213
SimpleItemLib.getInstance().simpleItemStacks.put(key, itemStack);
214214
return itemStack;
215215
}
216+
217+
public SimpleItemStack build(String key) {
218+
this.meta.getPersistentDataContainer().set(SimpleItemLib.getInstance().key, PersistentDataType.STRING, key);
219+
this.item.setItemMeta(this.meta);
220+
SimpleItemStack itemStack = new SimpleItemStack(item, clickHandler, dropHandler, interactHandler);
221+
SimpleItemLib.getInstance().simpleItemStacks.put(key, itemStack);
222+
return itemStack;
223+
}
216224
}

src/main/resources/plugin.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@
3434
# Website: https://vironlab.eu/
3535
3636
#
37-
name: SimpleItemLib
38-
version: @version@
39-
main: eu.vironlab.simpleitemlib.SimpleItemLib
40-
api-version: 1.15
41-
load: STARTUP
42-
authors: [ VironLab ]
43-
description: This is a simple ItemLibPlugin
37+
name: 'SimpleItemLib'
38+
version: 1.0.1
39+
main: 'eu.vironlab.simpleitemlib.SimpleItemLib'
40+
api-version: '1.16'
41+
load: 'STARTUP'
42+
authors: [ 'VironLab' ]
43+
description: 'This is a simple ItemLibPlugin'

0 commit comments

Comments
 (0)