einfach mal ein update

This commit is contained in:
BuildTools 2018-01-15 12:23:58 +01:00
parent eaf6deb0bc
commit 36034e4f7b
9 changed files with 666 additions and 92 deletions

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
Commons.iml Commons.iml
/target/ /target/
commons.png

View File

@ -11,7 +11,6 @@
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: ai.api:libai:1.4.8" level="project" />
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.14.8" level="project" /> <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.14.8" level="project" />
<orderEntry type="library" name="Maven: io.vertx:vertx-core:3.4.1" level="project" /> <orderEntry type="library" name="Maven: io.vertx:vertx-core:3.4.1" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-common:4.1.8.Final" level="project" /> <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.8.Final" level="project" />
@ -53,18 +52,17 @@
<orderEntry type="library" name="Maven: io.sentry:sentry:1.2.2" level="project" /> <orderEntry type="library" name="Maven: io.sentry:sentry:1.2.2" level="project" />
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.3.1" level="project" /> <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.3.1" level="project" />
<orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" /> <orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:19.0" level="project" /> <orderEntry type="library" name="Maven: com.google.guava:guava:21.0" level="project" />
<orderEntry type="library" name="Maven: com.github.ben-manes.caffeine:caffeine:2.5.2" level="project" /> <orderEntry type="library" name="Maven: com.github.ben-manes.caffeine:caffeine:2.5.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.1" level="project" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.1" level="project" />
<orderEntry type="library" name="Maven: commons-io:commons-io:2.5" level="project" /> <orderEntry type="library" name="Maven: commons-io:commons-io:2.5" level="project" />
<orderEntry type="library" name="Maven: com.github.nsp:JSkills:master-0.9.0-g8b333ec-15" level="project" /> <orderEntry type="library" name="Maven: com.github.nsp:JSkills:master-0.9.0-g8b333ec-15" level="project" />
<orderEntry type="library" name="Maven: org.ejml:simple:0.28" level="project" />
<orderEntry type="library" name="Maven: org.ejml:core:0.28" level="project" />
<orderEntry type="library" name="Maven: org.ejml:dense64:0.28" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.awaitility:awaitility:3.0.0" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: org.awaitility:awaitility:3.0.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.5.1" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.5.1" level="project" />
<orderEntry type="library" name="Maven: com.google.dagger:dagger:2.14.1" level="project" />
<orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
</component> </component>
</module> </module>

621
commons.uml Normal file
View File

