Make changes to the 1.15.1 update

* Cant change plugin prefix. 
* Name fox with the AnvilGUI API.
* Disable the plugin if its not running on the correct server version.
This commit is contained in:
SeanOMik 2020-01-18 13:22:36 -06:00
parent 045ced4f1d
commit cd8918c7c0
No known key found for this signature in database
GPG Key ID: FA4D55AC05268A88
45 changed files with 331 additions and 132 deletions

140
.gitignore vendored
View File

@ -1,15 +1,133 @@
# Don't track content of these folders
.idea/*
target/*
# Compiled source # # Created by https://www.gitignore.io/api/java,maven,intellij
################### # Edit at https://www.gitignore.io/?templates=java,maven,intellij
### Intellij ###
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
.idea/**
# User-specific stuff
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/**/usage.statistics.xml
.idea/**/dictionaries
.idea/**/shelf
# Generated files
.idea/**/contentModel.xml
# Sensitive or high-churn files
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml
.idea/**/dbnavigator.xml
# Gradle
.idea/**/gradle.xml
.idea/**/libraries
# Gradle and Maven with auto-import
# When using Gradle or Maven with auto-import, you should exclude module files,
# since they will be recreated, and may cause churn. Uncomment if using
# auto-import.
# .idea/modules.xml
# .idea/*.iml
# .idea/modules
# *.iml
# *.ipr
# CMake
cmake-build-*/
# Mongo Explorer plugin
.idea/**/mongoSettings.xml
# File-based project format
*.iws
# IntelliJ
out/
# mpeltonen/sbt-idea plugin
.idea_modules/
# JIRA plugin
atlassian-ide-plugin.xml
# Cursive Clojure plugin
.idea/replstate.xml
# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties
# Editor-based Rest Client
.idea/httpRequests
# Android studio 3.1+ serialized cache file
.idea/caches/build_file_checksums.ser
### Intellij Patch ###
# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
*.iml
modules.xml
.idea/**/misc.xml
*.ipr
# Sonarlint plugin
.idea/**/sonarlint/
# SonarQube Plugin
.idea/**/sonarIssues.xml
# Markdown Navigator plugin
.idea/**/markdown-navigator.xml
.idea/**/markdown-navigator/
### Java ###
# Compiled class file
*.class *.class
# Packages # # Log file
############ *.log
# it's better to unpack these files and commit the raw source
# git has its own built in compression methods # BlueJ files
#*.7z *.ctxt
#*.dmg
# Mobile Tools for Java (J2ME)
.mtj.tmp/
# Package Files #
*.jar *.jar
*.war
*.nar
*.ear
*.zip
*.tar.gz
*.rar
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
### Maven ###
target/
pom.xml.tag
pom.xml.releaseBackup
pom.xml.versionsBackup
pom.xml.next
release.properties
dependency-reduced-pom.xml
buildNumber.properties
.mvn/timing.properties
.mvn/wrapper/maven-wrapper.jar
.flattened-pom.xml
# End of https://www.gitignore.io/api/java,maven,intellij

View File

@ -6,6 +6,7 @@
<sourceOutputDir name="target/generated-sources/annotations" /> <sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" /> <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" /> <outputRelativeToContentRoot value="true" />
<module name="GitTamableFoxes" />
<module name="tamableFoxes" /> <module name="tamableFoxes" />
</profile> </profile>
</annotationProcessing> </annotationProcessing>

View File

@ -2,5 +2,7 @@
<project version="4"> <project version="4">
<component name="Encoding"> <component name="Encoding">
<file url="file://$PROJECT_DIR$" charset="UTF-8" /> <file url="file://$PROJECT_DIR$" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
</component> </component>
</project> </project>

View File

@ -1,5 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="EntryPointsManager">
<list size="1">
<item index="0" class="java.lang.String" itemvalue="org.bukkit.event.EventHandler" />
</list>
</component>
<component name="ExternalStorageConfigurationManager" enabled="true" /> <component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="MavenProjectsManager"> <component name="MavenProjectsManager">
<option name="originalFiles"> <option name="originalFiles">

View File

