Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
ee9d803
Cleaned and Fixed some issues, Rewrote hook system for iConomy and Pe…
nijikokun Mar 4, 2011
b0563d5
compiled against bukkit#432 craftbukkit#493
magik Mar 8, 2011
06427ff
fixed checkColumn mysql update ( can't use multiple statements in one
magik Mar 8, 2011
4098fd1
fixed sqlite database lock on create table ( forgot a myQuery.close()
magik Mar 9, 2011
19cd027
Fixed SQLite Update statement that had LIMIT 1 in it
magik Mar 9, 2011
7e6d6f3
fixed another missing MyQuery.close() causing SQLite issues
magik Mar 9, 2011
1a0fe90
taking some baby steps into possible refactoring of connection into a
magik Mar 9, 2011
5717b4f
batch eclipse source->format ( tabs not spaces )
magik Mar 9, 2011
5e1850a
Merge remote branch 'ninjikokun/master'
magik Mar 9, 2011
e59bf38
cleanup
magik Mar 9, 2011
f3354fa
adding dist dir to git for easier switching between branches
magik Mar 9, 2011
7fc3395
adding more dist files
magik Mar 9, 2011
b4f4cf0
removing world files
magik Mar 9, 2011
73241c2
pulling dist back out... *sigh* i hate eclipse+egit
magik Mar 9, 2011
1c392fa
testing gitignore
magik Mar 9, 2011
a62a299
untracking.... *sigh*
magik Mar 9, 2011
6c899f3
more gitignore testing
magik Mar 9, 2011
dce5dac
adding arensirb's code in
magik Mar 9, 2011
03d8241
merged some of arensirb's updates
magik Mar 10, 2011
9350796
adding merge to master branch
magik Mar 10, 2011
45314a1
deleting branches, removed dist
magik Mar 10, 2011
544726f
if you sent a message to a player saying bad command, you DID handle
magik Mar 10, 2011
6e2859c
cleanup
magik Mar 10, 2011
4567eca
dist cleanup
magik Mar 10, 2011
3bb6c8e
updated classpath in ANT builder, updated jar
magik Mar 10, 2011
fc4edd1
added /gshop as an alias for /shop
magik Mar 10, 2011
ca94c93
updated version, updated jar
magik Mar 10, 2011
740d77f
fixed /shop reload - close out SQL connection in onDisable()
magik Mar 10, 2011
15e57dd
fixed /shop add <id>
magik Mar 10, 2011
11461e2
tweaked SQL connection handling to reconnect for next command if error
magik Mar 10, 2011
b4ca6e9
fixed batch buy/sell crossing price floor or ceiling
magik Mar 10, 2011
03fbb28
tweaking SQL connection handling
magik Mar 11, 2011
18256d0
updating jar
magik Mar 11, 2011
07bd28b
added more error tracking for SQL error in executeQuery()
magik Mar 11, 2011
65b1811
update jar
magik Mar 11, 2011
62f0005
fix error on reading errors ( var already nulled )
magik Mar 11, 2011
e9c3351
update jar and version
magik Mar 11, 2011
e5fb306
SQL connection tweaking
Mar 13, 2011
6c8fc8e
added check to see if correct directory being used
Mar 13, 2011
816fc82
fixed directory checking
Mar 13, 2011
b7256bc
fixed getBatchPrice counting logic issues, tweaked directory stuff
Mar 13, 2011
8103232
added functino to enable wrapper mode
Mar 14, 2011
012db5a
update version + jar
Mar 14, 2011
d26288c
fixed issue with renaming command to dshop with alias shop
Mar 14, 2011
eb95938
better handling of shop/dshop command
magik Mar 16, 2011
85a046a
removed eclipse .classpath
Mar 18, 2011
053d0c0
added new hookWrapper interface
magik Mar 18, 2011
a9f860c
fixed color encoding characters, changed hasPermission to public
magik Mar 19, 2011
07c5c34
version bump
Mar 19, 2011
0f95dd6
added some debug info for connection issues
Mar 21, 2011
6d8dd23
updated version
Mar 21, 2011
85f80d9
updated version in plugin.yml to include "v" to force string
magik Mar 21, 2011
50d8673
sqlite issues - autocommit, classpath fixes
magik Mar 23, 2011
3a4a1c5
fixed for craftbukkit RB #602
magik Mar 30, 2011
f4f8bc6
make debug public
magik Mar 30, 2011
819c998
possible mysql missing Driver fix
magik Mar 31, 2011
a61b24d
recompiled for CB#617, removed deprecated iConomy save() call
magik Apr 2, 2011
363c01a
Fixed Color Encoding issue + Permissions not registering properly
Apr 19, 2011
0e2ec18
fixed logic error in getSellPrice & getBuyPrice that would result in
Apr 19, 2011
c03b9f5
version bump
Apr 20, 2011
b448d7f
Revert "fixed logic error in getSellPrice & getBuyPrice that would re…
Apr 20, 2011
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions .classpath

This file was deleted.

5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.classpath
/dist
/dist/world
/dist/world/region
/dist/plugins
81 changes: 81 additions & 0 deletions build.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- WARNING: Eclipse auto-generated file.
Any modifications will be overwritten.
To include a user specific buildfile here, simply create one in the same
directory with the processing instruction <?eclipse.ant.import?>
as the first entry and export the buildfile again. -->
<project basedir="." default="build" name="DynamicMarket">
<property name="version" value="0.4.8.magik.29"/>
<property environment="env"/>
<property name="debuglevel" value="source,lines,vars"/>
<property name="target" value="1.6"/>
<property name="source" value="1.6"/>
<path id="DynamicMarket.classpath">
<pathelement location="bin"/>
<pathelement location="dist/craftbukkit.jar"/>
<pathelement location="dist/bukkit-0.0.1-SNAPSHOT.jar"/>
<pathelement location="dist/plugins/iConomy.jar"/>
<pathelement location="dist/plugins/Permissions.jar"/>
</path>
<target name="init">
<mkdir dir="bin"/>
<copy includeemptydirs="false" todir="bin">
<fileset dir="src">
<exclude name="**/*.launch"/>
<exclude name="**/*.java"/>
</fileset>
</copy>
</target>
<target name="clean">
<delete dir="bin"/>
</target>
<target depends="clean" name="cleanall"/>
<target depends="build-subprojects,build-project" name="build"/>
<target name="build-subprojects"/>
<target depends="init" name="build-project">
<echo message="${ant.project.name}: ${ant.file}"/>
<javac debug="true" debuglevel="${debuglevel}" destdir="bin" source="${source}" target="${target}">
<src path="src"/>
<classpath refid="DynamicMarket.classpath"/>
</javac>
<mkdir dir="dist"/>
<mkdir dir="dist/plugins"/>
<jar jarfile="dist/plugins/DynamicMarket.jar">
<fileset dir="bin"/>
<fileset file="plugin.yml"/>
<manifest>
<attribute name="Version" value="${version}" />
<attribute name="Built-By" value="magik" />
<attribute name="Class-Path" value="./DynamicMarket/sqlitejdbc-v056.jar ./DynamicMarket/mysql-connector-java-5.1.15-bin.jar" />
</manifest>
</jar>
<mkdir dir="target"/>
<mkdir dir="target/DynamicMarket"/>
<copy todir="target">
<fileset file="dist/plugins/DynamicMarket.jar"/>
</copy>
<copy todir="target/DynamicMarket">
<fileset file="DynamicMarket.jar" />
</copy>






</target>
<target description="Build all projects which reference this project. Useful to propagate changes." name="build-refprojects"/>
<target description="copy Eclipse compiler jars to ant lib directory" name="init-eclipse-compiler">
<copy todir="${ant.library.dir}">
<fileset dir="${ECLIPSE_HOME}/plugins" includes="org.eclipse.jdt.core_*.jar"/>
</copy>
<unzip dest="${ant.library.dir}">
<patternset includes="jdtCompilerAdapter.jar"/>
<fileset dir="${ECLIPSE_HOME}/plugins" includes="org.eclipse.jdt.core_*.jar"/>
</unzip>
</target>
<target description="compile project with Eclipse compiler" name="build-eclipse-compiler">
<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
<antcall target="build"/>
</target>
</project>
16 changes: 12 additions & 4 deletions plugin.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: DynamicMarket
main: com.gmail.haloinverse.DynamicMarket.DynamicMarket
version: 0.4.8
author: HaloInverse
main: com.gmail.haloinverse.DynamicMarket.DynamicMarket
version: v0.4.8.magik.29
author: HaloInverse
description: >
A shop plugin building towards an interesting and flexible market system.
commands:
Expand All @@ -11,4 +11,12 @@ commands:
/<command>
/<command> help <topic/command>
/<command> <itemid>
/<command> <subcommand> <args>
/<command> <subcommand> <args>
dshop:
description: Accesses the shop command system.
usage: |
/<command>
/<command> help <topic/command>
/<command> <itemid>
/<command> <subcommand> <args>

Loading