GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity

Merge branch 'feature/1.17' of https://github.com/GeyserMC/Geyser into feature/1.17

Browse source
This commit is contained in:
Camotoy 2021-06-08 08:57:50 -04:00
commit b2ef059aed
No known key found for this signature in database
GPG key ID: 7EEFB66FE798081F
8 changed files with 54 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

4
common/src/main/java/org/geysermc/floodgate/news/NewsItem.java
View file

@ -100,6 +100,10 @@ public final class NewsItem {
return project;
}
public boolean isGlobal() {
return "all".equals(getProject());
}
public boolean isActive() {
return active;
}

35
common/src/main/java/org/geysermc/floodgate/util/FloodgateConfigHolder.java
View file

@ -1,35 +0,0 @@
/*
* Copyright (c) 2019-2021 GeyserMC. http://geysermc.org
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*
* @author GeyserMC
* @link https://github.com/GeyserMC/Geyser
*/
package org.geysermc.floodgate.util;
import lombok.Getter;
import lombok.Setter;
public final class FloodgateConfigHolder {
@Getter
@Setter
private static Object config;
}

6
common/src/main/java/org/geysermc/floodgate/util/FloodgateGitPropertiesHolder.java → common/src/main/java/org/geysermc/floodgate/util/FloodgateInfoHolder.java
View file

@ -27,9 +27,13 @@ package org.geysermc.floodgate.util;
import lombok.Getter;
import lombok.Setter;
import java.util.Properties;
public class FloodgateGitPropertiesHolder {
public final class FloodgateInfoHolder {
@Getter
@Setter
private static Object config;
@Getter
@Setter
private static Properties gitProperties;