mirrors/Iris
1
0 Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-10-27 14:30:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,035 Commits 7 Branches 126 Tags
5efb71eb3e5c5a570a68d534d577debf7fa87efa
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Julian Krings d22f49492f implement done packet into master and add safety checks for remote server version 2024-09-07 12:32:09 +02:00
Julian Krings b65b112220 Merge branch 'refs/heads/v3.4.3' into iris4 
# Conflicts:
#	build.gradle
#	core/src/main/java/com/volmit/iris/core/commands/CommandDeveloper.java
#	core/src/main/java/com/volmit/iris/core/pregenerator/methods/AsyncPregenMethod.java
#	core/src/main/java/com/volmit/iris/core/service/WandSVC.java
#	core/src/main/java/com/volmit/iris/core/tools/IrisConverter.java
#	core/src/main/java/com/volmit/iris/engine/framework/Engine.java
 2024-09-06 23:32:21 +02:00
Julian Krings c5456aa65c Merge remote-tracking branch 'origin/iris4' into iris4 2024-09-06 23:21:30 +02:00
Julian Krings 0a256eaa4c remote/cloud pregen! 2024-09-06 23:21:08 +02:00
Julian Krings c98ed48ee2 reconnect players on dimension type registry change 2024-09-06 14:58:09 +02:00
Julian Krings e101155a4c fix datapack particle rarity 2024-09-01 18:51:23 +02:00
Julian Krings 3c9bcc9bb0 add chunked cuboid iterator 2024-09-01 15:24:49 +02:00
Julian Krings 18e57e4097 add progressbar to object writing 2024-08-31 16:28:52 +02:00
Julian Krings cc584ba377 add progressbar to object saving 2024-08-31 16:01:25 +02:00
Julian Krings 0c92c20c65 ehm 2024-08-31 14:13:50 +02:00
Julian Krings ec8af56f0d woops 2024-08-28 20:30:43 +02:00
Julian Krings 79341bf562 update adventure api 2024-08-28 14:17:54 +02:00
Julian Krings 3f24d5c8e1 fix seed for structure placement 2024-08-27 15:55:02 +02:00
Julian Krings 66a1739666 v+ 2024-08-25 22:16:40 +02:00
Julian Krings 29007fdbfa fix walls not being rotated 2024-08-25 21:48:10 +02:00
Julian Krings be3e8ebd51 fix MMOItems support 2024-08-25 19:41:35 +02:00
Julian Krings 38ad345f85 potential fix for pregen deadlock 2024-08-25 19:35:49 +02:00
Julian Krings 82f71198e6 add saving headless regions after x seconds 2024-08-23 23:13:23 +02:00
Julian Krings b1e87afc93 more headless speed 2024-08-23 15:05:45 +02:00
Julian Krings 08ab82216d improve headless speed 2024-08-23 12:34:43 +02:00
Julian Krings c3ed7080dc improve headless chunk saving 2024-08-23 12:33:51 +02:00
Julian Krings 4434cf6475 add headless pregen to world creation 2024-08-22 20:31:24 +02:00
Julian Krings 386131ddf0 wait for all loaded chunks to be saved 2024-08-22 16:20:16 +02:00
Julian Krings 414f46a08d Merge remote-tracking branch 'origin/master' into v3.4.3 2024-08-21 13:09:11 +02:00
Julian Krings 2262e19cd1 fix world creation 2024-08-20 16:25:05 +02:00
Julian Krings 3af4a8f621 implement biome replacements in all bindings 2024-08-19 22:03:30 +02:00
Julian Krings 7b80eb1c06 woops 2024-08-19 20:45:06 +02:00
Julian Krings 19c6f4f2ba example 2024-08-19 20:43:30 +02:00
Julian Krings 302e02ddac Merge branch 'v3.4.3' into iris4 2024-08-18 17:06:06 +02:00
Julian Krings effb0f5b91 fix biome colors 2024-08-18 17:02:34 +02:00
Julian Krings dd98f6f07e Merge branch 'v3.4.3' into iris4 2024-08-17 19:06:31 +02:00
Julian Krings bb7bbb6379 fix legacy tile data loading from mantle 2024-08-17 19:01:27 +02:00
Julian Krings bbf42d1af0 fix headless chunk offset 2024-08-17 15:23:23 +02:00
Julian Krings 09635e12a9 woops 2024-08-17 14:04:30 +02:00
Julian Krings 888ba34eee Merge branch 'v3.4.3' into iris4 
# Conflicts:
#	core/src/main/java/com/volmit/iris/core/nms/INMSBinding.java
#	core/src/main/java/com/volmit/iris/core/nms/v1X/NMSBinding1X.java
#	core/src/main/java/com/volmit/iris/core/service/DolphinSVC.java
#	core/src/main/java/com/volmit/iris/core/service/VillageSVC.java
#	core/src/main/java/com/volmit/iris/util/mantle/MantleFlag.java
#	nms/v1_19_R1/src/main/java/com/volmit/iris/core/nms/v1_19_R1/NMSBinding.java
#	nms/v1_19_R2/src/main/java/com/volmit/iris/core/nms/v1_19_R2/NMSBinding.java
#	nms/v1_19_R3/src/main/java/com/volmit/iris/core/nms/v1_19_R3/NMSBinding.java
#	nms/v1_20_R1/src/main/java/com/volmit/iris/core/nms/v1_20_R1/NMSBinding.java
#	nms/v1_20_R2/src/main/java/com/volmit/iris/core/nms/v1_20_R2/NMSBinding.java
#	nms/v1_20_R3/src/main/java/com/volmit/iris/core/nms/v1_20_R3/NMSBinding.java
#	nms/v1_20_R4/src/main/java/com/volmit/iris/core/nms/v1_20_R4/NMSBinding.java
#	nms/v1_21_R1/src/main/java/com/volmit/iris/core/nms/v1_21_R1/NMSBinding.java
 2024-08-17 13:25:48 +02:00
