This repository has been archived by the owner on Mar 15, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #843 from UnicacityAddon/feature/UCA-840-ingame-ga…
…ngzone-border feature/UCA-840-ingame-gangzone-border
- Loading branch information
Showing
31 changed files
with
1,049 additions
and
55 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
32 changes: 32 additions & 0 deletions
32
...src/main/java/com/rettichlp/unicacityaddon/base/gangzones/AbstractAttackableGangzone.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| package com.rettichlp.unicacityaddon.base.gangzones; | ||
|
|
||
| import com.rettichlp.unicacityaddon.UnicacityAddon; | ||
| import com.rettichlp.unicacityaddon.base.registry.annotation.UCGangzone; | ||
| import com.rettichlp.unicacityaddon.base.text.ColorCode; | ||
| import net.labymod.api.util.Color; | ||
| import net.labymod.api.util.Pair; | ||
| import net.labymod.api.util.math.vector.FloatVector3; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| public abstract class AbstractAttackableGangzone extends AbstractGangzone { | ||
|
|
||
| private final UnicacityAddon unicacityAddon; | ||
|
|
||
| public AbstractAttackableGangzone(UnicacityAddon unicacityAddon, UCGangzone ucGangzone) { | ||
| super(unicacityAddon, ucGangzone); | ||
| this.unicacityAddon = unicacityAddon; | ||
| } | ||
|
|
||
| public abstract List<Pair<FloatVector3, FloatVector3>> gangwarFacades(); | ||
|
|
||
| public void renderGangwarFacades() { | ||
| Color color = Color.ORANGE; | ||
| this.gangwarFacades().forEach(posPair -> this.unicacityAddon.renderController().drawFacade(posPair.getFirst(), posPair.getSecond(), color)); | ||
| } | ||
|
|
||
| public void renderGangwarOutline() { | ||
| Color color = Color.BLACK; | ||
| this.gangwarFacades().forEach(posPair -> this.unicacityAddon.renderController().drawOutline(posPair.getFirst(), posPair.getSecond(), color)); | ||
| } | ||
| } |
32 changes: 32 additions & 0 deletions
32
core/src/main/java/com/rettichlp/unicacityaddon/base/gangzones/AbstractGangzone.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| package com.rettichlp.unicacityaddon.base.gangzones; | ||
|
|
||
| import com.rettichlp.unicacityaddon.UnicacityAddon; | ||
| import com.rettichlp.unicacityaddon.base.registry.annotation.UCGangzone; | ||
| import net.labymod.api.util.Color; | ||
| import net.labymod.api.util.Pair; | ||
| import net.labymod.api.util.math.vector.FloatVector3; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| public abstract class AbstractGangzone { | ||
|
|
||
| private final UCGangzone ucGangzone; | ||
|
|
||
| private final UnicacityAddon unicacityAddon; | ||
|
|
||
| public AbstractGangzone(UnicacityAddon unicacityAddon, UCGangzone ucGangzone) { | ||
| this.unicacityAddon = unicacityAddon; | ||
| this.ucGangzone = ucGangzone; | ||
| } | ||
|
|
||
| public abstract List<Pair<FloatVector3, FloatVector3>> gangzoneFacades(); | ||
|
|
||
| public void renderGangzoneFacades() { | ||
| Color color = this.ucGangzone.owner().getColor().getLabymodColor(); | ||
| this.gangzoneFacades().forEach(posPair -> this.unicacityAddon.renderController().drawFacade(posPair.getFirst(), posPair.getSecond(), color)); | ||
| } | ||
|
|
||
| public void renderGangzoneOutline(Color color) { | ||
| this.gangzoneFacades().forEach(posPair -> this.unicacityAddon.renderController().drawOutline(posPair.getFirst(), posPair.getSecond(), color)); | ||
| } | ||
| } |
75 changes: 75 additions & 0 deletions
75
core/src/main/java/com/rettichlp/unicacityaddon/base/gangzones/Altstadt.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| package com.rettichlp.unicacityaddon.base.gangzones; | ||
|
|
||
| import com.rettichlp.unicacityaddon.UnicacityAddon; | ||
| import com.rettichlp.unicacityaddon.base.registry.annotation.UCGangzone; | ||
| import net.labymod.api.util.Pair; | ||
| import net.labymod.api.util.math.vector.FloatVector3; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| /** | ||
| * @author RettichLP | ||
| */ | ||
| @UCGangzone | ||
| public class Altstadt extends AbstractAttackableGangzone { | ||
|
|
||
| public Altstadt(UnicacityAddon unicacityAddon, UCGangzone ucGangzone) { | ||
| super(unicacityAddon, ucGangzone); | ||
| } | ||
|
|
||
| @Override | ||
| public List<Pair<FloatVector3, FloatVector3>> gangzoneFacades() { | ||
| return List.of( | ||
| Pair.of(new FloatVector3(195, 69, 589), new FloatVector3(195, 69, 637)), | ||
| Pair.of(new FloatVector3(195, 69, 637), new FloatVector3(182, 69, 637)), | ||
| Pair.of(new FloatVector3(182, 69, 637), new FloatVector3(182, 69, 647)), | ||
| Pair.of(new FloatVector3(182, 69, 647), new FloatVector3(174, 69, 647)), | ||
| Pair.of(new FloatVector3(174, 69, 647), new FloatVector3(174, 69, 677)), | ||
| Pair.of(new FloatVector3(174, 69, 677), new FloatVector3(178, 69, 677)), | ||
| Pair.of(new FloatVector3(178, 69, 677), new FloatVector3(178, 69, 687)), | ||
| Pair.of(new FloatVector3(178, 69, 687), new FloatVector3(182, 69, 687)), | ||
| Pair.of(new FloatVector3(182, 69, 687), new FloatVector3(182, 69, 745)), | ||
| Pair.of(new FloatVector3(182, 69, 745), new FloatVector3(176, 69, 745)), | ||
| Pair.of(new FloatVector3(176, 69, 745), new FloatVector3(176, 69, 768)), | ||
| Pair.of(new FloatVector3(176, 69, 768), new FloatVector3(182, 69, 768)), | ||
| Pair.of(new FloatVector3(182, 69, 768), new FloatVector3(182, 69, 794)), | ||
| Pair.of(new FloatVector3(182, 69, 794), new FloatVector3(192, 69, 794)), | ||
| Pair.of(new FloatVector3(192, 69, 794), new FloatVector3(192, 69, 848)), | ||
| Pair.of(new FloatVector3(192, 69, 848), new FloatVector3(304, 69, 848)), | ||
| Pair.of(new FloatVector3(304, 69, 848), new FloatVector3(304, 69, 824)), | ||
| Pair.of(new FloatVector3(304, 69, 824), new FloatVector3(316, 69, 824)), | ||
| Pair.of(new FloatVector3(316, 69, 824), new FloatVector3(316, 69, 803)), | ||
| Pair.of(new FloatVector3(316, 69, 803), new FloatVector3(314, 69, 803)), | ||
| Pair.of(new FloatVector3(314, 69, 803), new FloatVector3(314, 69, 786)), | ||
| Pair.of(new FloatVector3(314, 69, 786), new FloatVector3(313, 69, 786)), | ||
| Pair.of(new FloatVector3(313, 69, 786), new FloatVector3(313, 69, 589)), | ||
| Pair.of(new FloatVector3(313, 69, 589), new FloatVector3(195, 69, 589)) | ||
| ); | ||
| } | ||
|
|
||
| @Override | ||
| public List<Pair<FloatVector3, FloatVector3>> gangwarFacades() { | ||
| return List.of( | ||
| Pair.of(new FloatVector3(145, 69, 539), new FloatVector3(145, 69, 587)), | ||
| Pair.of(new FloatVector3(145, 69, 587), new FloatVector3(132, 69, 587)), | ||
| Pair.of(new FloatVector3(132, 69, 587), new FloatVector3(132, 69, 597)), | ||
| Pair.of(new FloatVector3(132, 69, 597), new FloatVector3(124, 69, 597)), | ||
| Pair.of(new FloatVector3(124, 69, 597), new FloatVector3(124, 69, 727)), | ||
| Pair.of(new FloatVector3(124, 69, 727), new FloatVector3(126, 69, 727)), | ||
| Pair.of(new FloatVector3(126, 69, 727), new FloatVector3(126, 69, 818)), | ||
| Pair.of(new FloatVector3(126, 69, 818), new FloatVector3(132, 69, 818)), | ||
| Pair.of(new FloatVector3(132, 69, 818), new FloatVector3(132, 69, 844)), | ||
| Pair.of(new FloatVector3(132, 69, 844), new FloatVector3(142, 69, 844)), | ||
| Pair.of(new FloatVector3(142, 69, 844), new FloatVector3(142, 69, 898)), | ||
| Pair.of(new FloatVector3(142, 69, 898), new FloatVector3(354, 69, 898)), | ||
| Pair.of(new FloatVector3(354, 69, 898), new FloatVector3(354, 69, 874)), | ||
| Pair.of(new FloatVector3(354, 69, 874), new FloatVector3(366, 69, 874)), | ||
| Pair.of(new FloatVector3(366, 69, 874), new FloatVector3(366, 69, 753)), | ||
| Pair.of(new FloatVector3(366, 69, 753), new FloatVector3(364, 69, 753)), | ||
| Pair.of(new FloatVector3(364, 69, 753), new FloatVector3(364, 69, 736)), | ||
| Pair.of(new FloatVector3(364, 69, 736), new FloatVector3(363, 69, 736)), | ||
| Pair.of(new FloatVector3(363, 69, 736), new FloatVector3(363, 69, 539)), | ||
| Pair.of(new FloatVector3(363, 69, 539), new FloatVector3(145, 69, 539)) | ||
| ); | ||
| } | ||
| } |
30 changes: 30 additions & 0 deletions
30
core/src/main/java/com/rettichlp/unicacityaddon/base/gangzones/Calderon.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| package com.rettichlp.unicacityaddon.base.gangzones; | ||
|
|
||
| import com.rettichlp.unicacityaddon.UnicacityAddon; | ||
| import com.rettichlp.unicacityaddon.base.enums.faction.Faction; | ||
| import com.rettichlp.unicacityaddon.base.registry.annotation.UCGangzone; | ||
| import net.labymod.api.util.Pair; | ||
| import net.labymod.api.util.math.vector.FloatVector3; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| /** | ||
| * @author RettichLP | ||
| */ | ||
| @UCGangzone(owner = Faction.CALDERON) | ||
| public class Calderon extends AbstractGangzone { | ||
|
|
||
| public Calderon(UnicacityAddon unicacityAddon, UCGangzone ucGangzone) { | ||
| super(unicacityAddon, ucGangzone); | ||
| } | ||
|
|
||
| @Override | ||
| public List<Pair<FloatVector3, FloatVector3>> gangzoneFacades() { | ||
| return List.of( | ||
| Pair.of(new FloatVector3(-343, 69, -149), new FloatVector3(-343, 69, -84)), | ||
| Pair.of(new FloatVector3(-343, 69, -84), new FloatVector3(-251, 69, -84)), | ||
| Pair.of(new FloatVector3(-251, 69, -84), new FloatVector3(-251, 69, -149)), | ||
| Pair.of(new FloatVector3(-251, 69, -149), new FloatVector3(-343, 69, -149)) | ||
| ); | ||
| } | ||
| } |
Oops, something went wrong.