Fix schematics menu and default options

Efnilite · Jul 16, 2022 · 15aee2d · 15aee2d
1 parent fa2caf9
commit 15aee2d
Show file tree

Hide file tree

Showing 26 changed files with 200 additions and 117 deletions.
diff --git a/images/new/engels_verdieping.docx b/images/new/engels_verdieping.docx
diff --git a/images/new/features.png b/images/new/features.png
diff --git a/images/new/fts.png b/images/new/fts.png
diff --git a/images/new/fts.svg b/images/new/fts.svg
diff --git a/images/new/hooks.png b/images/new/hooks.png
diff --git a/images/new/infinite parkour banner.pdn b/images/new/infinite parkour banner.pdn
diff --git a/images/new/infinite parkour banner.png b/images/new/infinite parkour banner.png
diff --git a/images/new/infinite parkour head template.pdn b/images/new/infinite parkour head template.pdn
diff --git a/images/new/infinite parkour lower.pdn b/images/new/infinite parkour lower.pdn
diff --git a/images/new/infinite parkour lower.png b/images/new/infinite parkour lower.png
diff --git a/images/new/reviewing.png b/images/new/reviewing.png
diff --git a/images/new/servers.png b/images/new/servers.png
diff --git a/images/new/showcase.png b/images/new/showcase.png
diff --git a/images/new/videos.png b/images/new/videos.png
diff --git a/images/new/wiki.png b/images/new/wiki.png
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>dev.efnilite</groupId>
     <artifactId>IP</artifactId>
     <packaging>pom</packaging>
-    <version>3.5.2</version>
+    <version>3.5.3</version>
     <modules>
         <module>witp</module>
     </modules>

diff --git a/witp/pom.xml b/witp/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <artifactId>IP</artifactId>
         <groupId>dev.efnilite</groupId>
-        <version>3.5.2</version>
+        <version>3.5.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>witp</artifactId>
-    <version>3.5.2</version>
+    <version>3.5.3</version>
 
     <properties>
         <maven.compiler.source>16</maven.compiler.source>

diff --git a/witp/src/main/java/dev/efnilite/ip/ParkourCommand.java b/witp/src/main/java/dev/efnilite/ip/ParkourCommand.java
@@ -164,7 +164,7 @@ public boolean execute(CommandSender sender, String[] args) {
                 }
                 case "menu" -> {
                     ParkourPlayer pp = ParkourPlayer.getPlayer(player);
-                    if (Option.OPTIONS_ENABLED.get() && pp != null) {
+                    if (Option.SETTINGS_ENABLED.get() && pp != null) {
                         pp.getGenerator().menu();
                         return true;
                     }

diff --git a/witp/src/main/java/dev/efnilite/ip/api/StyleType.java b/witp/src/main/java/dev/efnilite/ip/api/StyleType.java
@@ -69,7 +69,7 @@ public StyleType() {
     public void addConfigStyles(@NotNull String path, @NotNull FileConfiguration file) {
         List<String> list = Util.getNode(file, path, false);
 
-        if (list == null || list.isEmpty()) {
+        if (list.isEmpty()) {
             IP.logging().error("Style path " + path + " not found");
             return;
         }

diff --git a/witp/src/main/java/dev/efnilite/ip/generator/DefaultGenerator.java b/witp/src/main/java/dev/efnilite/ip/generator/DefaultGenerator.java
@@ -242,7 +242,11 @@ protected Block selectNext(Location current, int range, int dy) {
 
         // if selection angle is reduced, half the current sideways step
         if (option(GeneratorOption.REDUCE_RANDOM_BLOCK_SELECTION_ANGLE)) {
-            ds *= 0.5;
+            if (1 < ds) {
+                ds = 1;
+            } else if (ds < -1) {
+                ds = -1;
+            }
         }
 
         // delta forwards