@ -0,0 +1,621 @@
<?xml version="1.0" encoding="UTF-8"?>
<Diagram>
<ID>JAVA</ID>
<OriginalElement>eu.univento.commons</OriginalElement>
<nodes>
<node x="3245.5" y="1115.5">eu.univento.commons.player.language.Language</node>
<node x="1059.0" y="1094.0">eu.univento.commons.player.ban.BanData</node>
<node x="2711.5" y="884.5">eu.univento.commons.player.settings.PlayerSettings</node>
<node x="682.1500000000001" y="355.0">eu.univento.commons.player.uuid.NameFetcher</node>
<node x="416.06666666666683" y="322.0">eu.univento.commons.player.warn.WarnReason</node>
<node x="2025.75" y="4382.0">eu.univento.commons.database.DatabaseManager</node>
<node x="1981.7500000000002" y="245.0">eu.univento.commons.player.rank.Group</node>
<node x="4485.0" y="101.0">eu.univento.commons.utils.Maths</node>
<node x="1822.25" y="4061.5">eu.univento.commons.database.MongoDB</node>
<node x="1411.0" y="1149.0">eu.univento.commons.player.currency.CurrencyType</node>
<node x="2665.75" y="4460.0">eu.univento.commons.event.MessageEvent</node>
<node x="2440.25" y="4061.5">eu.univento.commons.database.Redis</node>
<node x="2146.0" y="3564.0">eu.univento.commons.Commons</node>
<node x="559.9999999999999" y="4890.5">eu.univento.commons.player.uuid.UUIDFetcher.SearchResult</node>
<node x="1628.0" y="4868.0">eu.univento.commons.utils.Strings</node>
<node x="1922.0" y="4868.0">eu.univento.commons.utils.Files</node>
<node x="1980.5" y="775.0">eu.univento.commons.player.rank.Rank</node>
<node x="3714.25" y="1082.5">eu.univento.commons.player.user.UserInformation</node>
<node x="3030.0476190476193" y="2354.0">eu.univento.commons.player.statistics.ImpactStatistics</node>
<node x="181.6875" y="3226.5">eu.univento.commons.messaging.MessagingManager</node>
<node x="2064.5" y="1792.0">eu.univento.commons.player.DatabasePlayer</node>
<node x="90.5" y="4868.0">eu.univento.commons.player.chat.ChatMessageType</node>
<node x="1218.0" y="190.0">eu.univento.commons.player.ban.BanReason</node>
<node x="4822.566666666667" y="0.0">eu.univento.commons.player.user.Textures.Cape</node>
<node x="3702.0" y="366.0">eu.univento.commons.player.user.UserProperties</node>
<node x="2020.25" y="4661.0">eu.univento.commons.CommonsTest</node>
<node x="2197.0" y="3227.0">eu.univento.commons.player.party.PartyManager</node>
<node x="4547.5" y="0.0">eu.univento.commons.utils.Maths.Sin</node>
<node x="375.6666666666667" y="5014.0">eu.univento.commons.player.uuid.UUIDFetcher</node>
<node x="3277.0" y="212.0">eu.univento.commons.player.language.MessageConstant</node>
<node x="0.0" y="5035.0">eu.univento.commons.player.chat.ChatData</node>
<node x="2139.25" y="4073.0">eu.univento.commons.database.MySQL</node>
<node x="3029.5" y="1126.5">eu.univento.commons.player.ranking.Ranking</node>
<node x="5077.666666666666" y="169.0">eu.univento.commons.player.user.Decoded</node>
<node x="2922.8809523809523" y="3249.0">eu.univento.commons.player.statistics.GameStatistics</node>
<node x="4938.0" y="382.0">eu.univento.commons.player.user.Decoded.Value</node>
<node x="3023.75" y="3918.0">eu.univento.commons.server.ServerType</node>
<node x="4802.066666666667" y="169.0">eu.univento.commons.player.user.Textures</node>
<node x="3502.0" y="388.5">eu.univento.commons.player.user.Result</node>
<node x="2963.75" y="4392.5">eu.univento.commons.server.ServerInfo</node>
<node x="0.0" y="2364.5">eu.univento.commons.configuration.ConfigurationHandler</node>
<node x="774.0" y="4868.0">eu.univento.commons.utils.Pool</node>
<node x="1756.5" y="366.0">eu.univento.commons.player.kick.KickReason</node>
<node x="4021.0" y="388.5">eu.univento.commons.player.user.History</node>
<node x="228.0" y="2386.5">eu.univento.commons.messaging.RabbitMQ</node>
<node x="1651.0" y="1138.5">eu.univento.commons.player.kick.KickData</node>
<node x="370.99999999999994" y="4868.0">eu.univento.commons.player.uuid.UUIDFetcher.ProfileData</node>
<node x="4547.5" y="1083.0">eu.univento.commons.utils.Maths.Atan2</node>
<node x="875.0" y="1160.5">eu.univento.commons.player.friend.FriendData</node>
<node x="1022.0" y="4868.0">eu.univento.commons.helpers.Location</node>
<node x="1750.0" y="3138.0">eu.univento.commons.player.party.Party</node>
<node x="4209.0" y="377.5">eu.univento.commons.player.user.Updated</node>
<node x="1408.0" y="4868.0">eu.univento.commons.server.TPS</node>
<node x="4785.0" y="414.5">eu.univento.commons.player.user.Textures.Skin</node>
<node x="2657.25" y="4062.0">eu.univento.commons.messaging.MessageHandler</node>
<node x="2384.5" y="1072.0">eu.univento.commons.player.mute.MuteData</node>
<node x="545.0" y="1127.5">eu.univento.commons.player.warn.WarnData</node>
<node x="3747.5" y="0.0">eu.univento.commons.player.user.Raw</node>
<node x="2482.5" y="300.0">eu.univento.commons.player.mute.MuteReason</node>
<node x="556.7291666666666" y="5248.0">eu.univento.commons.player.uuid.UUIDFetcher.PlayerProfile</node>
</nodes>
<notes />
<edges>
<edge source="eu.univento.commons.player.user.Decoded.Value" target="eu.univento.commons.player.user.Textures">
<point x="-68.0" y="-92.0" />
<point x="5040.0" y="352.0" />
<point x="4963.166666666666" y="352.0" />
<point x="71.60000000000002" y="81.5" />
</edge>
<edge source="eu.univento.commons.player.DatabasePlayer" target="eu.univento.commons.player.rank.Group">
<point x="-32.63999999999987" y="-643.0" />
<point x="2235.86" y="1672.0" />
<point x="1970.0" y="1672.0" />
<point x="1970.0" y="755.0" />
<point x="2027.5833333333335" y="755.0" />
<point x="-91.66666666666674" y="202.5" />
</edge>
<edge source="eu.univento.commons.player.party.Party" target="eu.univento.commons.player.DatabasePlayer">
<point x="-142.33333333333337" y="-148.0" />
<point x="1821.1666666666667" y="3098.0" />
<point x="2093.6428571428573" y="3098.0" />
<point x="-174.8571428571429" y="643.0" />
</edge>
<edge source="eu.univento.commons.player.party.PartyManager" target="eu.univento.commons.Commons">
<point x="137.25" y="59.0" />
<point x="2517.25" y="3474.0" />
<point x="2324.125" y="3474.0" />
<point x="35.625" y="-137.0" />
</edge>
<edge source="eu.univento.commons.database.MySQL" target="eu.univento.commons.Commons">
<point x="0.0" y="-37.0" />
<point x="2279.25" y="3898.0" />
<point x="2302.75" y="3898.0" />
<point x="14.25" y="137.0" />
</edge>
<edge source="eu.univento.commons.player.uuid.NameFetcher" target="eu.univento.commons.Commons">
<point x="-84.80000000000018" y="92.5" />
<point x="703.3499999999999" y="755.0" />
<point x="534.5" y="755.0" />
<point x="534.5" y="3464.0" />
<point x="2267.125" y="3464.0" />
<point x="-21.375" y="-137.0" />
</edge>
<edge source="eu.univento.commons.player.uuid.UUIDFetcher" target="eu.univento.commons.player.uuid.UUIDFetcher.SearchResult">
<point x="54.0" y="-92.0" />
<point x="564.6666666666667" y="4989.0" />
<point x="581.1249999999999" y="4989.0" />
<point x="-63.375" y="25.5" />
</edge>
<edge source="eu.univento.commons.messaging.RabbitMQ" target="eu.univento.commons.Commons">
<point x="111.0" y="48.5" />
<point x="487.0" y="3118.0" />
<point x="467.1875" y="3118.0" />
<point x="467.1875" y="3474.0" />
<point x="2252.875" y="3474.0" />
<point x="-35.625" y="-137.0" />
</edge>
<edge source="eu.univento.commons.player.DatabasePlayer" target="eu.univento.commons.player.settings.PlayerSettings">
<point x="65.27999999999997" y="-643.0" />
<point x="2333.78" y="1692.0" />
<point x="2741.3" y="1692.0" />
<point x="-119.20000000000005" y="324.0" />
</edge>
<edge source="eu.univento.commons.player.kick.KickData" target="eu.univento.commons.player.uuid.NameFetcher">
<point x="-87.0" y="-70.0" />
<point x="1694.5" y="725.0" />
<point x="872.9500000000003" y="725.0" />
<point x="84.80000000000018" y="92.5" />
</edge>
<edge source="eu.univento.commons.player.DatabasePlayer" target="eu.univento.commons.player.language.Language">
<point x="163.20000000000005" y="-643.0" />
<point x="2431.7000000000003" y="1752.0" />
<point x="3290.166666666667" y="1752.0" />
<point x="-89.33333333333326" y="93.0" />
</edge>
<edge source="eu.univento.commons.utils.Maths.Sin" target="eu.univento.commons.utils.Maths">
<point x="32.5" y="25.5" />
<point x="4645.0" y="76.0" />
<point x="4676.25" y="76.0" />
<point x="63.75" y="-466.0" />
</edge>
<edge source="eu.univento.commons.player.user.UserInformation" target="eu.univento.commons.Commons">
<point x="131.99999999999977" y="126.0" />
<point x="4110.25" y="3544.0" />
<point x="2423.875" y="3544.0" />
<point x="135.375" y="-137.0" />
</edge>
<edge source="eu.univento.commons.player.DatabasePlayer" target="eu.univento.commons.Commons">
<point x="116.57142857142867" y="643.0" />
<point x="2385.071428571429" y="3108.0" />
<point x="2573.5" y="3108.0" />
<point x="2573.5" y="3484.0" />
<point x="2338.375" y="3484.0" />
<point x="49.875" y="-137.0" />
</edge>
<edge source="eu.univento.commons.player.uuid.UUIDFetcher.ProfileData" target="eu.univento.commons.player.uuid.UUIDFetcher">
<point x="56.333333333333485" y="48.0" />
<point x="511.8333333333334" y="4989.0" />
<point x="510.6666666666667" y="4989.0" />
<point x="0.0" y="-92.0" />
</edge>
<edge source="eu.univento.commons.player.uuid.UUIDFetcher.SearchResult" target="eu.univento.commons.player.uuid.UUIDFetcher">
<point x="-21.125" y="25.5" />
<point x="623.3749999999999" y="4989.0" />
<point x="618.6666666666667" y="4989.0" />
<point x="108.0" y="-92.0" />
</edge>
<edge source="eu.univento.commons.database.DatabaseManager" target="eu.univento.commons.database.MySQL">
<point x="37.45454545454544" y="-114.5" />
<point x="2166.2045454545455" y="4332.0" />
<point x="2349.25" y="4332.0" />
<point x="70.0" y="37.0" />
</edge>
<edge source="eu.univento.commons.messaging.MessageHandler" target="eu.univento.commons.event.MessageEvent">
<point x="-36.875" y="48.0" />
<point x="2767.875" y="4362.0" />
<point x="2770.0" y="4362.0" />
<point x="-34.75" y="-36.5" />
</edge>
<edge source="eu.univento.commons.player.user.UserInformation" target="eu.univento.commons.player.user.Updated">
<point x="198.0" y="-126.0" />
<point x="4176.25" y="755.0" />
<point x="4324.5" y="755.0" />
<point x="0.0" y="70.0" />
</edge>
<edge source="eu.univento.commons.utils.Maths" target="eu.univento.commons.utils.Maths.Sin">
<point x="-63.75" y="-466.0" />
<point x="4548.75" y="76.0" />
<point x="4580.0" y="76.0" />
<point x="-32.5" y="25.5" />
</edge>
<edge source="eu.univento.commons.player.DatabasePlayer" target="eu.univento.commons.player.kick.KickData">
<point x="-65.27999999999997" y="-643.0" />
<point x="2203.2200000000003" y="1692.0" />
<point x="1846.75" y="1692.0" />
<point x="65.25" y="70.0" />
</edge>
<edge source="eu.univento.commons.event.MessageEvent" target="eu.univento.commons.messaging.MessageHandler">
<point x="-104.25" y="-36.5" />
<point x="2700.5" y="4362.0" />
<point x="2694.125" y="4362.0" />
<point x="-110.625" y="48.0" />
</edge>
<edge source="eu.univento.commons.utils.Maths" target="eu.univento.commons.utils.Maths.Atan2">
<point x="85.0" y="466.0" />
<point x="4697.5" y="1058.0" />
<point x="4655.833333333333" y="1058.0" />
<point x="43.33333333333326" y="-25.5" />
</edge>
<edge source="eu.univento.commons.player.DatabasePlayer" target="eu.univento.commons.player.mute.MuteReason">
<point x="48.960000000000036" y="-643.0" />
<point x="2317.46" y="1682.0" />
<point x="2701.0" y="1682.0" />
<point x="2701.0" y="755.0" />
<point x="2646.6666666666665" y="755.0" />
<point x="65.66666666666652" y="147.5" />
</edge>
<edge source="eu.univento.commons.player.DatabasePlayer" target="eu.univento.commons.player.user.UserInformation">
<point x="195.83999999999992" y="-643.0" />
<point x="2464.34" y="1772.0" />
<point x="3846.25" y="1772.0" />
<point x="-132.0" y="126.0" />
</edge>
<edge source="eu.univento.commons.database.MongoDB" target="eu.univento.commons.Commons">
<point x="0.0" y="-48.5" />
<point x="1970.25" y="3888.0" />
<point x="2245.75" y="3888.0" />
<point x="-42.75" y="137.0" />
</edge>
<edge source="eu.univento.commons.player.user.Textures" target="eu.univento.commons.player.user.Textures.Cape">
<point x="-59.66666666666663" y="-81.5" />
<point x="4831.9" y="144.0" />
<point x="4845.566666666667" y="144.0" />
<point x="-46.0" y="59.5" />
</edge>
<edge source="eu.univento.commons.player.uuid.UUIDFetcher" target="eu.univento.commons.player.uuid.UUIDFetcher.PlayerProfile">
<point x="67.5" y="92.0" />
<point x="578.1666666666667" y="5228.0" />
<point x="599.4791666666666" y="5228.0" />
<point x="-14.25" y="-25.5" />
</edge>
<edge source="eu.univento.commons.player.DatabasePlayer" target="eu.univento.commons.player.warn.WarnData">
<point x="-179.51999999999998" y="-643.0" />
<point x="2088.98" y="1762.0" />
<point x="622.5" y="1762.0" />
<point x="-77.5" y="81.0" />
</edge>
<edge source="eu.univento.commons.player.uuid.UUIDFetcher.PlayerProfile" target="eu.univento.commons.player.uuid.UUIDFetcher">
<point x="-42.75" y="-25.5" />
<point x="570.9791666666666" y="5228.0" />
<point x="443.1666666666667" y="5228.0" />
<point x="-67.5" y="92.0" />
</edge>
<edge source="eu.univento.commons.player.chat.ChatData" target="eu.univento.commons.player.chat.ChatMessageType">
<point x="81.5" y="-159.0" />
<point x="244.5" y="5010.0" />
<point x="199.25" y="5010.0" />
<point x="36.25" y="58.5" />
</edge>
<edge source="eu.univento.commons.player.DatabasePlayer" target="eu.univento.commons.player.mute.MuteData">
<point x="16.319999999999936" y="-643.0" />
<point x="2284.82" y="1662.0" />
<point x="2461.0" y="1662.0" />
<point x="-76.5" y="136.5" />
</edge>
<edge source="eu.univento.commons.player.rank.Rank" target="eu.univento.commons.player.rank.Group">
<point x="96.0" y="-433.5" />
<point x="2268.5" y="755.0" />
<point x="2210.916666666667" y="755.0" />
<point x="91.66666666666652" y="202.5" />
</edge>
<edge source="eu.univento.commons.server.ServerInfo" target="eu.univento.commons.server.ServerType">
<point x="117.33333333333303" y="-104.0" />
<point x="3257.083333333333" y="4362.0" />
<point x="3217.083333333333" y="4362.0" />
<point x="77.33333333333303" y="192.0" />
</edge>
<edge source="eu.univento.commons.player.language.Language" target="eu.univento.commons.player.language.MessageConstant">
<point x="0.0" y="-93.0" />
<point x="0.0" y="235.5" />
</edge>
<edge source="eu.univento.commons.player.user.Decoded" target="eu.univento.commons.player.user.Decoded.Value">
<point x="0.0" y="81.5" />
<point x="5174.166666666666" y="362.0" />
<point x="5176.0" y="362.0" />
<point x="68.0" y="-92.0" />
</edge>
<edge source="eu.univento.commons.messaging.MessagingManager" target="eu.univento.commons.Commons">
<point x="103.125" y="59.5" />
<point x="422.3125" y="3484.0" />
<point x="2238.625" y="3484.0" />
<point x="-49.875" y="-137.0" />
</edge>
<edge source="eu.univento.commons.messaging.MessagingManager" target="eu.univento.commons.configuration.ConfigurationHandler">
<point x="-103.125" y="-59.5" />
<point x="216.0625" y="3118.0" />
<point x="187.19999999999982" y="3118.0" />
<point x="83.19999999999982" y="70.5" />
</edge>
<edge source="eu.univento.commons.CommonsTest" target="eu.univento.commons.database.DatabaseManager">
<point x="0.0" y="-81.0" />
<point x="0.0" y="114.5" />
</edge>
<edge source="eu.univento.commons.utils.Maths.Atan2" target="eu.univento.commons.utils.Maths">
<point x="0.0" y="-25.5" />
<point x="0.0" y="466.0" />
</edge>
<edge source="eu.univento.commons.player.DatabasePlayer" target="eu.univento.commons.player.warn.WarnReason">
<point x="-195.83999999999992" y="-643.0" />
<point x="2072.6600000000003" y="1772.0" />
<point x="426.31666666666683" y="1772.0" />
<point x="426.31666666666683" y="755.0" />
<point x="448.9000000000003" y="755.0" />
<point x="-65.66666666666652" y="125.5" />
</edge>
<edge source="eu.univento.commons.player.user.Textures" target="eu.univento.commons.player.user.Textures.Skin">
<point x="0.0" y="81.5" />
<point x="4891.566666666667" y="362.0" />
<point x="4895.833333333333" y="362.0" />
<point x="44.333333333333314" y="-59.5" />
</edge>
<edge source="eu.univento.commons.player.friend.FriendData" target="eu.univento.commons.player.uuid.NameFetcher">
<point x="0.0" y="-48.0" />
<point x="957.0" y="745.0" />
<point x="788.1500000000001" y="745.0" />
<point x="0.0" y="92.5" />
</edge>
<edge source="eu.univento.commons.player.DatabasePlayer" target="eu.univento.commons.player.ranking.Ranking">
<point x="146.8800000000001" y="-643.0" />
<point x="2415.38" y="1742.0" />
<point x="3127.5" y="1742.0" />
<point x="0.0" y="82.0" />
</edge>
<edge source="eu.univento.commons.Commons" target="eu.univento.commons.messaging.MessagingManager">
<point x="-78.375" y="-137.0" />
<point x="2210.125" y="3504.0" />
<point x="284.8125" y="3504.0" />
<point x="-34.375" y="59.5" />
</edge>
<edge source="eu.univento.commons.player.user.UserInformation" target="eu.univento.commons.player.user.UserProperties">
<point x="-66.0" y="-126.0" />
<point x="3912.25" y="755.0" />
<point x="3851.5" y="755.0" />
<point x="0.0" y="81.5" />
</edge>
<edge source="eu.univento.commons.server.ServerInfo" target="eu.univento.commons.messaging.MessageHandler">
<point x="-117.33333333333303" y="-104.0" />
<point x="3022.416666666667" y="4352.0" />
<point x="2915.375" y="4352.0" />
<point x="110.625" y="48.0" />
</edge>
<edge source="eu.univento.commons.player.warn.WarnData" target="eu.univento.commons.player.warn.WarnReason">
<point x="0.0" y="-81.0" />
<point x="700.0" y="735.0" />
<point x="580.2333333333333" y="735.0" />
<point x="65.66666666666652" y="125.5" />
</edge>
<edge source="eu.univento.commons.CommonsTest" target="eu.univento.commons.Commons">
<point x="-72.33333333333331" y="-81.0" />
<point x="2056.4166666666665" y="4636.0" />
<point x="55.70000000000027" y="4636.0" />
<point x="55.70000000000027" y="3858.0" />
<point x="2160.25" y="3858.0" />
<point x="-128.25" y="137.0" />
</edge>
<edge source="eu.univento.commons.player.kick.KickData" target="eu.univento.commons.player.kick.KickReason">
<point x="0.0" y="-70.0" />
<point x="1781.5" y="755.0" />
<point x="1788.333333333333" y="755.0" />
<point x="-63.66666666666697" y="81.5" />
</edge>
<edge source="eu.univento.commons.database.DatabaseManager" target="eu.univento.commons.database.Redis">
<point x="93.63636363636363" y="-114.5" />
<point x="2222.3863636363635" y="4362.0" />
<point x="2587.25" y="4362.0" />
<point x="49.0" y="48.5" />
</edge>
<edge source="eu.univento.commons.player.DatabasePlayer" target="eu.univento.commons.player.kick.KickReason">
<point x="-48.960000000000036" y="-643.0" />
<point x="2219.54" y="1682.0" />
<point x="1922.5" y="1682.0" />
<point x="1922.5" y="755.0" />
<point x="1915.666666666667" y="755.0" />
<point x="63.66666666666697" y="81.5" />
</edge>
<edge source="eu.univento.commons.player.ban.BanData" target="eu.univento.commons.player.uuid.NameFetcher">
<point x="-110.33333333333348" y="-114.5" />
<point x="1114.1666666666665" y="735.0" />
<point x="830.5500000000002" y="735.0" />
<point x="42.40000000000009" y="92.5" />
</edge>
<edge source="eu.univento.commons.player.user.UserInformation" target="eu.univento.commons.player.user.History">
<point x="66.0" y="-126.0" />
<point x="4044.25" y="755.0" />
<point x="4105.0" y="755.0" />
<point x="0.0" y="59.0" />
</edge>
<edge source="eu.univento.commons.database.DatabaseManager" target="eu.univento.commons.database.MongoDB">
<point x="-37.45454545454544" y="-114.5" />
<point x="2091.2954545454545" y="4332.0" />
<point x="1896.25" y="4332.0" />
<point x="-74.0" y="48.5" />
</edge>
<edge source="eu.univento.commons.database.Redis" target="eu.univento.commons.Commons">
<point x="0.0" y="-48.5" />
<point x="2538.25" y="3888.0" />
<point x="2359.75" y="3888.0" />
<point x="71.25" y="137.0" />
</edge>
<edge source="eu.univento.commons.player.warn.WarnData" target="eu.univento.commons.player.uuid.NameFetcher">
<point x="103.33333333333348" y="-81.0" />
<point x="803.3333333333335" y="755.0" />
<point x="745.75" y="755.0" />
<point x="-42.40000000000009" y="92.5" />
</edge>
<edge source="eu.univento.commons.player.user.UserProperties" target="eu.univento.commons.player.user.Raw">
<point x="0.0" y="-81.5" />
<point x="0.0" y="70.0" />
</edge>
<edge source="eu.univento.commons.player.mute.MuteData" target="eu.univento.commons.player.mute.MuteReason">
<point x="76.5" y="-136.5" />
<point x="2614.0" y="755.0" />
<point x="2581.0" y="755.0" />
<point x="0.0" y="147.5" />
</edge>
<edge source="eu.univento.commons.player.uuid.UUIDFetcher.SearchResult" target="eu.univento.commons.player.uuid.UUIDFetcher.PlayerProfile">
<point x="63.375" y="25.5" />
<point x="707.8749999999999" y="4989.0" />
<point x="682.7847222222222" y="4989.0" />
<point x="682.7847222222222" y="5228.0" />
<point x="656.4791666666666" y="5228.0" />
<point x="42.75" y="-25.5" />
</edge>
<edge source="eu.univento.commons.Commons" target="eu.univento.commons.configuration.ConfigurationHandler">
<point x="-121.125" y="-137.0" />
<point x="2167.375" y="3534.0" />
<point x="88.70000000000027" y="3534.0" />
<point x="88.70000000000027" y="3108.0" />
<point x="104.0" y="3108.0" />
<point x="0.0" y="70.5" />
</edge>
<edge source="eu.univento.commons.player.DatabasePlayer" target="eu.univento.commons.player.ban.BanReason">
<point x="-114.24000000000001" y="-643.0" />
<point x="2154.26" y="1722.0" />
<point x="1400.5" y="1722.0" />
<point x="1400.5" y="755.0" />
<point x="1375.5" y="755.0" />
<point x="63.0" y="257.5" />
</edge>
<edge source="eu.univento.commons.player.user.Textures.Skin" target="eu.univento.commons.player.user.Textures">
<point x="-44.33333333333334" y="-59.5" />
<point x="4807.166666666666" y="362.0" />
<point x="4819.966666666666" y="362.0" />
<point x="-71.60000000000002" y="81.5" />
</edge>
<edge source="eu.univento.commons.player.ban.BanData" target="eu.univento.commons.player.ban.BanReason">
<point x="0.0" y="-114.5" />
<point x="1224.5" y="755.0" />
<point x="1249.5" y="755.0" />
<point x="-63.0" y="257.5" />
</edge>
<edge source="eu.univento.commons.database.DatabaseManager" target="eu.univento.commons.Commons">
<point x="-74.90909090909088" y="-114.5" />
<point x="2053.840909090909" y="4352.0" />
<point x="1800.75" y="4352.0" />
<point x="1800.75" y="3868.0" />
<point x="2188.75" y="3868.0" />
<point x="-99.75" y="137.0" />
</edge>
<edge source="eu.univento.commons.player.statistics.GameStatistics" target="eu.univento.commons.player.statistics.ImpactStatistics">
<point x="144.375" y="-37.0" />
<point x="3259.7559523809523" y="3118.0" />
<point x="3243.3809523809523" y="3118.0" />
<point x="85.33333333333331" y="81.0" />
</edge>
<edge source="eu.univento.commons.player.settings.PlayerSettings" target="eu.univento.commons.player.DatabasePlayer">
<point x="59.60000000000002" y="324.0" />
<point x="2920.1" y="1722.0" />
<point x="2382.7400000000002" y="1722.0" />
<point x="114.24000000000001" y="-643.0" />
</edge>
<edge source="eu.univento.commons.player.user.Decoded.Value" target="eu.univento.commons.player.user.Decoded">
<point x="0.0" y="-92.0" />
<point x="5108.0" y="362.0" />
<point x="5109.833333333333" y="362.0" />
<point x="-64.33333333333337" y="81.5" />
</edge>
<edge source="eu.univento.commons.player.statistics.GameStatistics" target="eu.univento.commons.Commons">
<point x="144.375" y="37.0" />
<point x="3259.7559523809523" y="3524.0" />
<point x="2395.375" y="3524.0" />
<point x="106.875" y="-137.0" />
</edge>
<edge source="eu.univento.commons.player.DatabasePlayer" target="eu.univento.commons.player.rank.Rank">
<point x="-16.319999999999936" y="-643.0" />
<point x="2252.1800000000003" y="1662.0" />
<point x="2076.5" y="1662.0" />
<point x="-96.0" y="433.5" />
</edge>
<edge source="eu.univento.commons.player.language.Language" target="eu.univento.commons.Commons">
<point x="89.33333333333326" y="93.0" />
<point x="3468.833333333333" y="3534.0" />
<point x="2409.625" y="3534.0" />
<point x="121.125" y="-137.0" />
</edge>
<edge source="eu.univento.commons.Commons" target="eu.univento.commons.player.statistics.GameStatistics">
<point x="78.375" y="-137.0" />
<point x="2366.875" y="3504.0" />
<point x="3067.2559523809523" y="3504.0" />
<point x="-48.125" y="37.0" />
</edge>
<edge source="eu.univento.commons.player.DatabasePlayer" target="eu.univento.commons.player.currency.CurrencyType">
<point x="-97.92000000000007" y="-643.0" />
<point x="2170.58" y="1712.0" />
<point x="1521.0" y="1712.0" />
<point x="0.0" y="59.5" />
</edge>
<edge source="eu.univento.commons.messaging.MessageHandler" target="eu.univento.commons.Commons">
<point x="0.0" y="-48.0" />
<point x="2804.75" y="3868.0" />
<point x="2416.75" y="3868.0" />
<point x="128.25" y="137.0" />
</edge>
<edge source="eu.univento.commons.messaging.MessagingManager" target="eu.univento.commons.messaging.RabbitMQ">
<point x="103.125" y="-59.5" />
<point x="422.3125" y="3118.0" />
<point x="413.0" y="3118.0" />
<point x="37.0" y="48.5" />
</edge>
<edge source="eu.univento.commons.Commons" target="eu.univento.commons.database.DatabaseManager">
<point x="42.75" y="137.0" />
<point x="2331.25" y="3898.0" />
<point x="2429.75" y="3898.0" />
<point x="2429.75" y="4342.0" />
<point x="2184.931818181818" y="4342.0" />
<point x="56.18181818181819" y="-114.5" />
</edge>
<edge source="eu.univento.commons.player.user.UserInformation" target="eu.univento.commons.player.user.Result">
<point x="-198.0" y="-126.0" />
<point x="3780.25" y="755.0" />
<point x="3592.0" y="755.0" />
<point x="0.0" y="59.0" />
</edge>
<edge source="eu.univento.commons.player.party.PartyManager" target="eu.univento.commons.player.DatabasePlayer">
<point x="91.5" y="-59.0" />
<point x="2471.5" y="3118.0" />
<point x="2326.785714285714" y="3118.0" />
<point x="58.28571428571422" y="643.0" />
</edge>
<edge source="eu.univento.commons.player.DatabasePlayer" target="eu.univento.commons.player.ban.BanData">
<point x="-146.87999999999988" y="-643.0" />
<point x="2121.6200000000003" y="1742.0" />
<point x="1141.75" y="1742.0" />
<point x="-82.75" y="114.5" />
</edge>
<edge source="eu.univento.commons.player.uuid.UUIDFetcher" target="eu.univento.commons.player.uuid.UUIDFetcher.ProfileData">
<point x="-54.0" y="-92.0" />
<point x="456.6666666666667" y="4989.0" />
<point x="455.49999999999994" y="4989.0" />
<point x="0.0" y="48.0" />
</edge>
<edge source="eu.univento.commons.event.MessageEvent" target="eu.univento.commons.server.ServerType">
<point x="104.25" y="-36.5" />
<point x="2909.0" y="4362.0" />
<point x="3062.416666666667" y="4362.0" />
<point x="-77.33333333333303" y="192.0" />
</edge>
<edge source="eu.univento.commons.player.user.Textures.Cape" target="eu.univento.commons.player.user.Textures">
<point x="46.0" y="59.5" />
<point x="4937.566666666667" y="144.0" />
<point x="4951.233333333333" y="144.0" />
<point x="59.66666666666663" y="-81.5" />
</edge>
<edge source="eu.univento.commons.database.DatabaseManager" target="eu.univento.commons.configuration.ConfigurationHandler">
<point x="-93.63636363636363" y="-114.5" />
<point x="2035.1136363636365" y="4362.0" />
<point x="66.70000000000027" y="4362.0" />
<point x="66.70000000000027" y="3118.0" />
<point x="20.800000000000182" y="3118.0" />
<point x="-83.19999999999982" y="70.5" />
</edge>
<edge source="eu.univento.commons.Commons" target="eu.univento.commons.player.party.PartyManager">
<point x="7.125" y="-137.0" />
<point x="2295.625" y="3454.0" />
<point x="2334.25" y="3454.0" />
<point x="-45.75" y="59.0" />
</edge>
<edge source="eu.univento.commons.player.statistics.GameStatistics" target="eu.univento.commons.player.DatabasePlayer">
<point x="-144.375" y="-37.0" />
<point x="2971.0059523809523" y="3098.0" />
<point x="2443.357142857143" y="3098.0" />
<point x="174.8571428571429" y="643.0" />
</edge>
</edges>
<settings layout="Hierarchic Group" zoom="0.5000000000000001" x="2363.4999999999955" y="2946.249999999999" />
<SelectedNodes>
<node>eu.univento.commons.player.rank.Rank</node>
<node>eu.univento.commons.player.DatabasePlayer</node>
<node>eu.univento.commons.helpers.Location</node>
<node>eu.univento.commons.player.statistics.GameStatistics</node>
<node>eu.univento.commons.Commons</node>
<node>eu.univento.commons.player.rank.Group</node>
<node>eu.univento.commons.CommonsTest</node>
<node>eu.univento.commons.player.statistics.ImpactStatistics</node>
</SelectedNodes>
<Categories>
<Category>Fields</Category>
<Category>Inner Classes</Category>
<Category>Constructors</Category>
<Category>Properties</Category>
<Category>Methods</Category>
</Categories>
<SCOPE>All</SCOPE>
<VISIBILITY>private</VISIBILITY>
</Diagram>

