471 Commits

Author SHA1 Message Date
repixelatedmc
0fa9654824 20-30% performance increase 2024-08-20 19:22:36 +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
repixelatedmc
8a753b42f8 weeee 2024-08-19 20:33:26 +02:00
repixelatedmc
9144606688 Biggest 1 line fix ever 2024-08-19 19:36:35 +02:00
repixelatedmc
3f66634e5f Stash! 2024-08-19 19:35:16 +02:00
repixelatedmc
c86815f47b Every Biome is custom 2024-08-18 21:39:24 +02:00
repixelatedmc
f9d108dbb7 Merge remote-tracking branch 'origin/iris4' into iris4 2024-08-18 17:15:06 +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
repixelatedmc
f32f8744b2 Merge remote-tracking branch 'origin/iris4' into iris4 2024-08-18 12:32:03 +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
RePixelatedMC
70aa607e5b Merge remote-tracking branch 'origin/iris4' into iris4 2024-08-17 14:29:47 +02:00
Julian Krings
09635e12a9 woops 2024-08-17 14:04:30 +02:00
RePixelatedMC
7b283a56ee commit 2024-08-17 13:55:32 +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
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
repixelatedmc
13447b882c No deadlock? 2024-08-16 13:44:44 +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
RePixelatedMC
ef93bee0b9 Fixed double hotload and added a tone for hotload, 2024-08-12 22:28:27 +02:00
repixelatedmc
68ad206252 Eh yeah should do 2024-08-12 08:08:23 +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
Brian Neumann-Fopiano
a0a7b8cb3e . 2024-08-07 20:40:56 -04:00
Brian Neumann-Fopiano
ae2600227e Formatting 2024-08-07 20:08:11 -04:00
Brian Neumann-Fopiano
ab04a686e9 The Great Copyright Number 3 2024-08-07 19:47:23 -04:00
repixelatedmc
efbfad437a Decorators wont be placed above sea level when set to sea_floor 2024-08-07 16:03:21 +02:00
repixelatedmc
9bcb1845b8 magic 2024-08-07 15:29:42 +02:00
repixelatedmc
0f5364982d Merge remote-tracking branch 'origin/iris4' into iris4 2024-08-07 15:01:43 +02:00
repixelatedmc
1b0411e23a Need help on this one. 2024-08-07 15:00:10 +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
repixelatedmc
90bab2b292 Reset Region cache option. 2024-08-07 11:46:52 +02:00
repixelatedmc
8ad3cdf820 - Decos dont float anymore
- Decos dont go over fluidheight anymore
2024-08-07 11:22:55 +02:00
repixelatedmc
ca8933541a Merge remote-tracking branch 'origin/iris4' into iris4 2024-08-07 09:19:24 +02:00