SteamWar/FightSystem
SteamWar/FightSystem
Archiviert
13
1
Fork 0
Code Issues 6 Pull-Requests Releases Wiki Aktivität

Pinker Teppich im Fightsystem zu Teamfarbe replacen hinzugefügt (1.8 + 1.14)

Quellcode durchsuchen
Dieser Commit ist enthalten in:
BuildTools 2020-01-06 21:14:51 +01:00
Ursprung e352862c5e
Commit 88f9f8608a
4 geänderte Dateien mit 46 neuen und 0 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

22
FightSystem_14/FightSystem_14.iml Normale Datei
Datei anzeigen

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="PROVIDED" name="Maven: steamwar:Spigot:1.14" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: steamwar:WorldEdit:1.15" level="project" />
<orderEntry type="module" module-name="FightSystem_API" />
<orderEntry type="module" module-name="FightSystem_12" />
<orderEntry type="module" module-name="FightSystem_10" />
<orderEntry type="module" module-name="FightSystem_9" />
<orderEntry type="module" module-name="FightSystem_8" />
<orderEntry type="library" scope="PROVIDED" name="Maven: steamwar:SpigotCore:2.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: steamwar:ProtocolLib:1.0" level="project" />
</component>
</module>

2
FightSystem_14/src/de/steamwar/fightsystem/fight/FightTeam_14.java
Datei anzeigen

