mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-19 19:25:48 +00:00
Code Releases Activity

[CI skip] Lock in RC-24 release date

Browse Source
This commit is contained in:
TheBusyBiscuit 2021-06-03 18:57:07 +02:00
parent 5f8bd1b909
commit b7c6a431a5
7 changed files with 27 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -1,5 +1,5 @@
# Table of contents
- [Release Candidate 24 (TBD)](#release-candidate-24-tbd)
- [Release Candidate 24 (03 Jun 2021)](#release-candidate-24-03-jun-2021)
- [Release Candidate 23 (19 May 2021)](#release-candidate-23-19-may-2021)
- [Release Candidate 22 (18 Apr 2021)](#release-candidate-22-18-apr-2021)
- [Release Candidate 21 (14 Mar 2021)](#release-candidate-21-14-mar-2021)
@ -24,7 +24,7 @@
- [Release Candidate 2 (29 Sep 2019)](#release-candidate-2-29-sep-2019)
- [Release Candidate 1 (26 Sep 2019)](#release-candidate-1-26-sep-2019)
## Release Candidate 24 (TBD)
## Release Candidate 24 (03 Jun 2021)
#### Additions
* (API) Added AsyncMachineOperationFinishEvent

9
src/main/java/io/github/thebusybiscuit/slimefun4/api/SlimefunAddon.java
View File

@ -50,8 +50,7 @@ public interface SlimefunAddon {
*
* @return The Name of this {@link SlimefunAddon}
*/
@Nonnull
default String getName() {
default @Nonnull String getName() {
return getJavaPlugin().getName();
}
@ -61,8 +60,7 @@ public interface SlimefunAddon {
*
* @return The version of this {@link SlimefunAddon}
*/
@Nonnull
default String getPluginVersion() {
default @Nonnull String getPluginVersion() {
return getJavaPlugin().getDescription().getVersion();
}
@ -72,8 +70,7 @@ public interface SlimefunAddon {
*
* @return The {@link Logger} of this {@link SlimefunAddon}
*/
@Nonnull
default Logger getLogger() {
default @Nonnull Logger getLogger() {
return getJavaPlugin().getLogger();
}

3
src/main/java/io/github/thebusybiscuit/slimefun4/api/SlimefunBranch.java
View File

@ -61,8 +61,7 @@ public enum SlimefunBranch {
*
* @return The name of this {@link SlimefunBranch}
*/
@Nonnull
public String getName() {
public @Nonnull String getName() {
return name;
}

9
src/main/java/io/github/thebusybiscuit/slimefun4/api/network/Network.java
View File

@ -99,8 +99,7 @@ public abstract class Network {
*
* @return The assigned type of {@link NetworkComponent} for this {@link Location}
*/
@Nullable
public abstract NetworkComponent classifyLocation(@Nonnull Location l);
public abstract @Nullable NetworkComponent classifyLocation(@Nonnull Location l);
/**
* This method is called whenever a {@link Location} in this {@link Network} changes
@ -175,8 +174,7 @@ public abstract class Network {
}
}
@Nullable
private NetworkComponent getCurrentClassification(@Nonnull Location l) {
private @Nullable NetworkComponent getCurrentClassification(@Nonnull Location l) {
if (regulatorNodes.contains(l)) {
return NetworkComponent.REGULATOR;
} else if (connectorNodes.contains(l)) {
@ -259,8 +257,7 @@ public abstract class Network {
*
* @return The {@link Location} of our regulator
*/
@Nonnull
public Location getRegulator() {
public @Nonnull Location getRegulator() {
return regulator;
}

36
src/main/java/io/github/thebusybiscuit/slimefun4/api/player/PlayerProfile.java
View File

@ -110,8 +110,7 @@ public class PlayerProfile {
*
* @return The cached armor for this {@link Player}
*/
@Nonnull
public HashedArmorpiece[] getArmor() {
public @Nonnull HashedArmorpiece[] getArmor() {
return armor;
}
@ -121,8 +120,7 @@ public class PlayerProfile {
*
* @return The {@link Config} associated with this {@link PlayerProfile}
*/
@Nonnull
public Config getConfig() {
public @Nonnull Config getConfig() {
return configFile;
}
@ -131,8 +129,7 @@ public class PlayerProfile {
*
* @return The {@link UUID} of our {@link PlayerProfile}
*/
@Nonnull
public UUID getUUID() {
public @Nonnull UUID getUUID() {
return uuid;
}
@ -211,8 +208,7 @@ public class PlayerProfile {
*
* @return A {@code Hashset<Research>} of all Researches this {@link Player} has unlocked
*/
@Nonnull
public Set<Research> getResearches() {
public @Nonnull Set<Research> getResearches() {
return ImmutableSet.copyOf(researches);
}
@ -222,8 +218,7 @@ public class PlayerProfile {
*
* @return A {@link List} containing every {@link Waypoint}
*/
@Nonnull
public List<Waypoint> getWaypoints() {
public @Nonnull List<Waypoint> getWaypoints() {
return ImmutableList.copyOf(waypoints);
}
@ -283,8 +278,7 @@ public class PlayerProfile {
dirty = true;
}
@Nonnull
public PlayerBackpack createBackpack(int size) {
public @Nonnull PlayerBackpack createBackpack(int size) {
IntStream stream = IntStream.iterate(0, i -> i + 1).filter(i -> !configFile.contains("backpacks." + i + ".size"));
int id = stream.findFirst().getAsInt();
@ -294,8 +288,7 @@ public class PlayerProfile {
return backpack;
}
@Nonnull
public Optional<PlayerBackpack> getBackpack(int id) {
public @Nonnull Optional<PlayerBackpack> getBackpack(int id) {
if (id < 0) {
throw new IllegalArgumentException("Backpacks cannot have negative ids!");
}
@ -313,8 +306,7 @@ public class PlayerProfile {
return Optional.empty();
}
@Nonnull
public String getTitle() {
public @Nonnull String getTitle() {
List<String> titles = SlimefunPlugin.getRegistry().getResearchRanks();
float fraction = (float) researches.size() / SlimefunPlugin.getRegistry().getResearches().size();
@ -344,8 +336,7 @@ public class PlayerProfile {
*
* @return The {@link Player} of this {@link PlayerProfile} or null
*/
@Nullable
public Player getPlayer() {
public @Nullable Player getPlayer() {
return Bukkit.getPlayer(getUUID());
}
@ -355,8 +346,7 @@ public class PlayerProfile {
*
* @return The {@link GuideHistory} of this {@link Player}
*/
@Nonnull
public GuideHistory getGuideHistory() {
public @Nonnull GuideHistory getGuideHistory() {
return guideHistory;
}
@ -431,13 +421,11 @@ public class PlayerProfile {
*
* @return An {@link Optional} describing the result
*/
@Nonnull
public static Optional<PlayerProfile> find(@Nonnull OfflinePlayer p) {
public static @Nonnull Optional<PlayerProfile> find(@Nonnull OfflinePlayer p) {
return Optional.ofNullable(SlimefunPlugin.getRegistry().getPlayerProfiles().get(p.getUniqueId()));
}
@Nonnull
public static Iterator<PlayerProfile> iterator() {
public static @Nonnull Iterator<PlayerProfile> iterator() {
return SlimefunPlugin.getRegistry().getPlayerProfiles().values().iterator();
}

6
src/main/java/io/github/thebusybiscuit/slimefun4/api/player/StatusEffect.java
View File

@ -33,9 +33,8 @@ public class StatusEffect implements Keyed {
this.key = key;
}
@Nonnull
@Override
public NamespacedKey getKey() {
public @Nonnull NamespacedKey getKey() {
return key;
}
@ -120,8 +119,7 @@ public class StatusEffect implements Keyed {
* The {@link Player} to check for
* @return An {@link OptionalInt} that describes the result
*/
@Nonnull
public OptionalInt getLevel(@Nonnull Player p) {
public @Nonnull OptionalInt getLevel(@Nonnull Player p) {
Optional<String> optional = PersistentDataAPI.getOptionalString(p, getKey());
if (optional.isPresent()) {

6
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/geo/OilPump.java
View File

@ -102,8 +102,10 @@ public class OilPump extends AContainer implements RecipeDisplayItem {
SlimefunPlugin.getGPSNetwork().getResourceManager().setSupplies(oil, b.getWorld(), b.getX() >> 4, b.getZ() >> 4, supplies.getAsInt() - 1);
return recipe;
} else {
// Move the empty bucket to the output slot to prevent this
// from immediately starting all over again (to prevent lag)
/*
* Move the empty bucket to the output slot to prevent this
* from immediately starting all over again (to prevent lag)
*/
ItemStack item = inv.getItemInSlot(slot).clone();
inv.replaceExistingItem(slot, null);
inv.pushItem(item, getOutputSlots());