@ -2,65 +2,52 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="dcab9632-7b1a-44d7-9283-be9b37640afc" name="Default Changelist" comment=""> <list default="true" id="dcab9632-7b1a-44d7-9283-be9b37640afc" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/$PRODUCT_WORKSPACE_FILE$" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/.name" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/1.14 TRANS.xlsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/lib/spigot-1.15.1.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/net/seanomilk/tamablefoxes/EntityTamableFox.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/net/seanomilk/tamablefoxes/TamableFoxes.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/net/seanomilk/tamablefoxes/command/CommandSpawnTamableFox.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/net/seanomilk/tamablefoxes/io/FileManager.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/net/seanomilk/tamablefoxes/pathfinding/FoxPathfindGoalBeg.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/net/seanomilk/tamablefoxes/pathfinding/FoxPathfindGoalBreed.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/net/seanomilk/tamablefoxes/pathfinding/FoxPathfindGoalFleeSun.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/net/seanomilk/tamablefoxes/pathfinding/FoxPathfindGoalFloat.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/net/seanomilk/tamablefoxes/pathfinding/FoxPathfindGoalLunge.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/net/seanomilk/tamablefoxes/pathfinding/FoxPathfindGoalLungeUNKNOWN_USE.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/net/seanomilk/tamablefoxes/pathfinding/FoxPathfindGoalMeleeAttack.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/net/seanomilk/tamablefoxes/pathfinding/FoxPathfindGoalOwnerHurtTarget.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/net/seanomilk/tamablefoxes/pathfinding/FoxPathfindGoalPickBushes.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/net/seanomilk/tamablefoxes/pathfinding/FoxPathfindGoalRandomStrollLand.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/net/seanomilk/tamablefoxes/pathfinding/FoxPathfindGoalRandomTargetNonTamed.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/artifacts/TamableFoxes_SNAPSHOT_jar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_wesjd_anvilgui_1_2_1_SNAPSHOT.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_spigotmc_spigot_1_14_4_R0_1_SNAPSHOT.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/uiDesigner.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/TamableFoxes.iml" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/lib/spigot-1.15.1.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/net/seanomik/tamablefoxes/Commands/CommandSpawnTamableFox.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/net/seanomilk/tamablefoxes/EntityTamableFox.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/seanomilk/tamablefoxes/EntityTamableFox.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/net/seanomik/tamablefoxes/ConfigManager.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/net/seanomilk/tamablefoxes/TamableFoxes.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/seanomilk/tamablefoxes/TamableFoxes.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/net/seanomik/tamablefoxes/CustomPathfinding/FoxPathfinderGoalBeg.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/net/seanomik/tamablefoxes/CustomPathfinding/FoxPathfinderGoalBreed.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/net/seanomik/tamablefoxes/CustomPathfinding/FoxPathfinderGoalFleeSun.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/net/seanomik/tamablefoxes/CustomPathfinding/FoxPathfinderGoalFloat.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/net/seanomik/tamablefoxes/CustomPathfinding/FoxPathfinderGoalFollowOwner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/seanomilk/tamablefoxes/pathfinding/FoxPathfindGoalFollowOwner.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/net/seanomik/tamablefoxes/CustomPathfinding/FoxPathfinderGoalHurtByTarget.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/seanomilk/tamablefoxes/pathfinding/FoxPathfindGoalHurtByTarget.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/net/seanomik/tamablefoxes/CustomPathfinding/FoxPathfinderGoalLunge.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/net/seanomik/tamablefoxes/CustomPathfinding/FoxPathfinderGoalLungeUNKNOWN_USE.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/net/seanomik/tamablefoxes/CustomPathfinding/FoxPathfinderGoalMeleeAttack.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/net/seanomik/tamablefoxes/CustomPathfinding/FoxPathfinderGoalOwnerHurtByTarget.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/seanomilk/tamablefoxes/pathfinding/FoxPathfindGoalOwnerHurtByTarget.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/net/seanomik/tamablefoxes/CustomPathfinding/FoxPathfinderGoalOwnerHurtTarget.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/net/seanomik/tamablefoxes/CustomPathfinding/FoxPathfinderGoalPickBushes.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/net/seanomik/tamablefoxes/CustomPathfinding/FoxPathfinderGoalRandomStrollLand.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/net/seanomik/tamablefoxes/CustomPathfinding/FoxPathfinderGoalRandomTargetNonTamed.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/net/seanomik/tamablefoxes/CustomPathfinding/FoxPathfinderGoalSit.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/seanomilk/tamablefoxes/pathfinding/FoxPathfindGoalSit.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/net/seanomik/tamablefoxes/NBTEditor.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/net/seanomik/tamablefoxes/Reference.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/net/seanomik/tamablefoxes/TamableFox.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/net/seanomik/tamablefoxes/TamableFoxes.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/net/seanomik/tamablefoxes/Utils/FileManager.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/net/seanomik/tamablefoxes/Utils/Utils.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/config.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/config.yml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/resources/config.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/config.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/plugin.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/plugin.yml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/META-INF/TamableFoxes.kotlin_module" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/config.yml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/config.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/net/seanomik/tamablefoxes/Commands/CommandSpawnTamableFox.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/net/seanomik/tamablefoxes/ConfigManager.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/net/seanomik/tamablefoxes/CustomPathfinding/FoxPathfinderGoalBeg.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/net/seanomik/tamablefoxes/CustomPathfinding/FoxPathfinderGoalBreed.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/net/seanomik/tamablefoxes/CustomPathfinding/FoxPathfinderGoalFleeSun.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/net/seanomik/tamablefoxes/CustomPathfinding/FoxPathfinderGoalFloat.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/net/seanomik/tamablefoxes/CustomPathfinding/FoxPathfinderGoalFollowOwner.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/net/seanomik/tamablefoxes/CustomPathfinding/FoxPathfinderGoalHurtByTarget.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/net/seanomik/tamablefoxes/CustomPathfinding/FoxPathfinderGoalLunge.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/net/seanomik/tamablefoxes/CustomPathfinding/FoxPathfinderGoalLungeUNKNOWN_USE.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/net/seanomik/tamablefoxes/CustomPathfinding/FoxPathfinderGoalMeleeAttack.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/net/seanomik/tamablefoxes/CustomPathfinding/FoxPathfinderGoalOwnerHurtByTarget.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/net/seanomik/tamablefoxes/CustomPathfinding/FoxPathfinderGoalOwnerHurtTarget.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/net/seanomik/tamablefoxes/CustomPathfinding/FoxPathfinderGoalPickBushes.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/net/seanomik/tamablefoxes/CustomPathfinding/FoxPathfinderGoalRandomStrollLand.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/net/seanomik/tamablefoxes/CustomPathfinding/FoxPathfinderGoalRandomTargetNonTamed.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/net/seanomik/tamablefoxes/CustomPathfinding/FoxPathfinderGoalSit.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/net/seanomik/tamablefoxes/NBTEditor$NBTCompound.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/net/seanomik/tamablefoxes/NBTEditor.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/net/seanomik/tamablefoxes/Reference.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/net/seanomik/tamablefoxes/TamableFox$UpdateFoxRunnable.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/net/seanomik/tamablefoxes/TamableFox.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/net/seanomik/tamablefoxes/TamableFoxes.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/net/seanomik/tamablefoxes/Utils/FileManager$Config.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/net/seanomik/tamablefoxes/Utils/FileManager.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/net/seanomik/tamablefoxes/Utils/Utils.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/plugin.yml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/plugin.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-archiver/pom.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/original-tamableFoxes-0.8-SNAPSHOT.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/tamableFoxes-0.8-SNAPSHOT-shaded.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/tamableFoxes-0.8-SNAPSHOT.jar" beforeDir="false" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@ -69,8 +56,21 @@
<component name="Git.Settings"> <component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component> </component>
<component name="MavenImportPreferences">
<option name="importingSettings">
<MavenImportingSettings>
<option name="importAutomatically" value="true" />
</MavenImportingSettings>
</option>
</component>
<component name="ProjectId" id="1WXR7SMZcGllgYVjIOg98VPV9wX" /> <component name="ProjectId" id="1WXR7SMZcGllgYVjIOg98VPV9wX" />
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showExcludedFiles" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" /> <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" /> <property name="aspect.path.notification.shown" value="true" />
@ -92,15 +92,15 @@
<recent name="D:\Ellie\ProjectDirectory\tamablefoxes-1\TamableFoxes-1" /> <recent name="D:\Ellie\ProjectDirectory\tamablefoxes-1\TamableFoxes-1" />
</key> </key>
</component> </component>
<component name="RunDashboard"> <component name="ServiceViewManager">
<option name="ruleStates"> <option name="viewStates">
<list> <list>
<RuleState> <serviceView>
<option name="name" value="ConfigurationTypeDashboardGroupingRule" /> <treeState>
</RuleState> <expand />
<RuleState> <select />
<option name="name" value="StatusDashboardGroupingRule" /> </treeState>
</RuleState> </serviceView>
</list> </list>
</option> </option>
</component> </component>
@ -136,4 +136,34 @@
</map> </map>
</option> </option>
</component> </component>
<component name="WindowStateProjectService">
<state width="1877" height="218" key="GridCell.Tab.0.bottom" timestamp="1579374675050">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="218" key="GridCell.Tab.0.bottom/0.0.1920.1040/-1920.0.1920.1040@0.0.1920.1040" timestamp="1579374675050" />
<state width="1877" height="218" key="GridCell.Tab.0.center" timestamp="1579374675050">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="218" key="GridCell.Tab.0.center/0.0.1920.1040/-1920.0.1920.1040@0.0.1920.1040" timestamp="1579374675050" />
<state width="1877" height="218" key="GridCell.Tab.0.left" timestamp="1579374675050">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="218" key="GridCell.Tab.0.left/0.0.1920.1040/-1920.0.1920.1040@0.0.1920.1040" timestamp="1579374675050" />
<state width="1877" height="218" key="GridCell.Tab.0.right" timestamp="1579374675050">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="218" key="GridCell.Tab.0.right/0.0.1920.1040/-1920.0.1920.1040@0.0.1920.1040" timestamp="1579374675050" />
<state x="490" y="174" key="Maven.ArtifactSearchDialog" timestamp="1579373377880">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="490" y="174" key="Maven.ArtifactSearchDialog/0.0.1920.1040/-1920.0.1920.1040@0.0.1920.1040" timestamp="1579373377880" />
<state width="498" height="446" key="SwitcherDM" timestamp="1579367994204">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="498" height="446" key="SwitcherDM/0.0.1920.1040/-1920.0.1920.1040@0.0.1920.1040" timestamp="1579367994204" />
<state x="656" y="343" key="com.intellij.ide.util.TipDialog" timestamp="1579373551508">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="656" y="343" key="com.intellij.ide.util.TipDialog/0.0.1920.1040/-1920.0.1920.1040@0.0.1920.1040" timestamp="1579373551508" />
</component>
</project> </project>

Binary file not shown.

34
pom.xml
View File

@ -6,7 +6,7 @@
<groupId>net.seanomik</groupId> <groupId>net.seanomik</groupId>
<artifactId>tamableFoxes</artifactId> <artifactId>tamableFoxes</artifactId>
<version>1.3.2-SNAPSHOT</version> <version>1.4-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>TamableFoxes</name> <name>TamableFoxes</name>
@ -39,7 +39,7 @@
<goal>shade</goal> <goal>shade</goal>
</goals> </goals>
<configuration> <configuration>
<outputFile>C:\Users\sean_\OneDrive\Desktop\minecraftSpigotServer\plugins\${project.artifactId}-${project.version}.jar</outputFile> <outputFile>D:\Code\java\spigotPlugins\TEST_SERVER\plugins\${project.artifactId}-${project.version}.jar</outputFile>
<createDependencyReducedPom>false</createDependencyReducedPom> <createDependencyReducedPom>false</createDependencyReducedPom>
</configuration> </configuration>
</execution> </execution>
@ -56,37 +56,29 @@
<repositories> <repositories>
<repository> <repository>
<id>spigot-repo</id> <id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url> <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
</repository> </repository>
<repository> <repository>
<id>sonatype</id> <id>sonatype</id>
<url>https://oss.sonatype.org/content/groups/public/</url> <url>https://oss.sonatype.org/content/groups/public/</url>
</repository> </repository>
<repository> <repository>
<id>wesjd-repo</id> <id>jitpack.io</id>
<url>https://nexus.wesjd.net/repository/thirdparty/</url> <url>https://jitpack.io</url>
</repository> </repository>
</repositories> </repositories>
<dependencies> <dependencies>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.15.1-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.wesjd</groupId>
<artifactId>anvilgui</artifactId>
<version>1.2.1-SNAPSHOT</version>
</dependency>
<!-- For CraftBukkit -->
<dependency> <dependency>
<groupId>org.spigotmc</groupId> <groupId>org.spigotmc</groupId>
<artifactId>spigot</artifactId> <artifactId>spigot</artifactId>
<scope>system</scope> <version>1.15.1-R0.1-SNAPSHOT</version>
<systemPath>${project.basedir}/lib/spigot-1.15.1.jar</systemPath> </dependency>
<dependency>
<groupId>com.github.WesJD.AnvilGUI</groupId>
<artifactId>anvilgui</artifactId>
<version>478e0c1</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

