Jaki/SteamWar
1
0
Fork 0
forked from SteamWar/SteamWar
Code Pull Requests Activity

Fix some more issues

Browse Source
This commit is contained in:
YoyoNow
2025-07-11 21:54:27 +02:00
parent 43cca3376e
commit a6b703b821
8 changed files with 122 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FireListener.java
+4 -4
View File
@@ -17,12 +17,12 @@ public class FireListener implements Listener, ScoreboardElement {
@EventHandler
public void onFireDamage(BlockBurnEvent e) {
if (Region.getRegion(e.getBlock().getLocation()).isFlag(Flag.FIRE, FireMode.DENY)) e.setCancelled(true);
if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FIRE).isWithDefault(FireMode.DENY)) e.setCancelled(true);
}
@EventHandler
public void onFireSpread(BlockSpreadEvent e) {
if (Region.getRegion(e.getBlock().getLocation()).isFlag(Flag.FIRE, FireMode.DENY)) e.setCancelled(true);
if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FIRE).isWithDefault(FireMode.DENY)) e.setCancelled(true);
}
@Override
@@ -37,7 +37,7 @@ public class FireListener implements Listener, ScoreboardElement {
@Override
public String get(Region region, Player p) {
if (region.isFlag(Flag.FIRE, Flag.FIRE.getDefaultValue(), true)) return null;
return "§e" + BauSystem.MESSAGE.parse(Flag.FIRE.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getFlag(Flag.FIRE).get().getChatValue(), p);
if (region.getFlags().get(Flag.FIRE).isWithDefault(FireMode.DENY)) return null;
return "§e" + BauSystem.MESSAGE.parse(Flag.FIRE.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getFlags().get(Flag.FIRE).getWithDefault().getChatValue(), p);
}
}
BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TNTListener.java
+3 -4
View File
@@ -42,8 +42,7 @@ public class TNTListener implements Listener, ScoreboardElement {
private void explode(List<Block> blockList) {
blockList.removeIf(block -> {
Region region = Region.getRegion(block.getLocation());
if (!region.hasFlag(Flag.TNT).isReadable()) return false;
TNTMode value = region.getFlag(Flag.TNT).get();
TNTMode value = region.getFlags().get(Flag.TNT).getWithDefault();
if (value == TNTMode.ALLOW) {
return false;
} else if (value == TNTMode.ONLY_TB) {
@@ -83,7 +82,7 @@ public class TNTListener implements Listener, ScoreboardElement {
@Override
public String get(Region region, Player p) {
if (!region.hasFlag(Flag.TNT).isReadable()) return null;
return "§e" + BauSystem.MESSAGE.parse(Flag.TNT.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getFlag(Flag.TNT).get().getChatValue(), p);
if (region.getFlags().get(Flag.TNT).isWithDefault(TNTMode.ALLOW)) return null;
return "§e" + BauSystem.MESSAGE.parse(Flag.TNT.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getFlags().get(Flag.TNT).getWithDefault().getChatValue(), p);
}
}
BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/RegionLib.java
+7 -7
View File
@@ -54,15 +54,15 @@ public class RegionLib implements LuaLib {
}));
LuaValue tntLib = LuaValue.tableOf();
tntLib.set("mode", getter(() -> region.get().getFlag(Flag.TNT).get().name()));
tntLib.set("enabled", getter(() -> region.get().getFlag(Flag.TNT).get() != TNTMode.DENY));
tntLib.set("onlyTb", getter(() -> region.get().getFlag(Flag.TNT).get() == TNTMode.ONLY_TB));
tntLib.set("onlyBuild", getter(() -> region.get().getFlag(Flag.TNT).get() == TNTMode.ONLY_BUILD));
tntLib.set("mode", getter(() -> region.get().getFlags().get(Flag.TNT).nameWithDefault()));
tntLib.set("enabled", getter(() -> region.get().getFlags().get(Flag.TNT).orElse(null) != TNTMode.DENY));
tntLib.set("onlyTb", getter(() -> region.get().getFlags().get(Flag.TNT).orElse(null) == TNTMode.ONLY_TB));
tntLib.set("onlyBuild", getter(() -> region.get().getFlags().get(Flag.TNT).orElse(null) == TNTMode.ONLY_BUILD));
table.set("tnt", tntLib);
table.set("fire", getter(() -> region.get().getFlag(Flag.FIRE).get() == FireMode.ALLOW));
table.set("freeze", getter(() -> region.get().getFlag(Flag.FREEZE).get() == FreezeMode.ACTIVE));
table.set("protect", getter(() -> region.get().getFlag(Flag.PROTECT).get() == ProtectMode.ACTIVE));
table.set("fire", getter(() -> region.get().getFlags().get(Flag.FIRE).orElse(null) == FireMode.ALLOW));
table.set("freeze", getter(() -> region.get().getFlags().get(Flag.FREEZE).orElse(null) == FreezeMode.ACTIVE));
table.set("protect", getter(() -> region.get().getFlags().get(Flag.PROTECT).orElse(null) == ProtectMode.ACTIVE));
//LuaValue traceLib = LuaValue.tableOf();
//traceLib.set("active", getter(() -> !region.get().isGlobal() && Recorder.INSTANCE.get(region.get()) instanceof ActiveTracer));
BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/techhider/TechHiderCommand.java
+1 -1
View File
@@ -69,7 +69,7 @@ public class TechHiderCommand extends SWCommand implements Listener, ScoreboardE
}
Optional<TechHider> techHider = techHiders.computeIfAbsent(region, rg -> {
File file = rg.gameModeConfig();
File file = rg.getGameModeConfig().orElse(null);
if (file == null) {
return Optional.empty();
}
BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/xray/XrayCommand.java
+1 -1
View File
@@ -70,7 +70,7 @@ public class XrayCommand extends SWCommand implements Listener, ScoreboardElemen
}
Optional<TechHider> techHider = techHiders.computeIfAbsent(region, rg -> {
File file = rg.gameModeConfig();
File file = rg.getGameModeConfig().orElse(null);
if (file == null) {
return Optional.empty();
}
BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/FlagOptional.java
+97
View File
@@ -0,0 +1,97 @@
/*
* This file is a part of the SteamWar software.
*
* Copyright (C) 2020 SteamWar.de-Serverteam
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package de.steamwar.bausystem.region;
import de.steamwar.bausystem.region.flags.Flag;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import java.util.NoSuchElementException;
import java.util.Optional;
@AllArgsConstructor(access = AccessLevel.PRIVATE)
public class FlagOptional<T extends Enum<T> & Flag.Value<T>> {
private final Flag<T> flag;
private final T value;
public static <T extends Enum<T> & Flag.Value<T>> FlagOptional<T> of(Flag<T> flag) {
return new FlagOptional<>(flag, null);
}
public static <T extends Enum<T> & Flag.Value<T>> FlagOptional<T> of(Flag<T> flag, T value) {
return new FlagOptional<>(flag, value);
}
public boolean isPresent() {
return value != null;
}
public boolean isEmpty() {
return value == null;
}
public boolean is(T value) {
if (isEmpty()) return false;
return this.value.equals(value);
}
public boolean isWithDefault(T value) {
if (isEmpty()) {
return flag.getDefaultValue().equals(value);
} else {
return this.value.equals(value);
}
}
public T get() {
if (isEmpty()) {
throw new NoSuchElementException("No value present");
}
return value;
}
public T getWithDefault() {
if (isEmpty()) {
return flag.getDefaultValue();
} else {
return value;
}
}
public T orElse(T defaultValue) {
if (isEmpty()) {
return defaultValue;
} else {
return value;
}
}
public Optional<String> name() {
if (isEmpty()) {
return Optional.empty();
}
return Optional.of(value.name());
}
public String nameWithDefault() {
return getWithDefault().name();
}
}
BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/FlagStorage.java
+1 -3
View File
@@ -21,13 +21,11 @@ package de.steamwar.bausystem.region;
import de.steamwar.bausystem.region.flags.Flag;
import java.util.Optional;
public interface FlagStorage {
<T extends Enum<T> & Flag.Value<T>> RegionFlagPolicy has(Flag<T> flag);
<T extends Enum<T> & Flag.Value<T>> boolean set(Flag<T> flag, T value);
<T extends Enum<T> & Flag.Value<T>> Optional<T> get(Flag<T> flag);
<T extends Enum<T> & Flag.Value<T>> FlagOptional<T> get(Flag<T> flag);
}
BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/utils/RegionType.java
+8 -8
View File
@@ -19,15 +19,15 @@ public enum RegionType implements EnumDisplay {
(region, extension) -> region.getArea().getMinPoint(false),
(region, extension) -> region.getArea().getMaxPoint(false)),
BUILD("REGION_TYPE_BUILD",
region -> region.getBuildArea().isPresent(),
region -> region.getBuildArea().get(),
(region, extension) -> region.getBuildArea().get().getMinPoint(extension),
(region, extension) -> region.getBuildArea().get().getMaxPoint(extension)),
region -> !region.getBuildArea().isEmpty(),
Region::getBuildArea,
(region, extension) -> region.getBuildArea().getMinPoint(extension),
(region, extension) -> region.getBuildArea().getMaxPoint(extension)),
TESTBLOCK("REGION_TYPE_ONLY_TB",
region -> region.getTestblockArea().isPresent(),
region -> region.getTestblockArea().get(),
(region, extension) -> region.getTestblockArea().get().getMinPoint(extension),
(region, extension) -> region.getTestblockArea().get().getMaxPoint(extension)),
region -> !region.getTestblockArea().isEmpty(),
Region::getTestblockArea,
(region, extension) -> region.getTestblockArea().getMinPoint(extension),
(region, extension) -> region.getTestblockArea().getMaxPoint(extension)),
;
private String chatValue;