86
pom.xml
View File

@ -38,64 +38,8 @@
</developer> </developer>
</developers> </developers>
<issueManagement>
<system>gitlab</system>
<url>http://development.univento.eu/issues/Commons</url>
</issueManagement>
<ciManagement>
<system>gitlab</system>
<url>https://development.univento.eu/ci/Commons</url>
</ciManagement>
<distributionManagement>
<repository>
<id>univentoEU</id>
<url>http://nexus.unit.univento.eu/repository/univento/</url>
</repository>
<!--
<site>
<id>univento.commons</id>
<name>univento Commons</name>
<url>sftp://development.univento.eu/doc/Commons</url>
</site>
-->
</distributionManagement>
<build> <build>
<plugins> <plugins>
<!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.6</version>
</plugin>
<plugin>
<groupId>org.apache.maven.enforcer</groupId>
<artifactId>enforcer</artifactId>
<executions>
<execution>
<phase>validate</phase>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireNoRepositories/>
</rules>
</configuration>
</execution>
</executions>
</plugin>
-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
@ -120,16 +64,26 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.6.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<annotationProcessorPaths>
<path>
<groupId>com.google.dagger</groupId>
<artifactId>dagger-compiler</artifactId>
<version>2.14.1</version>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>
</plugins> </plugins>
</build> </build>
<dependencies> <dependencies>
<dependency>
<groupId>ai.api</groupId>
<artifactId>libai</artifactId>
<version>1.4.8</version>
</dependency>
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
@ -201,7 +155,7 @@
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>19.0</version> <version>21.0</version>
</dependency> </dependency>
<dependency> <dependency>
@ -240,5 +194,11 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>com.google.dagger</groupId>
<artifactId>dagger</artifactId>
<version>2.14.1</version>
</dependency>
</dependencies> </dependencies>
</project> </project>