View File

@ -149,6 +149,7 @@ public class EntityTamableFox extends EntityFox {
public void setChosenName(String chosenName) { public void setChosenName(String chosenName) {
this.chosenName = chosenName; this.chosenName = chosenName;
plugin.getConfigFoxes().set("Foxes." + getUniqueID() + ".name", chosenName).save();
updateFoxVisual(); updateFoxVisual();
} }

View File

@ -6,6 +6,7 @@ import com.mojang.datafixers.types.Type;
import net.seanomilk.tamablefoxes.command.CommandSpawnTamableFox; import net.seanomilk.tamablefoxes.command.CommandSpawnTamableFox;
import net.seanomilk.tamablefoxes.io.FileManager; import net.seanomilk.tamablefoxes.io.FileManager;
import net.minecraft.server.v1_15_R1.*; import net.minecraft.server.v1_15_R1.*;
import net.wesjd.anvilgui.AnvilGUI;
import org.bukkit.Chunk; import org.bukkit.Chunk;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.Particle; import org.bukkit.Particle;
@ -57,6 +58,13 @@ public class TamableFoxes extends JavaPlugin implements Listener {
@Override @Override
public void onEnable() { public void onEnable() {
String version = Bukkit.getServer().getClass().getPackage().getName();
if (!version.equals("org.bukkit.craftbukkit.v1_15_R1")) {
Bukkit.getServer().getConsoleSender().sendMessage(ChatColor.RED + "This plugin version only supports 1.15.1!");
getServer().getPluginManager().disablePlugin(this);
return;
}
fileManager = new FileManager(this); fileManager = new FileManager(this);
this.config = fileManager.getConfig("config.yml"); this.config = fileManager.getConfig("config.yml");
this.config.copyDefaults(true).save(); this.config.copyDefaults(true).save();
@ -340,10 +348,25 @@ public class TamableFoxes extends JavaPlugin implements Listener {
// Name process // Name process
player.sendMessage(ChatColor.RED + ChatColor.BOLD.toString() + "You just tamed a wild fox!"); player.sendMessage(ChatColor.RED + ChatColor.BOLD.toString() + "You just tamed a wild fox!");
player.sendMessage(ChatColor.RED + "What do you want to call it?"); player.sendMessage(ChatColor.RED + "What do you want to call it?");
player.sendMessage(ChatColor.GRAY + "Type a name in chat"); //player.sendMessage(ChatColor.GRAY + "Type a name in chat");
waitingName.put(player, tamableFox.getUniqueID()); //waitingName.put(player, tamableFox.getUniqueID());
tamableFox.setChosenName("???"); tamableFox.setChosenName("???");
new AnvilGUI.Builder()
.onComplete((plr, text) -> { //called when the inventory output slot is clicked
if(!text.equals("")) {
tamableFox.setChosenName(text);
plr.sendMessage(getPrefix() + ChatColor.GREEN + text + " is perfect!");
return AnvilGUI.Response.close();
} else {
return AnvilGUI.Response.text("Insert a name for your fox!");
}
})
.preventClose() // prevents the inventory from being closed
.text("Fox name") // sets the text the GUI should start with
.plugin(this) // set the plugin instance
.open(player); // opens the GUI for the player provided
} else { } else {
player.getWorld().spawnParticle(Particle.SMOKE_NORMAL, entity.getLocation(), 10, 0.3D, 0.3D, 0.3D, 0.15D); player.getWorld().spawnParticle(Particle.SMOKE_NORMAL, entity.getLocation(), 10, 0.3D, 0.3D, 0.3D, 0.15D);
} }
@ -358,7 +381,7 @@ public class TamableFoxes extends JavaPlugin implements Listener {
} }
@EventHandler /*@EventHandler
public void onChat(AsyncPlayerChatEvent event) { public void onChat(AsyncPlayerChatEvent event) {
final Player player = event.getPlayer(); final Player player = event.getPlayer();
@ -384,7 +407,7 @@ public class TamableFoxes extends JavaPlugin implements Listener {
player.sendMessage(chosenName + ChatColor.RESET + ChatColor.GREEN + " is perfect."); player.sendMessage(chosenName + ChatColor.RESET + ChatColor.GREEN + " is perfect.");
waitingName.remove(player); waitingName.remove(player);
} }*/
@EventHandler @EventHandler
public void onPlayerBedEnterEvent(PlayerBedEnterEvent event) { public void onPlayerBedEnterEvent(PlayerBedEnterEvent event) {
@ -454,10 +477,15 @@ public class TamableFoxes extends JavaPlugin implements Listener {
foxUUIDs.remove(entity.getUniqueId()); foxUUIDs.remove(entity.getUniqueId());
if (configFoxes.get().getConfigurationSection("Foxes").contains(entity.getUniqueId().toString())) { if (configFoxes.get().getConfigurationSection("Foxes").contains(entity.getUniqueId().toString())) {
/*EntityTamableFox tamableFox = (EntityTamableFox) ((CraftEntity) entity).getHandle();
if (tamableFox.getOwner() != null && tamableFox.getOwner() instanceof Player) {
Player owner = (Player) tamableFox.getOwner();
owner.sendMessage(getPrefix() + ChatColor.RED + tamableFox.getChosenName() + " was killed!");
}*/
configFoxes.get().set("Foxes." + entity.getUniqueId(), null); configFoxes.get().set("Foxes." + entity.getUniqueId(), null);
fileManager.saveConfig("foxes.yml"); fileManager.saveConfig("foxes.yml");
} }
} }
public boolean isTamableFox(org.bukkit.entity.Entity entity) { public boolean isTamableFox(org.bukkit.entity.Entity entity) {
@ -491,7 +519,8 @@ public class TamableFoxes extends JavaPlugin implements Listener {
} }
public String getPrefix() { public String getPrefix() {
return ChatColor.translateAlternateColorCodes('&', (String) config.get("prefix")); //return ChatColor.translateAlternateColorCodes('&', (String) config.get("prefix"));
return ChatColor.RED + "[Tamable Foxes] ";
} }
public boolean isShowOwnerFoxName() { public boolean isShowOwnerFoxName() {

View File

@ -1,6 +1,4 @@
# Config for Tamable Foxes modified for 1.15.1 # Config for Tamable Foxes modified for 1.15.1
prefix: '&c[Tamable Foxes] '
show-owner-in-fox-name: true show-owner-in-fox-name: true
show-nametags: true show-nametags: true

View File

@ -1 +1,6 @@
# Config for Tamable Foxes modified for 1.15.1
show-owner-in-fox-name: true show-owner-in-fox-name: true
show-nametags: true
tamed-behavior:
no-attack-chicken-rabbit: true

View File

@ -1,11 +1,13 @@
name: TamableFoxes name: TamableFoxes
version: 1.3.2-SNAPSHOT version: 1.4-RELEASE
main: net.seanomik.tamablefoxes.TamableFoxes main: net.seanomilk.tamablefoxes.TamableFoxes
api-version: 1.14 api-version: 1.15
load: POSTWORLD load: POSTWORLD
description: Modified version of TamableFoxes for 1.15.1.
commands: commands:
spawntamablefox: spawntamablefox:
aliases: [stf, spawntf] aliases: [tamablefox, stf, spawntf]
usage: /spawntamablefox [type] usage: /spawntamablefox [type]
description: Spawn a tamable fox at the standing location. Type can be snow or red, or left empty for a red. description: Spawn a tamable fox at the standing location. Type can be snow or red, or left empty for a red.
permissions: permissions:

View File

@ -1,5 +1,5 @@
#Generated by Maven #Generated by Maven
#Fri Jun 21 00:51:53 CDT 2019 #Sat Jan 18 11:25:38 CST 2020
version=0.8-SNAPSHOT version=1.4-SNAPSHOT
groupId=net.seanomik groupId=net.seanomik
artifactId=tamableFoxes artifactId=tamableFoxes

View File

@ -1,13 +1,21 @@
net\seanomik\tamablefoxes\Reference.class net\seanomilk\tamablefoxes\EntityTamableFox.class
net\seanomik\tamablefoxes\TamableFox.class net\seanomilk\tamablefoxes\pathfinding\FoxPathfindGoalBreed.class
net\seanomik\tamablefoxes\CustomPathfinding\FoxPathfinderGoalOwnerHurtByTarget.class net\seanomilk\tamablefoxes\TamableFoxes.class
net\seanomik\tamablefoxes\CustomPathfinding\FoxPathfinderGoalOwnerHurtTarget.class net\seanomilk\tamablefoxes\command\CommandSpawnTamableFox.class
net\seanomik\tamablefoxes\Commands\CommandSpawnTamableFox.class net\seanomilk\tamablefoxes\io\FileManager$Config.class
net\seanomik\tamablefoxes\CustomPathfinding\FoxPathfinderGoalBeg.class net\seanomilk\tamablefoxes\pathfinding\FoxPathfindGoalFloat.class
net\seanomik\tamablefoxes\TamableFoxes.class net\seanomilk\tamablefoxes\pathfinding\FoxPathfindGoalFollowOwner.class
net\seanomik\tamablefoxes\CustomPathfinding\FoxPathfinderGoalSit.class net\seanomilk\tamablefoxes\pathfinding\FoxPathfindGoalMeleeAttack.class
net\seanomik\tamablefoxes\CustomPathfinding\FoxPathfinderGoalFollowOwner.class net\seanomilk\tamablefoxes\io\FileManager.class
net\seanomik\tamablefoxes\NBTEditor.class net\seanomilk\tamablefoxes\EntityTamableFox$UpdateFoxRunnable.class
net\seanomik\tamablefoxes\ConfigManager.class net\seanomilk\tamablefoxes\pathfinding\FoxPathfindGoalRandomTargetNonTamed.class
net\seanomik\tamablefoxes\NBTEditor$NBTCompound.class net\seanomilk\tamablefoxes\pathfinding\FoxPathfindGoalBeg.class
net\seanomik\tamablefoxes\TamableFox$UpdateFoxRunnable.class net\seanomilk\tamablefoxes\pathfinding\FoxPathfindGoalPickBushes.class
net\seanomilk\tamablefoxes\pathfinding\FoxPathfindGoalOwnerHurtByTarget.class
net\seanomilk\tamablefoxes\pathfinding\FoxPathfindGoalFleeSun.class
net\seanomilk\tamablefoxes\pathfinding\FoxPathfindGoalSit.class
net\seanomilk\tamablefoxes\pathfinding\FoxPathfindGoalLungeUNKNOWN_USE.class
net\seanomilk\tamablefoxes\pathfinding\FoxPathfindGoalLunge.class
net\seanomilk\tamablefoxes\pathfinding\FoxPathfindGoalHurtByTarget.class
net\seanomilk\tamablefoxes\pathfinding\FoxPathfindGoalRandomStrollLand.class
net\seanomilk\tamablefoxes\pathfinding\FoxPathfindGoalOwnerHurtTarget.class

View File

@ -1,11 +1,19 @@
D:\Code\java\myPlugins\TamableFoxes\src\main\java\net\seanomik\tamablefoxes\ConfigManager.java D:\Code\java\spigotPlugins\myPlugins\GitTamableFoxes\src\main\java\net\seanomilk\tamablefoxes\pathfinding\FoxPathfindGoalRandomTargetNonTamed.java
D:\Code\java\myPlugins\TamableFoxes\src\main\java\net\seanomik\tamablefoxes\NBTEditor.java D:\Code\java\spigotPlugins\myPlugins\GitTamableFoxes\src\main\java\net\seanomilk\tamablefoxes\command\CommandSpawnTamableFox.java
D:\Code\java\myPlugins\TamableFoxes\src\main\java\net\seanomik\tamablefoxes\Commands\CommandSpawnTamableFox.java D:\Code\java\spigotPlugins\myPlugins\GitTamableFoxes\src\main\java\net\seanomilk\tamablefoxes\pathfinding\FoxPathfindGoalLunge.java
D:\Code\java\myPlugins\TamableFoxes\src\main\java\net\seanomik\tamablefoxes\CustomPathfinding\FoxPathfinderGoalSit.java D:\Code\java\spigotPlugins\myPlugins\GitTamableFoxes\src\main\java\net\seanomilk\tamablefoxes\pathfinding\FoxPathfindGoalOwnerHurtTarget.java
D:\Code\java\myPlugins\TamableFoxes\src\main\java\net\seanomik\tamablefoxes\Reference.java D:\Code\java\spigotPlugins\myPlugins\GitTamableFoxes\src\main\java\net\seanomilk\tamablefoxes\pathfinding\FoxPathfindGoalRandomStrollLand.java
D:\Code\java\myPlugins\TamableFoxes\src\main\java\net\seanomik\tamablefoxes\TamableFox.java D:\Code\java\spigotPlugins\myPlugins\GitTamableFoxes\src\main\java\net\seanomilk\tamablefoxes\EntityTamableFox.java
D:\Code\java\myPlugins\TamableFoxes\src\main\java\net\seanomik\tamablefoxes\CustomPathfinding\FoxPathfinderGoalFollowOwner.java D:\Code\java\spigotPlugins\myPlugins\GitTamableFoxes\src\main\java\net\seanomilk\tamablefoxes\pathfinding\FoxPathfindGoalHurtByTarget.java
D:\Code\java\myPlugins\TamableFoxes\src\main\java\net\seanomik\tamablefoxes\TamableFoxes.java D:\Code\java\spigotPlugins\myPlugins\GitTamableFoxes\src\main\java\net\seanomilk\tamablefoxes\pathfinding\FoxPathfindGoalOwnerHurtByTarget.java
D:\Code\java\myPlugins\TamableFoxes\src\main\java\net\seanomik\tamablefoxes\CustomPathfinding\FoxPathfinderGoalBeg.java D:\Code\java\spigotPlugins\myPlugins\GitTamableFoxes\src\main\java\net\seanomilk\tamablefoxes\pathfinding\FoxPathfindGoalPickBushes.java
D:\Code\java\myPlugins\TamableFoxes\src\main\java\net\seanomik\tamablefoxes\CustomPathfinding\FoxPathfinderGoalOwnerHurtByTarget.java D:\Code\java\spigotPlugins\myPlugins\GitTamableFoxes\src\main\java\net\seanomilk\tamablefoxes\pathfinding\FoxPathfindGoalFollowOwner.java
D:\Code\java\myPlugins\TamableFoxes\src\main\java\net\seanomik\tamablefoxes\CustomPathfinding\FoxPathfinderGoalOwnerHurtTarget.java D:\Code\java\spigotPlugins\myPlugins\GitTamableFoxes\src\main\java\net\seanomilk\tamablefoxes\pathfinding\FoxPathfindGoalSit.java
D:\Code\java\spigotPlugins\myPlugins\GitTamableFoxes\src\main\java\net\seanomilk\tamablefoxes\pathfinding\FoxPathfindGoalFloat.java
D:\Code\java\spigotPlugins\myPlugins\GitTamableFoxes\src\main\java\net\seanomilk\tamablefoxes\io\FileManager.java
D:\Code\java\spigotPlugins\myPlugins\GitTamableFoxes\src\main\java\net\seanomilk\tamablefoxes\pathfinding\FoxPathfindGoalFleeSun.java
D:\Code\java\spigotPlugins\myPlugins\GitTamableFoxes\src\main\java\net\seanomilk\tamablefoxes\pathfinding\FoxPathfindGoalBeg.java
D:\Code\java\spigotPlugins\myPlugins\GitTamableFoxes\src\main\java\net\seanomilk\tamablefoxes\pathfinding\FoxPathfindGoalBreed.java
D:\Code\java\spigotPlugins\myPlugins\GitTamableFoxes\src\main\java\net\seanomilk\tamablefoxes\pathfinding\FoxPathfindGoalLungeUNKNOWN_USE.java
D:\Code\java\spigotPlugins\myPlugins\GitTamableFoxes\src\main\java\net\seanomilk\tamablefoxes\pathfinding\FoxPathfindGoalMeleeAttack.java
D:\Code\java\spigotPlugins\myPlugins\GitTamableFoxes\src\main\java\net\seanomilk\tamablefoxes\TamableFoxes.java

Binary file not shown.