From c9390330317eb1c28f953c5d0924b817d19cdc26 Mon Sep 17 00:00:00 2001 From: DanLT Date: Thu, 17 Jun 2021 19:11:23 -0800 Subject: [PATCH 1/7] Revert "Update Wrapper for g7.1 (to support j16)" This reverts commit 6d32fe743be14a2c82399bbc8f739402d82873a8. --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 69a971507..0f80bbf51 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 82161c10f85c81b80138588f63096ecc03022104 Mon Sep 17 00:00:00 2001 From: DanLT Date: Thu, 17 Jun 2021 19:11:07 -0800 Subject: [PATCH 2/7] Revert "Gradle Updates for deps" This reverts commit f2dd96c3bf689d427200881db6f1e835921e5759. --- build.gradle | 37 ++++++++++++------------------------- 1 file changed, 12 insertions(+), 25 deletions(-) diff --git a/build.gradle b/build.gradle index abcd2a5e8..cb49a8346 100644 --- a/build.gradle +++ b/build.gradle @@ -10,23 +10,12 @@ def apiVersion = '1.14' def name = 'Iris' def main = 'com.volmit.iris.Iris' -// ADD YOURSELF AS A NEW LINE IF YOU WANT YOUR OWN BUILD TASK GENERATED // ============================================================== registerCustomOutputTask('Cyberpwn', 'C://Users/cyberpwn/Documents/development/server/plugins'); -registerCustomOutputTask('ArcaneArts', 'C://Users/arcane/Documents/development/server/plugins'); // ============================================================== -def registerCustomOutputTask(name, path) { - tasks.register('build' + name, Copy) { - group('development') - outputs.upToDateWhen{false} - dependsOn ':shadowJar' - from(file('build/libs/Iris-' + version + '-all.jar')) - into(file(path)) - rename { String fileName -> - fileName.replace('Iris-' + version + '-all.jar', "Iris.jar") - } - } +configurations { + provided } processResources { @@ -41,11 +30,12 @@ processResources { } repositories { + mavenCentral() + gradlePluginPortal() maven { allowInsecureProtocol true - url "http://archive.arcane.art/repository/arcane" + url "http://archive.arcane.art/repository/arcane/" } - mavenLocal() } shadowJar @@ -66,14 +56,11 @@ dependencies { implementation 'com.github.ben-manes.caffeine:caffeine:3.0.2' implementation 'org.zeroturnaround:zt-zip:1.14' implementation 'io.papermc:paperlib:1.0.5' - - // Provided - implementation 'org.spigotmc:spigot-api:1.17-R0.1-SNAPSHOT' - implementation 'org.bukkit.craftbukkit:1.16.3:1.16.3' - implementation 'org.bukkit.craftbukkit:1.16.4:1.16.4' - implementation 'org.bukkit.craftbukkit:1.17:1.17' - implementation 'com.bergerkiller.bukkit:BKCommonLib:1.16.4-v2' - implementation 'com.sk89q.worldedit:worldedit-bukkit:7.2.0-SNAPSHOT' - implementation 'io.lumine.xikage:MythicMobs:4.9.1' - implementation 'com.google.code.gson:gson:2.8.5' + compileClasspath 'org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT' + compileClasspath 'org.bukkit.craftbukkit:1.16.3:1.16.3' + compileClasspath 'org.bukkit.craftbukkit:1.16.4:1.16.4' + compileClasspath 'com.bergerkiller.bukkit:BKCommonLib:1.16.4-v2' + compileClasspath 'com.sk89q.worldedit:worldedit-bukkit:7.2.0-SNAPSHOT' + compileClasspath 'io.lumine.xikage:MythicMobs:4.9.1' + compileClasspath 'com.google.code.gson:gson:2.8.5' } \ No newline at end of file From b6bc269505571778f9fb8f23b173d238e455bd1a Mon Sep 17 00:00:00 2001 From: StrangeOne101 Date: Sat, 19 Jun 2021 19:34:46 +1200 Subject: [PATCH 3/7] Fixes - Fixed NPE occuring when Jigsaw fails to find Object in pool. Now just produces a warning in the console like it should - Fixed pointless copies of lists being created within PlannedStructure - Fixed mobs spawning within other blocks and suffocating on spawn - Fixed creating a jigsaw with a non existent object causing jigsaw commands to lock up (#377) - Fixed editing a non existent jigsaw just not doing anything --- .../iris/manager/command/jigsaw/CommandIrisJigsawEdit.java | 3 +++ .../iris/manager/command/jigsaw/CommandIrisJigsawNew.java | 6 ++++++ .../com/volmit/iris/object/IrisEntityInitialSpawn.java | 2 +- .../com/volmit/iris/scaffold/jigsaw/PlannedStructure.java | 7 +++---- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsawEdit.java b/src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsawEdit.java index 579a65683..2bcc14ca7 100644 --- a/src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsawEdit.java +++ b/src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsawEdit.java @@ -53,8 +53,11 @@ public class CommandIrisJigsawEdit extends MortarCommand { File dest = piece.getLoadFile(); new JigsawEditor(sender.player(), piece, IrisDataManager.loadAnyObject(piece.getObject()), dest); + return true; } + sender.sendMessage("Failed to find existing jigsaw piece: " + args[0]); + return true; } diff --git a/src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsawNew.java b/src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsawNew.java index 49e90f8a5..04424cd60 100644 --- a/src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsawNew.java +++ b/src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsawNew.java @@ -48,6 +48,12 @@ public class CommandIrisJigsawNew extends MortarCommand } IrisObject object = IrisDataManager.loadAnyObject(args[2]); + + if (object == null) { + sender.sendMessage("Failed to find existing object: " + args[2]); + return true; + } + File dest = Iris.instance.getDataFile("packs", args[1], "jigsaw-pieces", args[0] + ".json"); new JigsawEditor(sender.player(), null, object, dest); sender.sendMessage("* Right Click blocks to make them connectors"); diff --git a/src/main/java/com/volmit/iris/object/IrisEntityInitialSpawn.java b/src/main/java/com/volmit/iris/object/IrisEntityInitialSpawn.java index 0a4418ef5..bc9a44d02 100644 --- a/src/main/java/com/volmit/iris/object/IrisEntityInitialSpawn.java +++ b/src/main/java/com/volmit/iris/object/IrisEntityInitialSpawn.java @@ -80,6 +80,6 @@ public class IrisEntityInitialSpawn private Entity spawn100(Engine g, Location at) { - return getRealEntity(g).spawn(g, at.clone().add(0, 1, 0), rng.aquire(() -> new RNG(g.getTarget().getWorld().getSeed() + 4))); + return getRealEntity(g).spawn(g, at.clone().add(0.5, 1, 0.5), rng.aquire(() -> new RNG(g.getTarget().getWorld().getSeed() + 4))); } } diff --git a/src/main/java/com/volmit/iris/scaffold/jigsaw/PlannedStructure.java b/src/main/java/com/volmit/iris/scaffold/jigsaw/PlannedStructure.java index 35ca00087..350797d0c 100644 --- a/src/main/java/com/volmit/iris/scaffold/jigsaw/PlannedStructure.java +++ b/src/main/java/com/volmit/iris/scaffold/jigsaw/PlannedStructure.java @@ -179,7 +179,7 @@ public class PlannedStructure { } private void generateOutwards() { - for(PlannedPiece i : getPiecesWithAvailableConnectors().shuffleCopy(rng)) + for(PlannedPiece i : getPiecesWithAvailableConnectors().shuffle(rng)) { if(!generatePieceOutwards(i)) { @@ -317,7 +317,7 @@ public class PlannedStructure { { IrisJigsawPiece pi = getData().getJigsawPieceLoader().load(j); - if(terminating && !pi.isTerminal()) + if (pi == null || (terminating && !pi.isTerminal())) { continue; } @@ -325,8 +325,7 @@ public class PlannedStructure { p.addIfMissing(pi); } } - - return p.shuffleCopy(rng); + return p.shuffle(rng); } private void generateStartPiece() { From 9644693de31e89cdf9088b06b5ee6c1926b848b1 Mon Sep 17 00:00:00 2001 From: StrangeOne101 Date: Sat, 19 Jun 2021 22:49:32 +1200 Subject: [PATCH 4/7] More fixes - Fixed Jigsaws not placing TileStates - Fixed NPE when banners, signs or skulls try to be rotated to be up or down --- .../java/com/volmit/iris/object/IrisObjectRotation.java | 4 +++- .../java/com/volmit/iris/scaffold/jigsaw/PlannedPiece.java | 7 +++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/volmit/iris/object/IrisObjectRotation.java b/src/main/java/com/volmit/iris/object/IrisObjectRotation.java index cdb9a7fed..9c3ca17c9 100644 --- a/src/main/java/com/volmit/iris/object/IrisObjectRotation.java +++ b/src/main/java/com/volmit/iris/object/IrisObjectRotation.java @@ -245,7 +245,9 @@ public class IrisObjectRotation BlockVector bv = new BlockVector(f.getModX(), f.getModY(), f.getModZ()); bv = rotate(bv.clone(), spinx, spiny, spinz); BlockFace t = getFace(bv); - g.setRotation(t); + if (t.getModY() == 0) { + g.setRotation(t); + } } else if(d instanceof Orientable) diff --git a/src/main/java/com/volmit/iris/scaffold/jigsaw/PlannedPiece.java b/src/main/java/com/volmit/iris/scaffold/jigsaw/PlannedPiece.java index b6b538782..0694d7e0a 100644 --- a/src/main/java/com/volmit/iris/scaffold/jigsaw/PlannedPiece.java +++ b/src/main/java/com/volmit/iris/scaffold/jigsaw/PlannedPiece.java @@ -9,6 +9,7 @@ import com.volmit.iris.util.KList; import com.volmit.iris.util.RNG; import lombok.Data; import org.bukkit.World; +import org.bukkit.block.BlockState; import org.bukkit.block.TileState; import org.bukkit.block.data.BlockData; import org.bukkit.util.BlockVector; @@ -163,7 +164,7 @@ public class PlannedPiece { @Override public boolean isSolid(int x, int y, int z) { - return false; + return world.getBlockAt(x,y,z).getType().isSolid(); } @Override @@ -183,7 +184,9 @@ public class PlannedPiece { @Override public void setTile(int xx, int yy, int zz, TileData tile) { - + BlockState state = world.getBlockAt(xx,yy,zz).getState(); + tile.toBukkitTry(state); + state.update(); } }, piece.getPlacementOptions(), new RNG(), getData()); } From 7370af008479cfd6987f7efe17327e43916d79f5 Mon Sep 17 00:00:00 2001 From: StrangeOne101 Date: Mon, 21 Jun 2021 04:40:05 +1200 Subject: [PATCH 5/7] Re-added /iris std generator Re-added the studio generator command. Fixed it up a bit (stopped random jitters that occurred) --- .../command/studio/CommandIrisStudio.java | 3 + .../CommandIrisStudioExplorerGenerator.java | 48 ++++++------- .../iris/manager/gui/NoiseExplorer.java | 69 ++++++------------- 3 files changed, 44 insertions(+), 76 deletions(-) diff --git a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudio.java b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudio.java index 159a0aa23..c193d3b6d 100644 --- a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudio.java +++ b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudio.java @@ -42,6 +42,9 @@ public class CommandIrisStudio extends MortarCommand @Command private CommandIrisStudioExplorer exp; + @Command + private CommandIrisStudioExplorerGenerator generator; + @Command private CommandIrisStudioLoot loot; diff --git a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioExplorerGenerator.java b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioExplorerGenerator.java index dfd93f7f2..98b955d89 100644 --- a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioExplorerGenerator.java +++ b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioExplorerGenerator.java @@ -2,6 +2,7 @@ package com.volmit.iris.manager.command.studio; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; +import com.volmit.iris.manager.IrisDataManager; import com.volmit.iris.manager.gui.NoiseExplorer; import com.volmit.iris.object.IrisGenerator; import com.volmit.iris.util.KList; @@ -14,7 +15,7 @@ public class CommandIrisStudioExplorerGenerator extends MortarCommand public CommandIrisStudioExplorerGenerator() { super("generator", "gen", "g"); - setDescription("Explore different generators"); + setDescription("Preview created noise noises generators"); requiresPermission(Iris.perm.studio); setCategory("World"); } @@ -39,38 +40,31 @@ public class CommandIrisStudioExplorerGenerator extends MortarCommand return true; } - if(!Iris.proj.isProjectOpen()) - { - sender.sendMessage("No project is open"); - return true; - } + IrisGenerator generator; + long seed = 12345; - if(args.length == 0) + if (Iris.proj.isProjectOpen()) { - sender.sendMessage("Provide a generator name"); - return true; + generator = Iris.proj.getActiveProject().getActiveProvider().getData().getGeneratorLoader().load(args[0]); + seed = Iris.proj.getActiveProject().getActiveProvider().getTarget().getWorld().getSeed(); } - else { - String g = args[0]; - IrisGenerator b = Iris.proj.getActiveProject().getActiveProvider().getData().getGeneratorLoader().load(g); + generator = IrisDataManager.loadAnyGenerator(args[0]); + } - if(b != null) - { - NoiseExplorer.launch((x, z) -> - { - return b.getHeight(x, z, new RNG(Iris.proj.getActiveProject().getActiveProvider().getTarget().getWorld().getSeed()).nextParallelRNG(3245).lmax()); - }, "Gen: " + b.getLoadKey()); + if (generator != null) + { + long finalSeed = seed; + NoiseExplorer.launch((x, z) -> + generator.getHeight(x, z, new RNG(finalSeed).nextParallelRNG(3245).lmax()), "Gen: " + generator.getLoadKey()); - sender.sendMessage("Opening Noise Explorer for gen " + b.getLoadKey()); - return true; - } - - else - { - sender.sendMessage("Invalid Generator"); - } + sender.sendMessage("Opening Noise Explorer for gen " + generator.getLoadKey() + " (" + generator.getLoader().getDataFolder().getName() + ")"); + return true; + } + else + { + sender.sendMessage("Invalid Generator"); } return true; @@ -79,6 +73,6 @@ public class CommandIrisStudioExplorerGenerator extends MortarCommand @Override protected String getArgsUsage() { - return ""; + return "[generator]"; } } diff --git a/src/main/java/com/volmit/iris/manager/gui/NoiseExplorer.java b/src/main/java/com/volmit/iris/manager/gui/NoiseExplorer.java index 8da6adac6..958e3c6b0 100644 --- a/src/main/java/com/volmit/iris/manager/gui/NoiseExplorer.java +++ b/src/main/java/com/volmit/iris/manager/gui/NoiseExplorer.java @@ -3,12 +3,11 @@ package com.volmit.iris.manager.gui; import java.awt.Color; import java.awt.Dimension; import java.awt.EventQueue; +import java.awt.Font; import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.Point; import java.awt.Rectangle; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.MouseMotionListener; @@ -48,7 +47,7 @@ public class NoiseExplorer extends JPanel implements MouseWheelListener boolean colorMode = true; double scale = 1; static boolean hd = false; - static double ascale = 10; + static double ascale = 1; CNG cng = NoiseStyle.STATIC.create(new RNG(RNG.r.nextLong())); GroupedExecutor gx = new GroupedExecutor(Runtime.getRuntime().availableProcessors(), Thread.MAX_PRIORITY, "Iris Renderer"); ReentrantLock l = new ReentrantLock(); @@ -58,22 +57,21 @@ public class NoiseExplorer extends JPanel implements MouseWheelListener static Function2 generator; static double oxp = 0; static double ozp = 0; - double ox = 0; - double oz = 0; + double ox = 0; //Offset X + double oz = 0; //Offset Y double mx = 0; double mz = 0; static double mxx = 0; static double mzz = 0; static boolean down = false; - double lx = Double.MAX_VALUE; - double lz = Double.MAX_VALUE; - double tz = 1D; - double t = 1D; + double lx = Double.MAX_VALUE; //MouseX + double lz = Double.MAX_VALUE; //MouseY + int accuracy = 6; public NoiseExplorer() { - addMouseWheelListener((MouseWheelListener) this); + addMouseWheelListener(this); addMouseMotionListener(new MouseMotionListener() { @Override @@ -105,7 +103,8 @@ public class NoiseExplorer extends JPanel implements MouseWheelListener int notches = e.getWheelRotation(); if(e.isControlDown()) { - t = t + ((0.0025 * t) * notches); + accuracy += notches > 0 ? 1 : -1; + if (accuracy < 3) accuracy = 3; //This limit is in place because the render lag of the GUI becomes immense when lower than 3 return; } @@ -126,16 +125,6 @@ public class NoiseExplorer extends JPanel implements MouseWheelListener ascale += Math.abs(ascale - scale) * 0.16; } - if(t < tz) - { - tz -= Math.abs(t - tz) * 0.29; - } - - if(t > tz) - { - tz += Math.abs(tz - t) * 0.29; - } - if(ox < oxp) { oxp -= Math.abs(ox - oxp) * 0.16; @@ -177,8 +166,7 @@ public class NoiseExplorer extends JPanel implements MouseWheelListener } PrecisionStopwatch p = PrecisionStopwatch.start(); - int accuracy = hd ? 1 : M.clip((r.getAverage() / 6D), 1D, 128D).intValue(); - accuracy = down ? accuracy * 4 : accuracy; + int accuracy = hd ? 1 : this.accuracy; int v = 1000; if(g instanceof Graphics2D) @@ -206,7 +194,7 @@ public class NoiseExplorer extends JPanel implements MouseWheelListener int zz = z; gx.queue("a", () -> { - double n = generator != null ? generator.apply(Double.valueOf((xx * ascale) + oxp), Double.valueOf((zz * ascale) + ozp)) : cng.noise((xx * ascale) + oxp, tz, (zz * ascale) + ozp); + double n = generator != null ? generator.apply((xx * ascale) + oxp, (zz * ascale) + ozp) : cng.noise((xx * ascale) + oxp, 100, (zz * ascale) + ozp); if(n > 1 || n < 0) { @@ -239,7 +227,6 @@ public class NoiseExplorer extends JPanel implements MouseWheelListener p.end(); - t += 1D; r.put(p.getMilliseconds()); if(!isVisible()) @@ -283,7 +270,7 @@ public class NoiseExplorer extends JPanel implements MouseWheelListener frame.setIconImage(ImageIO.read(file)); } - catch(IOException e) + catch(IOException ignored) { } @@ -301,15 +288,11 @@ public class NoiseExplorer extends JPanel implements MouseWheelListener combo = new JComboBox(li.toArray(new String[li.size()])); combo.setSelectedItem("STATIC"); combo.setFocusable(false); - combo.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent e) - { - @SuppressWarnings("unchecked") - String b = (String) (((JComboBox) e.getSource()).getSelectedItem()); - NoiseStyle s = NoiseStyle.valueOf(b); - nv.cng = s.create(RNG.r.nextParallelRNG(RNG.r.imax())); - } + combo.addActionListener( e -> { + @SuppressWarnings("unchecked") + String b = (String) (((JComboBox) e.getSource()).getSelectedItem()); + NoiseStyle s = NoiseStyle.valueOf(b); + nv.cng = s.create(RNG.r.nextParallelRNG(RNG.r.imax())); }); combo.setSize(500, 30); @@ -338,24 +321,12 @@ public class NoiseExplorer extends JPanel implements MouseWheelListener public static void launch(Function2 gen, String genName) { - EventQueue.invokeLater(new Runnable() - { - public void run() - { - createAndShowGUI(gen, genName); - } - }); + EventQueue.invokeLater(() -> createAndShowGUI(gen, genName)); } public static void launch() { - EventQueue.invokeLater(new Runnable() - { - public void run() - { - createAndShowGUI(); - } - }); + EventQueue.invokeLater(() -> createAndShowGUI()); } static class HandScrollListener extends MouseAdapter From 900510e7f240aef6dc2408caf7d462ed248d25d2 Mon Sep 17 00:00:00 2001 From: StrangeOne101 Date: Tue, 22 Jun 2021 12:51:44 +1200 Subject: [PATCH 6/7] Reverted accuracy changes to noise generator - Also fixed some overlooked issues --- .../CommandIrisStudioExplorerGenerator.java | 6 +++ .../iris/manager/gui/NoiseExplorer.java | 48 ++++++++++--------- 2 files changed, 32 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioExplorerGenerator.java b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioExplorerGenerator.java index 98b955d89..6ea191336 100644 --- a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioExplorerGenerator.java +++ b/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioExplorerGenerator.java @@ -40,6 +40,12 @@ public class CommandIrisStudioExplorerGenerator extends MortarCommand return true; } + if (args.length == 0) + { + sender.sendMessage("Specify a generator to preview"); + return true; + } + IrisGenerator generator; long seed = 12345; diff --git a/src/main/java/com/volmit/iris/manager/gui/NoiseExplorer.java b/src/main/java/com/volmit/iris/manager/gui/NoiseExplorer.java index 958e3c6b0..21e14897e 100644 --- a/src/main/java/com/volmit/iris/manager/gui/NoiseExplorer.java +++ b/src/main/java/com/volmit/iris/manager/gui/NoiseExplorer.java @@ -3,11 +3,12 @@ package com.volmit.iris.manager.gui; import java.awt.Color; import java.awt.Dimension; import java.awt.EventQueue; -import java.awt.Font; import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.Point; import java.awt.Rectangle; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.MouseMotionListener; @@ -47,14 +48,14 @@ public class NoiseExplorer extends JPanel implements MouseWheelListener boolean colorMode = true; double scale = 1; static boolean hd = false; - static double ascale = 1; + static double ascale = 10; CNG cng = NoiseStyle.STATIC.create(new RNG(RNG.r.nextLong())); GroupedExecutor gx = new GroupedExecutor(Runtime.getRuntime().availableProcessors(), Thread.MAX_PRIORITY, "Iris Renderer"); ReentrantLock l = new ReentrantLock(); int[][] co; int w = 0; int h = 0; - static Function2 generator; + Function2 generator; static double oxp = 0; static double ozp = 0; double ox = 0; //Offset X @@ -64,10 +65,10 @@ public class NoiseExplorer extends JPanel implements MouseWheelListener static double mxx = 0; static double mzz = 0; static boolean down = false; - double lx = Double.MAX_VALUE; //MouseX double lz = Double.MAX_VALUE; //MouseY - int accuracy = 6; + double t; + double tz; public NoiseExplorer() { @@ -103,13 +104,12 @@ public class NoiseExplorer extends JPanel implements MouseWheelListener int notches = e.getWheelRotation(); if(e.isControlDown()) { - accuracy += notches > 0 ? 1 : -1; - if (accuracy < 3) accuracy = 3; //This limit is in place because the render lag of the GUI becomes immense when lower than 3 + t = t + ((0.0025 * t) * notches); return; } scale = scale + ((0.044 * scale) * notches); - scale = scale < 0.00001 ? 0.00001 : scale; + scale = Math.max(scale, 0.00001); } @Override @@ -125,6 +125,16 @@ public class NoiseExplorer extends JPanel implements MouseWheelListener ascale += Math.abs(ascale - scale) * 0.16; } + if(t < tz) + { + tz -= Math.abs(t - tz) * 0.29; + } + + if(t > tz) + { + tz += Math.abs(tz - t) * 0.29; + } + if(ox < oxp) { oxp -= Math.abs(ox - oxp) * 0.16; @@ -166,7 +176,8 @@ public class NoiseExplorer extends JPanel implements MouseWheelListener } PrecisionStopwatch p = PrecisionStopwatch.start(); - int accuracy = hd ? 1 : this.accuracy; + int accuracy = hd ? 1 : M.clip((r.getAverage() / 6D), 1D, 128D).intValue(); + accuracy = down ? accuracy * 4 : accuracy; int v = 1000; if(g instanceof Graphics2D) @@ -194,7 +205,7 @@ public class NoiseExplorer extends JPanel implements MouseWheelListener int zz = z; gx.queue("a", () -> { - double n = generator != null ? generator.apply((xx * ascale) + oxp, (zz * ascale) + ozp) : cng.noise((xx * ascale) + oxp, 100, (zz * ascale) + ozp); + double n = generator != null ? generator.apply((xx * ascale) + oxp, (zz * ascale) + ozp) : cng.noise((xx * ascale) + oxp, tz, (zz * ascale) + ozp); if(n > 1 || n < 0) { @@ -227,6 +238,7 @@ public class NoiseExplorer extends JPanel implements MouseWheelListener p.end(); + t += 1D; r.put(p.getMilliseconds()); if(!isVisible()) @@ -259,7 +271,7 @@ public class NoiseExplorer extends JPanel implements MouseWheelListener JLayeredPane pane = new JLayeredPane(); nv.setSize(new Dimension(1440, 820)); pane.add(nv, 1, 0); - NoiseExplorer.generator = gen; + nv.generator = gen; frame.add(pane); File file = Iris.getCached("Iris Icon", "https://raw.githubusercontent.com/VolmitSoftware/Iris/master/icon.png"); @@ -269,11 +281,7 @@ public class NoiseExplorer extends JPanel implements MouseWheelListener { frame.setIconImage(ImageIO.read(file)); } - - catch(IOException ignored) - { - - } + catch(IOException ignored) { } } frame.setSize(1440, 820); frame.setVisible(true); @@ -288,7 +296,7 @@ public class NoiseExplorer extends JPanel implements MouseWheelListener combo = new JComboBox(li.toArray(new String[li.size()])); combo.setSelectedItem("STATIC"); combo.setFocusable(false); - combo.addActionListener( e -> { + combo.addActionListener(e -> { @SuppressWarnings("unchecked") String b = (String) (((JComboBox) e.getSource()).getSelectedItem()); NoiseStyle s = NoiseStyle.valueOf(b); @@ -309,11 +317,7 @@ public class NoiseExplorer extends JPanel implements MouseWheelListener { frame.setIconImage(ImageIO.read(file)); } - - catch(IOException e) - { - - } + catch(IOException ignored) { } } frame.setSize(1440, 820); frame.setVisible(true); From d6ddb2b247f79c94db533239067f7860938fd2ad Mon Sep 17 00:00:00 2001 From: StrangeOne101 Date: Tue, 22 Jun 2021 17:34:21 +1200 Subject: [PATCH 7/7] Fixes Season 2 - Fixed double sided connectors not working properly - Fixed skulls not being able to be rotated when they are placed on an angle that isn't perfectly straight (north, south, east, west) --- .../iris/object/IrisObjectRotation.java | 47 +++++++++++++++++-- .../iris/scaffold/jigsaw/PlannedPiece.java | 11 ++--- 2 files changed, 45 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/volmit/iris/object/IrisObjectRotation.java b/src/main/java/com/volmit/iris/object/IrisObjectRotation.java index 9c3ca17c9..404ba1051 100644 --- a/src/main/java/com/volmit/iris/object/IrisObjectRotation.java +++ b/src/main/java/com/volmit/iris/object/IrisObjectRotation.java @@ -157,6 +157,42 @@ public class IrisObjectRotation return BlockFace.SOUTH; } + public BlockFace getHexFace(BlockVector v) + { + int x = v.getBlockX(); + int y = v.getBlockY(); + int z = v.getBlockZ(); + + if(x == 0 && z == -1) return BlockFace.NORTH; + if(x == 1 && z == -2) return BlockFace.NORTH_NORTH_EAST; + if(x == 1 && z == -1) return BlockFace.NORTH_EAST; + if(x == 2 && z == -1) return BlockFace.EAST_NORTH_EAST; + if(x == 1 && z == 0) return BlockFace.EAST; + if(x == 2 && z == 1) return BlockFace.EAST_SOUTH_EAST; + if(x == 1 && z == 1) return BlockFace.SOUTH_EAST; + if(x == 1 && z == 2) return BlockFace.SOUTH_SOUTH_EAST; + if(x == 0 && z == 1) return BlockFace.SOUTH; + if(x == -1 && z == 2) return BlockFace.SOUTH_SOUTH_WEST; + if(x == -1 && z == 1) return BlockFace.SOUTH_WEST; + if(x == -2 && z == 1) return BlockFace.WEST_SOUTH_WEST; + if(x == -1 && z == 0) return BlockFace.WEST; + if(x == -2 && z == -1) return BlockFace.WEST_NORTH_WEST; + if(x == -1 && z == -1) return BlockFace.NORTH_WEST; + if(x == -1 && z == -2) return BlockFace.NORTH_NORTH_WEST; + + if(y > 0) + { + return BlockFace.UP; + } + + if(y < 0) + { + return BlockFace.DOWN; + } + + return BlockFace.SOUTH; + } + public BlockFace faceForAxis(Axis axis) { switch(axis) @@ -242,12 +278,13 @@ public class IrisObjectRotation { Rotatable g = ((Rotatable) d); BlockFace f = g.getRotation(); - BlockVector bv = new BlockVector(f.getModX(), f.getModY(), f.getModZ()); + + BlockVector bv = new BlockVector(f.getModX(), 0, f.getModZ()); bv = rotate(bv.clone(), spinx, spiny, spinz); - BlockFace t = getFace(bv); - if (t.getModY() == 0) { - g.setRotation(t); - } + BlockFace face = getHexFace(bv); + + g.setRotation(face); + } else if(d instanceof Orientable) diff --git a/src/main/java/com/volmit/iris/scaffold/jigsaw/PlannedPiece.java b/src/main/java/com/volmit/iris/scaffold/jigsaw/PlannedPiece.java index 0694d7e0a..19420afa0 100644 --- a/src/main/java/com/volmit/iris/scaffold/jigsaw/PlannedPiece.java +++ b/src/main/java/com/volmit/iris/scaffold/jigsaw/PlannedPiece.java @@ -21,7 +21,7 @@ public class PlannedPiece { private IrisJigsawPiece piece; private IrisObjectRotation rotation; private IrisDataManager data; - private KList connected; + private KList connected; private boolean dead = false; private int rotationKey; private AxisAlignedBB box; @@ -95,7 +95,7 @@ public class PlannedPiece { for(IrisJigsawPieceConnector i : piece.getConnectors()) { - if(!connected.contains(i.getPosition())) + if(!connected.contains(i)) { c.add(i); } @@ -108,17 +108,12 @@ public class PlannedPiece { { if(piece.getConnectors().contains(c)) { - return connect(c.getPosition()); + return connected.addIfMissing(c); } return false; } - private boolean connect(IrisPosition p) - { - return connected.addIfMissing(p); - } - public IrisPosition getWorldPosition(IrisJigsawPieceConnector c) { return getWorldPosition(c.getPosition());