-
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.
- Loading branch information
1 parent
aa6779f
commit 50ab18c
Showing
13 changed files
with
466 additions
and
142 deletions.
There are no files selected for viewing
1 change: 1 addition & 0 deletions
1
src/main/java/com/github/kristianvld/angeltrophies/CommandHandler.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
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
15 changes: 15 additions & 0 deletions
15
src/main/java/com/github/kristianvld/angeltrophies/couch/CouchRole.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,15 @@ | ||
| package com.github.kristianvld.angeltrophies.couch; | ||
|
|
||
| public enum CouchRole { | ||
|
|
||
| Single, RightEnd, LeftEnd, Middle, InnerCorner, OuterCorner; | ||
|
|
||
| public static CouchRole parse(String name) { | ||
| for (CouchRole role : values()) { | ||
| if (role.name().equalsIgnoreCase(name)) { | ||
| return role; | ||
| } | ||
| } | ||
| return null; | ||
| } | ||
| } |
108 changes: 108 additions & 0 deletions
108
src/main/java/com/github/kristianvld/angeltrophies/couch/CouchUtil.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,108 @@ | ||
| package com.github.kristianvld.angeltrophies.couch; | ||
|
|
||
| import com.github.kristianvld.angeltrophies.Main; | ||
| import com.github.kristianvld.angeltrophies.trophy.Trophy; | ||
| import com.github.kristianvld.angeltrophies.util.Pair; | ||
| import org.bukkit.block.Block; | ||
| import org.bukkit.entity.Entity; | ||
| import org.bukkit.util.BlockVector; | ||
|
|
||
| import java.util.Collection; | ||
| import java.util.HashMap; | ||
| import java.util.HashSet; | ||
| import java.util.Map; | ||
| import java.util.Set; | ||
|
|
||
| public class CouchUtil { | ||
|
|
||
| private static final Map<Pair<String, CouchRole>, Trophy> trophies = new HashMap<>(); | ||
|
|
||
| public static void buildCache(Collection<Trophy> trophies) { | ||
| Set<String> groups = new HashSet<>(); | ||
| for (Trophy t : trophies) { | ||
| if (t.getCouchRole() != null) { | ||
| Pair key = new Pair(t.getCouchGroup(), t.getCouchRole()); | ||
| if (CouchUtil.trophies.containsKey(key)) { | ||
| throw new IllegalArgumentException("The couch part " + t.getCouchGroup() + ":" + t.getCouchRole() + " has been defined twice for the items " + CouchUtil.trophies.get(key).getName() + " and " + t.getName()); | ||
| } | ||
| CouchUtil.trophies.put(key, t); | ||
| Main.getInstance().getLogger().info("Loaded couch part " + t.getName() + ", group: " + t.getCouchGroup() + ", role: " + t.getCouchRole()); | ||
| groups.add(t.getCouchGroup()); | ||
| } | ||
| } | ||
|
|
||
| for (String group : groups) { | ||
| Trophy single = CouchUtil.trophies.get(new Pair(group, CouchRole.Single)); | ||
| if (single == null) { | ||
| throw new IllegalStateException("Couch group '" + group + "' is missing default role Single!"); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| public static Trophy getTrophy(String couchGroup, CouchRole couchRole) { | ||
| return trophies.get(new Pair(couchGroup, couchRole)); | ||
| } | ||
|
|
||
| private static BlockVector yawToVector(float yaw) { | ||
| int x = (int) Math.round(-1 * Math.sin(Math.toRadians(yaw))); | ||
| int z = (int) Math.round(1 * Math.cos(Math.toRadians(yaw))); | ||
| return new BlockVector(x, 0, z); | ||
| } | ||
|
|
||
| private static Entity getRelative(Block block, float yaw, String group) { | ||
| BlockVector dir = yawToVector(yaw); | ||
| Entity trophy = Trophy.getTrophy(block.getRelative(dir.getBlockX(), 0, dir.getBlockZ())); | ||
| String id = Trophy.getCouchGroupID(trophy); | ||
| if (group.equals(id)) { | ||
| return trophy; | ||
| } | ||
| return null; | ||
| } | ||
|
|
||
| public static Trophy getTrophy(Trophy trophy, Block block, float yaw) { | ||
| if (trophy.getCouchRole() == null) { | ||
| return trophy; | ||
| } | ||
| String group = trophy.getCouchGroup(); | ||
|
|
||
| yaw = Math.round(yaw / 90) * 90; | ||
| Entity back = getRelative(block, yaw, group); | ||
| yaw += 90; | ||
| Entity left = getRelative(block, yaw, group); | ||
| yaw += 90; | ||
| Entity forward = getRelative(block, yaw, group); | ||
| yaw += 90; | ||
| Entity right = getRelative(block, yaw, group); | ||
|
|
||
| CouchRole role = CouchRole.Single; | ||
|
|
||
| if (left != null) { | ||
| if (trophies.containsKey(new Pair(group, CouchRole.LeftEnd))) { | ||
| role = CouchRole.LeftEnd; | ||
| } | ||
| if (forward != null) { | ||
| if (trophies.containsKey(new Pair(group, CouchRole.InnerCorner))) { | ||
| role = CouchRole.InnerCorner; | ||
| } | ||
| } else if (right != null) { | ||
| if (trophies.containsKey(new Pair(group, CouchRole.Middle))) { | ||
| role = CouchRole.Middle; | ||
| } | ||
| } else if (back != null) { | ||
| if (trophies.containsKey(new Pair(group, CouchRole.OuterCorner))) { | ||
| role = CouchRole.OuterCorner; | ||
| } | ||
| } | ||
| } else if (right != null) { | ||
| if (trophies.containsKey(new Pair(group, CouchRole.LeftEnd))) { | ||
| role = CouchRole.RightEnd; | ||
| } | ||
| } | ||
|
|
||
| if (role == CouchRole.Single) { | ||
| return trophy; | ||
| } | ||
| return trophies.get(new Pair(group, role)); | ||
| } | ||
|
|
||
| } |
3 changes: 2 additions & 1 deletion
3
...ithub/kristianvld/angeltrophies/Skin.java → .../kristianvld/angeltrophies/skin/Skin.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
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
Oops, something went wrong.