View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2017 univento.eu - All rights reserved * Copyright (c) 2018 univento.eu - All rights reserved
* You are not allowed to use, distribute or modify this code * You are not allowed to use, distribute or modify this code
*/ */
@ -54,8 +54,12 @@ public class DatabasePlayer {
this.uuid = uuid; this.uuid = uuid;
} }
public DatabasePlayer(String name) {
UserInformation.get(name).whenComplete((userInformation, throwable) -> new DatabasePlayer(UUID.fromString(userInformation.getUuid())));
}
public void load(String host) { public void load(String host) {
Commons.getCommons().getDatabaseManager().getMongoDB().getClient().find("players", new JsonObject().put("uuid", uuid), res -> { Commons.getCommons().getDatabaseManager().getMongoDB().getClient().find("players", new JsonObject().put("uuid", uuid.toString()), res -> {
if(res.succeeded()) { if(res.succeeded()) {
if(res.result().isEmpty()) insert(host); if(res.result().isEmpty()) insert(host);
}else { }else {
@ -91,7 +95,7 @@ public class DatabasePlayer {
} }
private void update() { private void update() {
Commons.getCommons().getDatabaseManager().getMongoDB().getClient().findOne("players", new JsonObject().put("uuid", uuid), null, res -> { Commons.getCommons().getDatabaseManager().getMongoDB().getClient().findOne("players", new JsonObject().put("uuid", uuid.toString()), null, res -> {
if(res.failed()) res.cause().printStackTrace(); if(res.failed()) res.cause().printStackTrace();
json = res.result(); json = res.result();
}); });

View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2017 univento.eu - All rights reserved * Copyright (c) 2018 univento.eu - All rights reserved
* You are not allowed to use, distribute or modify this code * You are not allowed to use, distribute or modify this code
*/ */
@ -39,9 +39,7 @@ public class PartyManager {
CompletableFuture<Party> future = new CompletableFuture<>(); CompletableFuture<Party> future = new CompletableFuture<>();
Commons.getCommons().getDatabaseManager().getMongoDB().getClient().findOne("partys", new JsonObject().put("owner", player.getUuid().toString()), null, res -> { Commons.getCommons().getDatabaseManager().getMongoDB().getClient().findOne("partys", new JsonObject().put("owner", player.getUuid().toString()), null, res -> {
if(res.succeeded()) { if(res.succeeded()) {
getParty(UUID.fromString(res.result().getString("id"))).whenComplete((party, throwable) -> { getParty(UUID.fromString(res.result().getString("id"))).whenComplete((party, throwable) -> future.complete(party));
future.complete(party);
});
} }
}); });
return future; return future;

View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2017 univento.eu - All rights reserved * Copyright (c) 2018 univento.eu - All rights reserved
* You are not allowed to use, distribute or modify this code * You are not allowed to use, distribute or modify this code
*/ */
@ -27,7 +27,7 @@ public class UserInformation {
public static CompletableFuture<UserInformation> get(String identifier) { public static CompletableFuture<UserInformation> get(String identifier) {
CompletableFuture<UserInformation> future = new CompletableFuture<>(); CompletableFuture<UserInformation> future = new CompletableFuture<>();
if(client == null) client = WebClient.create(Commons.getCommons().getVertx()); if(client == null) client = WebClient.create(Commons.getCommons().getVertx());
client.getAbs("https://mcapi.de/api/user/" + identifier).ssl(true).send(ar -> { client.getAbs("https://api.univento.eu/private/player/" + identifier).ssl(true).send(ar -> {
if(ar.succeeded()) { if(ar.succeeded()) {
future.complete(ar.result().bodyAsJsonObject().mapTo(UserInformation.class)); future.complete(ar.result().bodyAsJsonObject().mapTo(UserInformation.class));
}else future.complete(null); }else future.complete(null);

View File

@ -1,3 +1,8 @@
#
# Copyright (c) 2018 univento.eu - All rights reserved
# You are not allowed to use, distribute or modify this code
#
MySQL.Host = univento.eu MySQL.Host = univento.eu
MySQL.Port = 3306 MySQL.Port = 3306
MySQL.Username = custo_univento MySQL.Username = custo_univento
@ -20,8 +25,6 @@ RabbitMQ.Port = 5672
RabbitMQ.Username = univento RabbitMQ.Username = univento
RabbitMQ.Password = tYRHXZNm4exW@QB6rMm72pHnafrT8wQ5ebGPEetJDBVU2mj25kTVXuYeQavb#EYr RabbitMQ.Password = tYRHXZNm4exW@QB6rMm72pHnafrT8wQ5ebGPEetJDBVU2mj25kTVXuYeQavb#EYr
RabbitMQ.VirtualHost = univento RabbitMQ.VirtualHost = univento
Slack.hook_url = https://hooks.slack.com/services/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
api.ai.token = e1c97924577a4743800b3fefb16dd527
Sentry.DSN.Commons = http://6b35ae68e540439da1a9b51ab3b2928e:0afbbeccc1a14ae4a10f9ba1775c93b7@sentry.dev.univento.eu/3 Sentry.DSN.Commons = http://6b35ae68e540439da1a9b51ab3b2928e:0afbbeccc1a14ae4a10f9ba1775c93b7@sentry.dev.univento.eu/3
Sentry.DSN.Core = http://f5b6c0945a334f9398fc5baf89893c00:481956843e3c45b3be9a899f3e5fccb7@sentry.dev.univento.eu/4 Sentry.DSN.Core = http://f5b6c0945a334f9398fc5baf89893c00:481956843e3c45b3be9a899f3e5fccb7@sentry.dev.univento.eu/4
Sentry.DSN.BungeeCore = http://5e48cd49a4124515aae49dac2b42a317:7c123d87046f47c987c0e2f5adadfd48@sentry.dev.univento.eu/5 Sentry.DSN.BungeeCore = http://5e48cd49a4124515aae49dac2b42a317:7c123d87046f47c987c0e2f5adadfd48@sentry.dev.univento.eu/5

View File

@ -1,17 +1,15 @@
/* /*
* Copyright (c) 2017 univento.eu - All rights reserved * Copyright (c) 2018 univento.eu - All rights reserved
* You are not allowed to use, distribute or modify this code * You are not allowed to use, distribute or modify this code
*/ */
package eu.univento.commons; package eu.univento.commons;
import eu.univento.commons.database.DatabaseManager; import eu.univento.commons.database.DatabaseManager;
import eu.univento.commons.player.user.UserInformation;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
import static org.awaitility.Awaitility.await; import static org.awaitility.Awaitility.await;
@ -36,15 +34,6 @@ public class CommonsTest {
commons.shutdown(); commons.shutdown();
} }
@Test
public void testUserInformationName() {
try {
assertTrue(UserInformation.get("069a79f444e94726a5befca90e38aaf5").get().getUsername().equals("Notch"));
} catch (InterruptedException | ExecutionException e) {
e.printStackTrace();
}
}
@Test @Test
public void testCommons() { public void testCommons() {
assertNotNull(commons); assertNotNull(commons);