From 89406c475472d43f7b9544012d4909764d54f6c8 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Tue, 20 Jul 2021 02:59:49 -0400 Subject: [PATCH] Docs --- .../com/volmit/iris/engine/IrisEngine.java | 4 ++- .../util/documentation/BlockCoordinates.java | 26 +++++++++++++++++++ .../util/documentation/ChunkCoordinates.java | 26 +++++++++++++++++++ .../util/documentation/RegionCoordinates.java | 26 +++++++++++++++++++ 4 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/volmit/iris/util/documentation/BlockCoordinates.java create mode 100644 src/main/java/com/volmit/iris/util/documentation/ChunkCoordinates.java create mode 100644 src/main/java/com/volmit/iris/util/documentation/RegionCoordinates.java diff --git a/src/main/java/com/volmit/iris/engine/IrisEngine.java b/src/main/java/com/volmit/iris/engine/IrisEngine.java index bcfcf367c..9c2c26d55 100644 --- a/src/main/java/com/volmit/iris/engine/IrisEngine.java +++ b/src/main/java/com/volmit/iris/engine/IrisEngine.java @@ -26,6 +26,7 @@ import com.volmit.iris.engine.object.IrisBiomePaletteLayer; import com.volmit.iris.engine.object.IrisDecorator; import com.volmit.iris.engine.object.IrisObjectPlacement; import com.volmit.iris.engine.parallel.MultiBurst; +import com.volmit.iris.util.documentation.ChunkCoordinates; import com.volmit.iris.util.format.C; import com.volmit.iris.util.format.Form; import com.volmit.iris.util.math.RNG; @@ -158,6 +159,7 @@ public class IrisEngine extends BlockPopulator implements Engine { return z / getDimension().getTerrainZoom(); } + @ChunkCoordinates @Override public void generate(int x, int z, Hunk vblocks, Hunk vbiomes) { try { @@ -172,7 +174,7 @@ public class IrisEngine extends BlockPopulator implements Engine { getFramework().getRavineModifier().modify(x, z, vblocks); getFramework().getPostModifier().modify(x, z, vblocks); getFramework().getDecorantActuator().actuate(x, z, vblocks); - getFramework().getEngineParallax().insertParallax(x, z, vblocks); + getFramework().getEngineParallax().insertParallax(x >> 4, z >> 4, vblocks); getFramework().getDepositModifier().modify(x, z, vblocks); } case ISLANDS -> { diff --git a/src/main/java/com/volmit/iris/util/documentation/BlockCoordinates.java b/src/main/java/com/volmit/iris/util/documentation/BlockCoordinates.java new file mode 100644 index 000000000..8b59590b4 --- /dev/null +++ b/src/main/java/com/volmit/iris/util/documentation/BlockCoordinates.java @@ -0,0 +1,26 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.volmit.iris.util.documentation; + +/** + * This method expects coords in block + */ +public @interface BlockCoordinates { + +} diff --git a/src/main/java/com/volmit/iris/util/documentation/ChunkCoordinates.java b/src/main/java/com/volmit/iris/util/documentation/ChunkCoordinates.java new file mode 100644 index 000000000..59d30ea7c --- /dev/null +++ b/src/main/java/com/volmit/iris/util/documentation/ChunkCoordinates.java @@ -0,0 +1,26 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.volmit.iris.util.documentation; + +/** + * This method expects blocks in chunk coordinates + */ +public @interface ChunkCoordinates { + +} diff --git a/src/main/java/com/volmit/iris/util/documentation/RegionCoordinates.java b/src/main/java/com/volmit/iris/util/documentation/RegionCoordinates.java new file mode 100644 index 000000000..6c04a08b1 --- /dev/null +++ b/src/main/java/com/volmit/iris/util/documentation/RegionCoordinates.java @@ -0,0 +1,26 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.volmit.iris.util.documentation; + +/** + * This method expects coordinates in region coords + */ +public @interface RegionCoordinates { + +}