@ -35,6 +35,7 @@ class FightTeam_14 {
private static final Set<BaseBlock> GLASS_PANE_SET = Collections.singleton(Objects.requireNonNull(BlockTypes.PINK_STAINED_GLASS_PANE).getDefaultState().toBaseBlock()); private static final Set<BaseBlock> GLASS_PANE_SET = Collections.singleton(Objects.requireNonNull(BlockTypes.PINK_STAINED_GLASS_PANE).getDefaultState().toBaseBlock());
private static final Set<BaseBlock> CONCRETE_SET = Collections.singleton(Objects.requireNonNull(BlockTypes.PINK_CONCRETE).getDefaultState().toBaseBlock()); private static final Set<BaseBlock> CONCRETE_SET = Collections.singleton(Objects.requireNonNull(BlockTypes.PINK_CONCRETE).getDefaultState().toBaseBlock());
private static final Set<BaseBlock> CONCRETE_POWDER_SET = Collections.singleton(Objects.requireNonNull(BlockTypes.PINK_CONCRETE_POWDER).getDefaultState().toBaseBlock()); private static final Set<BaseBlock> CONCRETE_POWDER_SET = Collections.singleton(Objects.requireNonNull(BlockTypes.PINK_CONCRETE_POWDER).getDefaultState().toBaseBlock());
private static final Set<BaseBlock> CARPET_SET = Collections.singleton(Objects.requireNonNull(BlockTypes.PINK_CARPET).getDefaultState().toBaseBlock());
static void setTeamColor(Team team, ChatColor color){ static void setTeamColor(Team team, ChatColor color){
team.setColor(color); team.setColor(color);
@ -46,6 +47,7 @@ class FightTeam_14 {
CuboidRegion region = new CuboidRegion(corner3, corner3.add(schemsize3)); CuboidRegion region = new CuboidRegion(corner3, corner3.add(schemsize3));
try { try {
e.replaceBlocks(region, WOOL_SET, Objects.requireNonNull(BlockTypes.get(c.name().toLowerCase() + "_wool")).getDefaultState().toBaseBlock()); e.replaceBlocks(region, WOOL_SET, Objects.requireNonNull(BlockTypes.get(c.name().toLowerCase() + "_wool")).getDefaultState().toBaseBlock());
e.replaceBlocks(region, CARPET_SET, Objects.requireNonNull(BlockTypes.get(c.name().toLowerCase() + "_carpet")).getDefaultState().toBaseBlock());
e.replaceBlocks(region, CLAY_SET, Objects.requireNonNull(BlockTypes.get(c.name().toLowerCase() + "_terracotta")).getDefaultState().toBaseBlock()); e.replaceBlocks(region, CLAY_SET, Objects.requireNonNull(BlockTypes.get(c.name().toLowerCase() + "_terracotta")).getDefaultState().toBaseBlock());
e.replaceBlocks(region, GLASS_SET, Objects.requireNonNull(BlockTypes.get(c.name().toLowerCase() + "_stained_glass")).getDefaultState().toBaseBlock()); e.replaceBlocks(region, GLASS_SET, Objects.requireNonNull(BlockTypes.get(c.name().toLowerCase() + "_stained_glass")).getDefaultState().toBaseBlock());
e.replaceBlocks(region, GLASS_PANE_SET, Objects.requireNonNull(BlockTypes.get(c.name().toLowerCase() + "_stained_glass_pane")).getDefaultState().toBaseBlock()); e.replaceBlocks(region, GLASS_PANE_SET, Objects.requireNonNull(BlockTypes.get(c.name().toLowerCase() + "_stained_glass_pane")).getDefaultState().toBaseBlock());

18
FightSystem_8/FightSystem_8.iml Normale Datei
Datei anzeigen

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="PROVIDED" name="Maven: steamwar:Spigot:1.8" level="project" />
<orderEntry type="module" module-name="FightSystem_API" />
<orderEntry type="library" scope="PROVIDED" name="Maven: steamwar:WorldEdit:1.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: steamwar:SpigotCore:2.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: steamwar:ProtocolLib:1.0" level="project" />
</component>
</module>

4
FightSystem_8/src/de/steamwar/fightsystem/fight/FightTeam_8.java
Datei anzeigen

@ -44,11 +44,14 @@ class FightTeam_8 {
private static final BaseBlock CLAY = new BaseBlock(Material.CLAY.getId(), COLOR_TO_REPLACE); private static final BaseBlock CLAY = new BaseBlock(Material.CLAY.getId(), COLOR_TO_REPLACE);
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
private static final BaseBlock GLASS_PANE = new BaseBlock(Material.STAINED_GLASS_PANE.getId(), COLOR_TO_REPLACE); private static final BaseBlock GLASS_PANE = new BaseBlock(Material.STAINED_GLASS_PANE.getId(), COLOR_TO_REPLACE);
@SuppressWarnings("deprecation")
private static final BaseBlock CARPET = new BaseBlock(Material.CARPET.getId(), COLOR_TO_REPLACE);
private static final Set<BaseBlock> WOOL_SET = Collections.singleton(WOOL); private static final Set<BaseBlock> WOOL_SET = Collections.singleton(WOOL);
private static final Set<BaseBlock> CLAY_SET = Collections.singleton(CLAY); private static final Set<BaseBlock> CLAY_SET = Collections.singleton(CLAY);
private static final Set<BaseBlock> GLASS_SET = Collections.singleton(GLASS); private static final Set<BaseBlock> GLASS_SET = Collections.singleton(GLASS);
private static final Set<BaseBlock> GLASS_PANE_SET = Collections.singleton(GLASS_PANE); private static final Set<BaseBlock> GLASS_PANE_SET = Collections.singleton(GLASS_PANE);
private static final Set<BaseBlock> CARPET_SET = Collections.singleton(CARPET);
static void setTeamColor(Team team, ChatColor color){ static void setTeamColor(Team team, ChatColor color){
team.setPrefix("§" + color.getChar()); team.setPrefix("§" + color.getChar());
@ -63,6 +66,7 @@ class FightTeam_8 {
e.replaceBlocks(region, CLAY_SET, new BaseBlock(CLAY.getId(), c.getWoolData())); e.replaceBlocks(region, CLAY_SET, new BaseBlock(CLAY.getId(), c.getWoolData()));
e.replaceBlocks(region, GLASS_SET, new BaseBlock(GLASS.getId(), c.getWoolData())); e.replaceBlocks(region, GLASS_SET, new BaseBlock(GLASS.getId(), c.getWoolData()));
e.replaceBlocks(region, GLASS_PANE_SET, new BaseBlock(GLASS_PANE.getId(), c.getWoolData())); e.replaceBlocks(region, GLASS_PANE_SET, new BaseBlock(GLASS_PANE.getId(), c.getWoolData()));
e.replaceBlocks(region, CARPET_SET, new BaseBlock(CARPET.getId(), c.getWoolData()));
} catch (MaxChangedBlocksException ex) { } catch (MaxChangedBlocksException ex) {
// ignore, will never occur // ignore, will never occur
} }