Julian Krings dafca8e9db woops 2024-08-17 12:29:08 +02:00
Julian Krings 41b7aec084 Merge branch 'fix_maps' into v3.4.3 
# Conflicts:
#	core/src/main/java/com/volmit/iris/core/nms/v1X/NMSBinding1X.java
#	nms/v1_19_R1/src/main/java/com/volmit/iris/core/nms/v1_19_R1/NMSBinding.java
#	nms/v1_19_R2/src/main/java/com/volmit/iris/core/nms/v1_19_R2/NMSBinding.java
#	nms/v1_19_R3/src/main/java/com/volmit/iris/core/nms/v1_19_R3/NMSBinding.java
#	nms/v1_20_R2/src/main/java/com/volmit/iris/core/nms/v1_20_R2/NMSBinding.java
#	nms/v1_20_R3/src/main/java/com/volmit/iris/core/nms/v1_20_R3/NMSBinding.java
#	nms/v1_20_R4/src/main/java/com/volmit/iris/core/nms/v1_20_R4/NMSBinding.java
 2024-08-17 12:25:23 +02:00
Julian Krings dfe1cce6de restructure LegacyTileData 2024-08-17 11:59:28 +02:00
Julian Krings 62e98cc371 Merge branch 'master' into iris4 
# Conflicts:
#	build.gradle
#	core/src/main/java/com/volmit/iris/core/nms/INMS.java
#	core/src/main/java/com/volmit/iris/engine/IrisEngine.java
 2024-08-17 01:03:17 +02:00
Julian Krings 8fc70f42fc Merge branch 'v3.4.3' into iris4 
# Conflicts:
#	core/src/main/java/com/volmit/iris/engine/IrisEngine.java
 2024-08-17 01:00:36 +02:00
Julian Krings fc793592f7 fix old object loading 2024-08-17 00:45:58 +02:00
Julian Krings d0688782b1 fix getEngineData NullPointer 2024-08-15 18:47:27 +02:00
Julian Krings 25b41fe62c add 1.21.1 support 2024-08-15 18:42:23 +02:00
Julian Krings b468478fcb separate tile data into its own option in IrisBlockData 2024-08-15 18:00:18 +02:00
Julian Krings b6dc934198 fix getEngineData NullPointer 2024-08-15 17:12:56 +02:00
Julian Krings 344c50154a Merge branch 'v3.4.2' into iris4 
# Conflicts:
#	core/src/main/java/com/volmit/iris/core/nms/INMSBinding.java
#	core/src/main/java/com/volmit/iris/core/safeguard/ModesSFG.java
#	core/src/main/java/com/volmit/iris/core/service/WandSVC.java
#	core/src/main/java/com/volmit/iris/engine/framework/Engine.java
#	core/src/main/java/com/volmit/iris/engine/object/TileBanner.java
#	core/src/main/java/com/volmit/iris/engine/object/TileData.java
#	core/src/main/java/com/volmit/iris/engine/object/TileSign.java
#	core/src/main/java/com/volmit/iris/engine/object/TileSpawner.java
#	core/src/main/java/com/volmit/iris/engine/platform/BukkitChunkGenerator.java
#	core/src/main/java/com/volmit/iris/util/matter/TileWrapper.java
#	nms/v1_19_R1/src/main/java/com/volmit/iris/core/nms/v1_19_R1/NMSBinding.java
#	nms/v1_19_R2/src/main/java/com/volmit/iris/core/nms/v1_19_R2/NMSBinding.java
#	nms/v1_19_R3/src/main/java/com/volmit/iris/core/nms/v1_19_R3/NMSBinding.java
#	nms/v1_20_R1/src/main/java/com/volmit/iris/core/nms/v1_20_R1/NMSBinding.java
#	nms/v1_20_R2/src/main/java/com/volmit/iris/core/nms/v1_20_R2/NMSBinding.java
#	nms/v1_20_R3/src/main/java/com/volmit/iris/core/nms/v1_20_R3/NMSBinding.java
#	nms/v1_20_R4/src/main/java/com/volmit/iris/core/nms/v1_20_R4/NMSBinding.java
#	nms/v1_21_R1/src/main/java/com/volmit/iris/core/nms/v1_21_R1/NMSBinding.java
 2024-08-14 21:53:13 +02:00
Julian Krings f58078e8a0 implement dynamic tile entities 2024-08-14 20:02:08 +02:00
Julian Krings b6457e47e6 fix async tile state 2024-08-13 21:35:17 +02:00
Julian Krings d275466e1e reformat BukkitChunkGenerator::onWorldInit 2024-08-13 20:25:54 +02:00
Julian Krings f9cb107728 catch getEngineData NullPointer 2024-08-13 20:25:34 +02:00
Julian Krings 288bead792 fix stronghold locate using wrong seed 2024-08-11 12:03:47 +02:00
Julian Krings de670ddfd5 fix explorer/treasure map 2024-08-11 12:03:23 +02:00
Julian Krings 29199dc2d2 woops 2024-08-07 14:57:53 +02:00
Julian Krings 3cb5f612c6 use world name as thread id 2024-08-07 14:56:44 +02:00
Julian Krings 3b98b20f73 implement engine services and other improvements 2024-08-07 13:40:17 +02:00
Julian Krings 61410aea97 iris go brrrr 2024-08-04 16:58:36 +02:00
Julian Krings f892eb599c build headless biome cache at creation 2024-08-03 20:14:19 +02:00
Julian Krings 86f89bc718 Merge remote-tracking branch 'origin/master' into iris4 
# Conflicts:
#	core/src/main/java/com/volmit/iris/core/nms/INMSBinding.java
#	nms/v1_20_R4/src/main/java/com/volmit/iris/core/nms/v1_20_R4/NMSBinding.java
#	nms/v1_21_R1/src/main/java/com/volmit/iris/core/nms/v1_21_R1/NMSBinding.java
 2024-08-03 18:50:38 +02:00
Julian Krings ceb6c15c97 tall_seagrass isnt sticking out of water anymore 
by RePixelatedMC
 2024-08-03 18:45:44 +02:00
Julian Krings 5be19c7c3c fix nullpointer with headless 2024-08-03 18:43:21 +02:00
Julian Krings 7cf43ad7ab fix world creation 2024-08-03 18:04:37 +02:00
Julian Krings ab30710e2a make PackBenchmark startup show errors 2024-08-03 16:56:17 +02:00
Julian Krings d2ecbc5727 fix datapack dump + change target location 2024-08-03 16:55:39 +02:00
Julian Krings ab3397a373 fix pack download command 2024-08-03 15:30:56 +02:00
Julian Krings e6f829db31 Merge remote-tracking branch 'origin/master' into iris4 2024-08-03 13:31:09 +02:00
Julian Krings 8e9f78e982 fix region zoom 2024-08-03 13:03:50 +02:00
Julian Krings 488b76d1d2 add dummy datapack + fix world creation 2024-08-02 18:14:41 +02:00
Julian Krings ec9a000bcf Merge remote-tracking branch 'origin/master' into iris4 2024-07-30 12:57:34 +02:00
Julian Krings f9638e830f update NMSTools 2024-07-30 12:56:27 +02:00
Julian Krings 482fa9b11e add missing methods to 1.21 bindings 2024-07-29 18:29:28 +02:00
Julian Krings 295fe16f8f Merge remote-tracking branch 'refs/remotes/origin/v1_21' into iris4 
# Conflicts:
#	core/src/main/java/com/volmit/iris/core/commands/CommandDeveloper.java
#	core/src/main/java/com/volmit/iris/core/nms/v1X/NMSBinding1X.java
#	nms/v1_19_R1/src/main/java/com/volmit/iris/core/nms/v1_19_R1/NMSBinding.java
#	nms/v1_19_R2/src/main/java/com/volmit/iris/core/nms/v1_19_R2/NMSBinding.java
#	nms/v1_19_R3/src/main/java/com/volmit/iris/core/nms/v1_19_R3/NMSBinding.java
#	nms/v1_20_R1/src/main/java/com/volmit/iris/core/nms/v1_20_R1/NMSBinding.java
#	nms/v1_20_R2/src/main/java/com/volmit/iris/core/nms/v1_20_R2/NMSBinding.java
#	nms/v1_20_R3/src/main/java/com/volmit/iris/core/nms/v1_20_R3/NMSBinding.java
#	nms/v1_20_R4/src/main/java/com/volmit/iris/core/nms/v1_20_R4/NMSBinding.java
 2024-07-29 18:11:11 +02:00
Julian Krings cd55a7fed4 fix getBiomeColor for 1.19.2 2024-07-27 15:43:09 +02:00
Julian Krings fc890a5ba1 fix missing getBiomeColor method 2024-07-27 15:42:51 +02:00
Julian Krings 2ea54b7f2f 1.21 nms bindings 2024-07-24 19:59:01 +02:00
Julian Krings 6d104a2d1c fix y-coordinate for getting biome 2024-07-23 20:05:05 +02:00
Julian Krings 89e754245d add maxTries to IrisLootTable to prevent crash 2024-07-21 16:00:02 +02:00
Julian Krings 4c68d99c6f fix returning black color in biomes without a color override 2024-07-21 15:50:45 +02:00
Julian Krings f8f0a65f0a add debug info to the updater 2024-07-21 15:25:31 +02:00
Julian Krings 6ff74639b5 use custom nms gradle plugin 2024-07-18 17:17:05 +02:00
Julian Krings 5ad848fc54 Revert "Revert "Merge branch 'mca' into jigsaw_dist"" 
This reverts commit 55017b9a
 2024-07-09 20:24:21 +02:00
Julian Krings af80f882da add slope condition to sear/shore/surface decorators 2024-07-09 16:25:07 +02:00
Julian Krings 84ce7372c3 implement dimension zoom options 2024-07-09 16:23:32 +02:00
Julian Krings e31d39c5f7 fix worldedit selection not updating 2024-07-09 16:19:56 +02:00
Julian Krings 2296c1368b fix WorldEditLink 2024-07-09 16:19:22 +02:00
Julian Krings 88ea43fbbe fix post processing for custom blocks not applying to objects 2024-06-28 18:14:52 +02:00
Julian Krings 29526a80a9 improve custom block/item api to allow custom settings 2024-06-25 13:35:34 +02:00
Julian Krings 48f901fc8c handle null pointer 2024-06-25 13:33:44 +02:00
Julian Krings 6c3f3dc889 update oraxen api 2024-06-24 13:17:11 +02:00
Julian Krings 743410d3ee add nms method to get biome color 2024-06-24 13:16:56 +02:00
CrazyDev22 55017b9ac2 Revert "Merge branch 'mca' into jigsaw_dist" 
This reverts commit 0288d35c85, reversing
changes made to 8b3577dd0b.
 2024-06-16 14:25:47 +02:00
Julian Krings 8b3577dd0b make divisor used for generating missing jigsaw placement values changeable 2024-06-16 14:06:24 +02:00
Julian Krings e1e90f5c8a add toolchain resolver 2024-06-08 08:27:17 +02:00
CrazyDev22 c9b26ebaff add better backwards compat 2024-05-25 15:34:51 +02:00
CrazyDev22 bee1973390 fix salt not being a long 2024-05-25 15:34:25 +02:00
CrazyDev22 12556fa98f improve iris world protection 2024-05-21 16:38:28 +02:00
CrazyDev22 a967b6af85 replace datapack system with a dynamic one 2024-05-20 06:41:38 +02:00
CrazyDev22 eb19d9a846 Merge branch 'refs/heads/master' into mca 
# Conflicts:
#	build.gradle
#	core/src/main/java/com/volmit/iris/core/ServerConfigurator.java
#	core/src/main/java/com/volmit/iris/core/nms/INMSBinding.java
#	core/src/main/java/com/volmit/iris/engine/object/IrisDimension.java
 2024-05-19 20:48:13 +02:00
CrazyDev22 aee0806aa8 move datapack upgrade command under dev 2024-05-19 19:10:53 +02:00
CrazyDev22 52ec80d384 add datapack upgrade command 2024-05-19 14:40:19 +02:00
CrazyDev22 d9f8909bdc fix crash when using iris as main world 2024-05-18 23:36:03 +02:00