Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Aura Development Team
AuraSudo
Commits
c2a5d188
Verified
Commit
c2a5d188
authored
Jan 20, 2021
by
Yannick Schinko
Browse files
Small improvements
parent
04a28dd5
Changes
2
Hide whitespace changes
Inline
Side-by-side
platform/common/src/main/java/team/aura_dev/aurasudo/platform/common/AuraSudoBase.java
View file @
c2a5d188
...
...
@@ -3,9 +3,6 @@ package team.aura_dev.aurasudo.platform.common;
import
edu.umd.cs.findbugs.annotations.SuppressFBWarnings
;
import
java.nio.file.Path
;
import
java.util.Arrays
;
import
java.util.Collection
;
import
java.util.Collections
;
import
java.util.LinkedList
;
import
java.util.List
;
import
lombok.Getter
;
import
lombok.SneakyThrows
;
...
...
@@ -16,8 +13,8 @@ import team.aura_dev.aurasudo.platform.common.config.ConfigLoader;
import
team.aura_dev.aurasudo.platform.common.dependency.RuntimeDependencies
;
import
team.aura_dev.aurasudo.platform.common.player.PlayerManagerCommon
;
import
team.aura_dev.lib.multiplatformcore.DependencyClassLoader
;
import
team.aura_dev.lib.multiplatformcore.dependency.RuntimeDependency
;
import
team.aura_dev.lib.multiplatformcore.download.DependencyDownloader
;
import
team.aura_dev.lib.multiplatformcore.download.DependencyList
;
@SuppressFBWarnings
(
value
=
{
"JLM_JSR166_UTILCONCURRENT_MONITORENTER"
,
"RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE"
},
...
...
@@ -64,39 +61,18 @@ public abstract class AuraSudoBase implements AuraSudoApi, AuraSudoBaseBootstrap
return
getConfigDir
().
resolve
(
ID
+
".conf"
);
}
public
Collection
<
RuntimeDependency
>
getEarlyDependencies
()
{
final
List
<
RuntimeDependency
>
dependencies
=
new
LinkedList
<>();
public
DependencyList
getEarlyDependencies
(
DependencyList
dependencyList
)
{
// We need Configurate for the config
dependencies
.
add
(
RuntimeDependencies
.
CONFIGURATE_HOCON
);
// We don't need to download dependencies already present
dependencies
.
removeAll
(
getPlatformDependencies
());
dependencyList
.
add
(
RuntimeDependencies
.
CONFIGURATE_HOCON
);
return
dependenc
ies
;
return
dependenc
yList
;
}
public
Collection
<
RuntimeDependency
>
getDependencies
()
{
final
List
<
RuntimeDependency
>
dependencies
=
new
LinkedList
<>();
public
DependencyList
getDependencies
(
DependencyList
dependencyList
)
{
// We need caffeine as a loading cache in several classes
dependencies
.
add
(
RuntimeDependencies
.
CAFFEINE
);
// We don't need to download dependencies already present
dependencies
.
removeAll
(
getPlatformDependencies
());
return
dependencies
;
}
dependencyList
.
add
(
RuntimeDependencies
.
CAFFEINE
);
/**
* This method returns a {@link Collection} of all the dependencies that are already present on
* the target platform.<br>
* This allows making sure that they are not downloaded unnecessarily.
*
* @return a {@link Collection} of already present dependencies
*/
public
Collection
<
RuntimeDependency
>
getPlatformDependencies
()
{
return
Collections
.
emptyList
();
return
dependencyList
;
}
protected
abstract
PlayerManagerCommon
generatePlayerManager
();
...
...
@@ -119,7 +95,7 @@ public abstract class AuraSudoBase implements AuraSudoApi, AuraSudoBaseBootstrap
}
logger
.
info
(
"Downloading early dependencies"
);
dependencyDownloader
.
downloadAndInjectInClasspath
(
getEarlyDependencies
());
dependencyDownloader
.
downloadAndInjectInClasspath
(
getEarlyDependencies
(
new
DependencyList
()
));
configLoader
=
new
ConfigLoader
(
this
);
configLoader
.
loadConfig
();
...
...
@@ -138,7 +114,7 @@ public abstract class AuraSudoBase implements AuraSudoApi, AuraSudoBaseBootstrap
logger
.
info
(
"Initializing "
+
NAME
+
" Version "
+
VERSION
);
logger
.
info
(
"Downloading dependencies"
);
dependencyDownloader
.
downloadAndInjectInClasspath
(
getDependencies
());
dependencyDownloader
.
downloadAndInjectInClasspath
(
getDependencies
(
new
DependencyList
()
));
this
.
playerManager
=
generatePlayerManager
();
...
...
platform/common/src/main/java/team/aura_dev/aurasudo/platform/common/player/PlayerDataCommon.java
View file @
c2a5d188
...
...
@@ -24,7 +24,7 @@ import team.aura_dev.aurasudo.api.player.PlayerData;
public
class
PlayerDataCommon
implements
PlayerData
{
@NonNull
protected
final
UUID
uuid
;
@NonNull
protected
final
String
playerName
;
@NonNull
protected
boolean
sudoActive
=
false
;
protected
boolean
sudoActive
=
false
;
/**
* A nice name for the player.<br>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment