mirror of
https://github.com/VolmitSoftware/Iris.git
synced 2026-02-16 10:30:53 +00:00
Forcefully shove stuff into other stuff
This commit is contained in:
Daniel Mills
2286
lint/ChangeLog.txt
2286
lint/ChangeLog.txt
File diff suppressed because it is too large
Load Diff
@@ -73,7 +73,7 @@
|
||||
<field old="IS_JDK14 Z" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<field old="inheritableThreadLocal Ljava/lang/InheritableThreadLocal;" new="H"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.gen.TerrainChunkGenerator" new="com.volmit.iris.gen.TerrainChunkGenerator">
|
||||
<class old="com.volmit.iris.generator.TerrainChunkGenerator" new="com.volmit.iris.generator.TerrainChunkGenerator">
|
||||
<method old="canEqual(Ljava/lang/Object;)Z" new="ALLATORIxDEMOxanyValidIdentifierName" s="43" e="43"/>
|
||||
<method old="canSpawn(Lorg/bukkit/World;II)Z" new="canSpawn"/>
|
||||
<method old="caveFloors(II)Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
@@ -275,7 +275,7 @@
|
||||
<field old="ticks I" new="j"/>
|
||||
<field old="world Lorg/bukkit/World;" new="A"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.gui.NoiseView$HandScrollListener" new="com.volmit.iris.gui.NoiseView$HandScrollListener">
|
||||
<class old="com.volmit.iris.manager.gui.NoiseView$HandScrollListener" new="com.volmit.iris.manager.gui.NoiseView$HandScrollListener">
|
||||
<method old="mouseDragged(Ljava/awt/event/MouseEvent;)V" new="mouseDragged" s="307" e="315"/>
|
||||
<method old="mousePressed(Ljava/awt/event/MouseEvent;)V" new="mousePressed" s="319" e="320"/>
|
||||
<field old="pp Ljava/awt/Point;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
@@ -580,14 +580,14 @@
|
||||
<method old="sinCenter(D)D" new="ALLATORIxDEMOxanyValidIdentifierName" s="35" e="35"/>
|
||||
<method old="trilerp(DDDDDDDDDDD)D" new="ALLATORIxDEMOxanyValidIdentifierName" s="224" e="226"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.noise.WhiteNoise" new="com.volmit.iris.noise.WhiteNoise">
|
||||
<class old="com.volmit.iris.generator.noise.WhiteNoise" new="com.volmit.iris.generator.noise.WhiteNoise">
|
||||
<method old="f(D)D" new="hashCode" s="14" e="14"/>
|
||||
<method old="noise(D)D" new="ALLATORIxDEMOxanyValidIdentifierName" s="20" e="20"/>
|
||||
<method old="noise(DD)D" new="ALLATORIxDEMOxanyValidIdentifierName" s="26" e="26"/>
|
||||
<method old="noise(DDD)D" new="ALLATORIxDEMOxanyValidIdentifierName" s="32" e="32"/>
|
||||
<field old="n Lcom/volmit/iris/noise/FastNoise;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.command.CommandIrisObjectExpand" new="com.volmit.iris.command.CommandIrisObjectExpand">
|
||||
<class old="com.volmit.iris.manager.command.CommandIrisObjectExpand" new="com.volmit.iris.manager.command.CommandIrisObjectExpand">
|
||||
<method old="addNode(Ljava/lang/String;)V" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getAllNodes()Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getArgsUsage()Ljava/lang/String;" new="getMaxHeight" s="60" e="60"/>
|
||||
@@ -672,7 +672,7 @@
|
||||
<field old="name Ljava/lang/String;" new="H"/>
|
||||
<field old="serialVersionUID J" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.command.CommandIrisStudio" new="com.volmit.iris.command.CommandIrisStudio">
|
||||
<class old="com.volmit.iris.manager.command.CommandIrisStudio" new="com.volmit.iris.manager.command.CommandIrisStudio">
|
||||
<method old="addNode(Ljava/lang/String;)V" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getAllNodes()Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getArgsUsage()Ljava/lang/String;" new="getMaxHeight" s="52" e="52"/>
|
||||
@@ -697,7 +697,7 @@
|
||||
<field old="update Lcom/volmit/iris/command/CommandIrisStudioUpdate;" new="M"/>
|
||||
<field old="verify Lcom/volmit/iris/command/CommandIrisStudioVerify;" new="g"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.noise.BaseNoiseGenerator" new="com.volmit.iris.noise.BaseNoiseGenerator">
|
||||
<class old="com.volmit.iris.generator.noise.BaseNoiseGenerator" new="com.volmit.iris.generator.noise.BaseNoiseGenerator">
|
||||
<method old="AllatoriDecryptString(Ljava/lang/String;)Ljava/lang/String;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="fade(D)D" new="hashCode" s="27" e="27"/>
|
||||
<method old="floor(D)I" new="ALLATORIxDEMOxanyValidIdentifierName" s="22" e="22"/>
|
||||
@@ -776,12 +776,12 @@
|
||||
<field old="maxLevel I" new="H"/>
|
||||
<field old="minLevel I" new="M"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.gen.atomics.AtomicObjectMap" new="com.volmit.iris.gen.atomics.AtomicObjectMap">
|
||||
<class old="com.volmit.iris.generator.legacy.atomics.AtomicObjectMap" new="com.volmit.iris.generator.legacy.atomics.AtomicObjectMap">
|
||||
<method old="get(II)Ljava/lang/Object;" new="ALLATORIxDEMOxanyValidIdentifierName" s="13" e="13"/>
|
||||
<method old="set(IILjava/lang/Object;)V" new="ALLATORIxDEMOxanyValidIdentifierName" s="17" e="18"/>
|
||||
<field old="data Ljava/util/concurrent/atomic/AtomicReferenceArray;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.command.CommandIrisObjectXPY" new="com.volmit.iris.command.CommandIrisObjectXPY">
|
||||
<class old="com.volmit.iris.manager.command.CommandIrisObjectXPY" new="com.volmit.iris.manager.command.CommandIrisObjectXPY">
|
||||
<method old="addNode(Ljava/lang/String;)V" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getAllNodes()Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getArgsUsage()Ljava/lang/String;" new="getMaxHeight" s="77" e="77"/>
|
||||
@@ -798,7 +798,7 @@
|
||||
<method old="setCategory(Ljava/lang/String;)V" new="hashCode"/>
|
||||
<method old="setDescription(Ljava/lang/String;)V" new="getMaxHeight"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.gen.layer.GenLayerText" new="com.volmit.iris.gen.layer.GenLayerText">
|
||||
<class old="com.volmit.iris.generator.legacy.layer.GenLayerText" new="com.volmit.iris.generator.legacy.layer.GenLayerText">
|
||||
<method old="AllatoriDecryptString(Ljava/lang/String;)Ljava/lang/String;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="createTextObject(Ljava/lang/String;Ljava/lang/String;ILorg/bukkit/block/data/BlockData;)Lcom/volmit/iris/object/IrisObject;" new="ALLATORIxDEMOxanyValidIdentifierName" s="39" e="60"/>
|
||||
<method old="generate(DD)D" new="ALLATORIxDEMOxanyValidIdentifierName" s="66" e="66"/>
|
||||
@@ -893,7 +893,7 @@
|
||||
<field old="val$names Ljava/util/Set;" new="M"/>
|
||||
<field old="val$out Ljava/util/zip/ZipOutputStream;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.command.CommandIrisObjectShift" new="com.volmit.iris.command.CommandIrisObjectShift">
|
||||
<class old="com.volmit.iris.manager.command.CommandIrisObjectShift" new="com.volmit.iris.manager.command.CommandIrisObjectShift">
|
||||
<method old="addNode(Ljava/lang/String;)V" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getAllNodes()Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getArgsUsage()Ljava/lang/String;" new="getMaxHeight" s="61" e="61"/>
|
||||
@@ -940,7 +940,7 @@
|
||||
<method old="AllatoriDecryptString(Ljava/lang/String;)Ljava/lang/String;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<field old="serialVersionUID J" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.gen.atomics.AtomicMulticache" new="com.volmit.iris.gen.atomics.AtomicMulticache">
|
||||
<class old="com.volmit.iris.generator.legacy.atomics.AtomicMulticache" new="com.volmit.iris.generator.legacy.atomics.AtomicMulticache">
|
||||
<method old="drop()V" new="ALLATORIxDEMOxanyValidIdentifierName" s="114" e="118"/>
|
||||
<method old="getBiome(IILjava/util/function/Supplier;)Lcom/volmit/iris/util/BiomeResult;" new="hashCode" s="71" e="80"/>
|
||||
<method old="getHeight(IILjava/util/function/Supplier;)D" new="ALLATORIxDEMOxanyValidIdentifierName" s="43" e="52"/>
|
||||
@@ -957,10 +957,10 @@
|
||||
<field old="x Ljava/util/concurrent/atomic/AtomicInteger;" new="D"/>
|
||||
<field old="z Ljava/util/concurrent/atomic/AtomicInteger;" new="j"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.gen.post.Post" new="com.volmit.iris.gen.post.Post">
|
||||
<class old="com.volmit.iris.generator.legacy.post.Post" new="com.volmit.iris.generator.legacy.post.Post">
|
||||
<method old="value()Ljava/lang/String;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.gen.parallax.ParallaxRegion" new="com.volmit.iris.gen.parallax.ParallaxRegion">
|
||||
<class old="com.volmit.iris.generator.parallax.ParallaxRegion" new="com.volmit.iris.generator.parallax.ParallaxRegion">
|
||||
<method old="get(III)Lorg/bukkit/block/data/BlockData;" new="ALLATORIxDEMOxanyValidIdentifierName" s="108" e="108"/>
|
||||
<method old="getChunk(IIZ)Lcom/volmit/iris/gen/parallax/ParallaxChunk;" new="ALLATORIxDEMOxanyValidIdentifierName" s="113" e="126"/>
|
||||
<method old="isOlderThan(J)Z" new="ALLATORIxDEMOxanyValidIdentifierName" s="98" e="98"/>
|
||||
@@ -1291,7 +1291,7 @@
|
||||
<field old="UPPER_CAMEL_CASE Lcom/google/gson/FieldNamingPolicy;" new="D"/>
|
||||
<field old="UPPER_CAMEL_CASE_WITH_SPACES Lcom/google/gson/FieldNamingPolicy;" new="j"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.gen.parallax.ParallaxSection" new="com.volmit.iris.gen.parallax.ParallaxSection">
|
||||
<class old="com.volmit.iris.generator.parallax.ParallaxSection" new="com.volmit.iris.generator.parallax.ParallaxSection">
|
||||
<method old="clearUpdates()V" new="ALLATORIxDEMOxanyValidIdentifierName" s="46" e="47"/>
|
||||
<method old="dontUpdate(III)V" new="ALLATORIxDEMOxanyValidIdentifierName" s="56" e="57"/>
|
||||
<method old="getBlock(III)Lorg/bukkit/block/data/BlockData;" new="ALLATORIxDEMOxanyValidIdentifierName" s="76" e="76"/>
|
||||
@@ -1438,7 +1438,7 @@
|
||||
<class old="com.volmit.iris.util.Command" new="com.volmit.iris.util.Command">
|
||||
<method old="value()Ljava/lang/String;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.gen.post.PostWallPatcher" new="com.volmit.iris.gen.post.PostWallPatcher">
|
||||
<class old="com.volmit.iris.generator.legacy.post.PostWallPatcher" new="com.volmit.iris.generator.legacy.post.PostWallPatcher">
|
||||
<method old="canEqual(Ljava/lang/Object;)Z" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="caveFloors(II)Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="equals(Ljava/lang/Object;)Z" new="equals"/>
|
||||
@@ -1833,7 +1833,7 @@
|
||||
<method old="p(Ljava/lang/String;Ljava/lang/Object;)V" new="ALLATORIxDEMOxanyValidIdentifierName" s="71" e="72"/>
|
||||
<field old="nodes Ljava/util/concurrent/ConcurrentSkipListMap;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.gen.atomics.AtomicDoubleMap" new="com.volmit.iris.gen.atomics.AtomicDoubleMap">
|
||||
<class old="com.volmit.iris.generator.legacy.atomics.AtomicDoubleMap" new="com.volmit.iris.generator.legacy.atomics.AtomicDoubleMap">
|
||||
<method old="AllatoriDecryptString(Ljava/lang/String;)Ljava/lang/String;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="get(II)D" new="ALLATORIxDEMOxanyValidIdentifierName" s="13" e="13"/>
|
||||
<method old="getInt(II)I" new="ALLATORIxDEMOxanyValidIdentifierName" s="17" e="17"/>
|
||||
@@ -1843,14 +1843,14 @@
|
||||
<class old="com.volmit.iris.util.CuboidException" new="com.volmit.iris.util.CuboidException">
|
||||
<field old="serialVersionUID J" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.noise.CubicNoise" new="com.volmit.iris.noise.CubicNoise">
|
||||
<class old="com.volmit.iris.generator.noise.CubicNoise" new="com.volmit.iris.generator.noise.CubicNoise">
|
||||
<method old="f(D)D" new="hashCode" s="11" e="11"/>
|
||||
<method old="noise(D)D" new="ALLATORIxDEMOxanyValidIdentifierName" s="16" e="16"/>
|
||||
<method old="noise(DD)D" new="ALLATORIxDEMOxanyValidIdentifierName" s="21" e="21"/>
|
||||
<method old="noise(DDD)D" new="ALLATORIxDEMOxanyValidIdentifierName" s="26" e="26"/>
|
||||
<field old="n Lcom/volmit/iris/noise/FastNoise;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.gen.post.PostNibSmoother" new="com.volmit.iris.gen.post.PostNibSmoother">
|
||||
<class old="com.volmit.iris.generator.legacy.post.PostNibSmoother" new="com.volmit.iris.generator.legacy.post.PostNibSmoother">
|
||||
<method old="canEqual(Ljava/lang/Object;)Z" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="caveFloors(II)Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="equals(Ljava/lang/Object;)Z" new="equals"/>
|
||||
@@ -2005,7 +2005,7 @@
|
||||
<field old="y F" new="H"/>
|
||||
<field old="z F" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.gen.parallax.ParallaxSection$1" new="com.volmit.iris.gen.parallax.ParallaxSection$1">
|
||||
<class old="com.volmit.iris.generator.parallax.ParallaxSection$1" new="com.volmit.iris.generator.parallax.ParallaxSection$1">
|
||||
<method old="get(III)Ljava/lang/Object;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="optimize()V" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="read(Ljava/io/DataInputStream;)V" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
@@ -2172,7 +2172,7 @@
|
||||
<field old="y I" new="H"/>
|
||||
<field old="z I" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.command.CommandIrisStructureClose" new="com.volmit.iris.command.CommandIrisStructureClose">
|
||||
<class old="com.volmit.iris.manager.command.CommandIrisStructureClose" new="com.volmit.iris.manager.command.CommandIrisStructureClose">
|
||||
<method old="addNode(Ljava/lang/String;)V" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getAllNodes()Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getArgsUsage()Ljava/lang/String;" new="getMaxHeight" s="47" e="47"/>
|
||||
@@ -2476,7 +2476,7 @@
|
||||
<method old="close()V" new="close" s="43" e="43"/>
|
||||
<method old="read([CII)I" new="read" s="40" e="40"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.command.CommandIrisWhatBlock" new="com.volmit.iris.command.CommandIrisWhatBlock">
|
||||
<class old="com.volmit.iris.manager.command.CommandIrisWhatBlock" new="com.volmit.iris.manager.command.CommandIrisWhatBlock">
|
||||
<method old="addNode(Ljava/lang/String;)V" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getAllNodes()Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getArgsUsage()Ljava/lang/String;" new="getMaxHeight" s="45" e="45"/>
|
||||
@@ -2493,7 +2493,7 @@
|
||||
<method old="setCategory(Ljava/lang/String;)V" new="hashCode"/>
|
||||
<method old="setDescription(Ljava/lang/String;)V" new="getMaxHeight"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.noise.FractalCubicNoise" new="com.volmit.iris.noise.FractalCubicNoise">
|
||||
<class old="com.volmit.iris.generator.noise.FractalCubicNoise" new="com.volmit.iris.generator.noise.FractalCubicNoise">
|
||||
<method old="f(D)D" new="hashCode" s="14" e="14"/>
|
||||
<method old="noise(D)D" new="ALLATORIxDEMOxanyValidIdentifierName" s="19" e="19"/>
|
||||
<method old="noise(DD)D" new="ALLATORIxDEMOxanyValidIdentifierName" s="24" e="24"/>
|
||||
@@ -2529,7 +2529,7 @@
|
||||
<field old="yAxis Lcom/volmit/iris/object/IrisAxisRotationClamp;" new="H"/>
|
||||
<field old="zAxis Lcom/volmit/iris/object/IrisAxisRotationClamp;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.command.CommandIrisStudioList" new="com.volmit.iris.command.CommandIrisStudioList">
|
||||
<class old="com.volmit.iris.manager.command.CommandIrisStudioList" new="com.volmit.iris.manager.command.CommandIrisStudioList">
|
||||
<method old="addNode(Ljava/lang/String;)V" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getAllNodes()Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getArgsUsage()Ljava/lang/String;" new="getMaxHeight" s="52" e="52"/>
|
||||
@@ -2561,7 +2561,7 @@
|
||||
<field old="jar Ljava/io/File;" new="H"/>
|
||||
<field old="superPackage Ljava/lang/String;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.command.CommandIrisLoot" new="com.volmit.iris.command.CommandIrisLoot">
|
||||
<class old="com.volmit.iris.manager.command.CommandIrisLoot" new="com.volmit.iris.manager.command.CommandIrisLoot">
|
||||
<method old="addNode(Ljava/lang/String;)V" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getAllNodes()Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getArgsUsage()Ljava/lang/String;" new="getMaxHeight" s="94" e="94"/>
|
||||
@@ -2668,7 +2668,7 @@
|
||||
<field old="tables Lcom/volmit/iris/util/KList;" new="M"/>
|
||||
<field old="tt Lcom/volmit/iris/gen/atomics/AtomicCache;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.command.CommandIrisWhatHand" new="com.volmit.iris.command.CommandIrisWhatHand">
|
||||
<class old="com.volmit.iris.manager.command.CommandIrisWhatHand" new="com.volmit.iris.manager.command.CommandIrisWhatHand">
|
||||
<method old="addNode(Ljava/lang/String;)V" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getAllNodes()Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getArgsUsage()Ljava/lang/String;" new="getMaxHeight" s="41" e="41"/>
|
||||
@@ -2685,7 +2685,7 @@
|
||||
<method old="setCategory(Ljava/lang/String;)V" new="hashCode"/>
|
||||
<method old="setDescription(Ljava/lang/String;)V" new="getMaxHeight"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.noise.SimplexNoise" new="com.volmit.iris.noise.SimplexNoise">
|
||||
<class old="com.volmit.iris.generator.noise.SimplexNoise" new="com.volmit.iris.generator.noise.SimplexNoise">
|
||||
<method old="f(D)D" new="hashCode" s="16" e="16"/>
|
||||
<method old="noise(D)D" new="ALLATORIxDEMOxanyValidIdentifierName" s="21" e="34"/>
|
||||
<method old="noise(DD)D" new="ALLATORIxDEMOxanyValidIdentifierName" s="39" e="52"/>
|
||||
@@ -2797,7 +2797,7 @@
|
||||
<method old="transform(Ljava/util/zip/ZipEntry;Ljava/lang/String;)Ljava/lang/String;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<field old="encoding Ljava/lang/String;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.gen.atomics.AtomicSliverMap" new="com.volmit.iris.gen.atomics.AtomicSliverMap">
|
||||
<class old="com.volmit.iris.generator.legacy.atomics.AtomicSliverMap" new="com.volmit.iris.generator.legacy.atomics.AtomicSliverMap">
|
||||
<method old="canEqual(Ljava/lang/Object;)Z" new="ALLATORIxDEMOxanyValidIdentifierName" s="22" e="22"/>
|
||||
<method old="equals(Ljava/lang/Object;)Z" new="equals" s="22" e="22"/>
|
||||
<method old="getSliver(II)Lcom/volmit/iris/gen/atomics/AtomicSliver;" new="ALLATORIxDEMOxanyValidIdentifierName" s="166" e="166"/>
|
||||
@@ -2827,16 +2827,16 @@
|
||||
<class old="com.volmit.iris.util.CustomOutputStream" new="com.volmit.iris.util.CustomOutputStream">
|
||||
<method old="AllatoriDecryptString(Ljava/lang/String;)Ljava/lang/String;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.gui.NoiseView$1" new="com.volmit.iris.gui.NoiseView$1">
|
||||
<class old="com.volmit.iris.manager.gui.NoiseView$1" new="com.volmit.iris.manager.gui.NoiseView$1">
|
||||
<method old="mouseDragged(Ljava/awt/event/MouseEvent;)V" new="mouseDragged" s="90" e="96"/>
|
||||
<method old="mouseMoved(Ljava/awt/event/MouseEvent;)V" new="mouseMoved" s="80" e="86"/>
|
||||
<field old="this$0 Lcom/volmit/iris/gui/NoiseView;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.gui.NoiseView$2" new="com.volmit.iris.gui.NoiseView$2">
|
||||
<class old="com.volmit.iris.manager.gui.NoiseView$2" new="com.volmit.iris.manager.gui.NoiseView$2">
|
||||
<method old="actionPerformed(Ljava/awt/event/ActionEvent;)V" new="actionPerformed" s="273" e="281"/>
|
||||
<field old="val$nv Lcom/volmit/iris/gui/NoiseView;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.gui.NoiseView$3" new="com.volmit.iris.gui.NoiseView$3">
|
||||
<class old="com.volmit.iris.manager.gui.NoiseView$3" new="com.volmit.iris.manager.gui.NoiseView$3">
|
||||
<method old="run()V" new="run" s="297" e="298"/>
|
||||
<field old="val$g Lcom/volmit/iris/gen/IrisChunkGenerator;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
@@ -2928,7 +2928,7 @@
|
||||
<field old="table [Lcom/google/gson/internal/LinkedHashTreeMap$Node;" new="I"/>
|
||||
<field old="threshold I" new="g"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.command.CommandIrisStructureVariants" new="com.volmit.iris.command.CommandIrisStructureVariants">
|
||||
<class old="com.volmit.iris.manager.command.CommandIrisStructureVariants" new="com.volmit.iris.manager.command.CommandIrisStructureVariants">
|
||||
<method old="addNode(Ljava/lang/String;)V" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getAllNodes()Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getArgsUsage()Ljava/lang/String;" new="getMaxHeight" s="46" e="46"/>
|
||||
@@ -3128,7 +3128,7 @@
|
||||
<method old="makeAccessible(Ljava/lang/reflect/AccessibleObject;)V" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<field old="instance Lcom/google/gson/internal/reflect/ReflectionAccessor;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.gen.ParallelChunkGenerator" new="com.volmit.iris.gen.ParallelChunkGenerator">
|
||||
<class old="com.volmit.iris.generator.ParallelChunkGenerator" new="com.volmit.iris.generator.ParallelChunkGenerator">
|
||||
<method old="canEqual(Ljava/lang/Object;)Z" new="ALLATORIxDEMOxanyValidIdentifierName" s="18" e="18"/>
|
||||
<method old="canSpawn(Lorg/bukkit/World;II)Z" new="canSpawn"/>
|
||||
<method old="caveFloors(II)Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
@@ -3273,7 +3273,7 @@
|
||||
<field old="ticks I" new="j"/>
|
||||
<field old="world Lorg/bukkit/World;" new="A"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.command.CommandIrisGoto" new="com.volmit.iris.command.CommandIrisGoto">
|
||||
<class old="com.volmit.iris.manager.command.CommandIrisGoto" new="com.volmit.iris.manager.command.CommandIrisGoto">
|
||||
<method old="addNode(Ljava/lang/String;)V" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getAllNodes()Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getArgsUsage()Ljava/lang/String;" new="getMaxHeight" s="133" e="133"/>
|
||||
@@ -3435,7 +3435,7 @@
|
||||
<method old="write(Ljava/io/Writer;II)Ljava/io/Writer;" new="ALLATORIxDEMOxanyValidIdentifierName" s="1214" e="1249"/>
|
||||
<field old="myArrayList Ljava/util/ArrayList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.command.CommandIrisStudioUpdate" new="com.volmit.iris.command.CommandIrisStudioUpdate">
|
||||
<class old="com.volmit.iris.manager.command.CommandIrisStudioUpdate" new="com.volmit.iris.manager.command.CommandIrisStudioUpdate">
|
||||
<method old="addNode(Ljava/lang/String;)V" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getAllNodes()Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getArgsUsage()Ljava/lang/String;" new="getMaxHeight" s="29" e="29"/>
|
||||
@@ -3502,7 +3502,7 @@
|
||||
<field old="modified Z" new="H"/>
|
||||
<field old="serialVersionUID J" new="M"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.gen.atomics.AtomicRegionData" new="com.volmit.iris.gen.atomics.AtomicRegionData">
|
||||
<class old="com.volmit.iris.generator.legacy.atomics.AtomicRegionData" new="com.volmit.iris.generator.legacy.atomics.AtomicRegionData">
|
||||
<method old="contains(II)Z" new="ALLATORIxDEMOxanyValidIdentifierName" s="77" e="77"/>
|
||||
<method old="delete(II)V" new="ALLATORIxDEMOxanyValidIdentifierName" s="82" e="83"/>
|
||||
<method old="get(II)Lcom/volmit/iris/gen/atomics/AtomicSliverMap;" new="ALLATORIxDEMOxanyValidIdentifierName" s="110" e="148"/>
|
||||
@@ -3624,7 +3624,7 @@
|
||||
<field old="useCache Lcom/volmit/iris/util/KMap;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<field old="useFlip Lcom/volmit/iris/util/ChronoLatch;" new="H"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.gen.DimensionChunkGenerator" new="com.volmit.iris.gen.DimensionChunkGenerator">
|
||||
<class old="com.volmit.iris.generator.DimensionChunkGenerator" new="com.volmit.iris.generator.DimensionChunkGenerator">
|
||||
<method old="canEqual(Ljava/lang/Object;)Z" new="ALLATORIxDEMOxanyValidIdentifierName" s="23" e="23"/>
|
||||
<method old="canSpawn(Lorg/bukkit/World;II)Z" new="canSpawn"/>
|
||||
<method old="caveFloors(II)Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
@@ -4052,7 +4052,7 @@
|
||||
<method old="isUnderwater(II)Z" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="set(IIILorg/bukkit/block/data/BlockData;)V" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.command.PermissionIris" new="com.volmit.iris.command.PermissionIris">
|
||||
<class old="com.volmit.iris.manager.command.PermissionIris" new="com.volmit.iris.manager.command.PermissionIris">
|
||||
<method old="AllatoriDecryptString(Ljava/lang/String;)Ljava/lang/String;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getChildren()Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getDescription()Ljava/lang/String;" new="ALLATORIxDEMOxanyValidIdentifierName" s="20" e="20"/>
|
||||
@@ -4113,7 +4113,7 @@
|
||||
<field old="NULL_MDCA_URL Ljava/lang/String;" new="M"/>
|
||||
<field old="mdcAdapter Lorg/slf4j/spi/MDCAdapter;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.command.CommandIrisPregen" new="com.volmit.iris.command.CommandIrisPregen">
|
||||
<class old="com.volmit.iris.manager.command.CommandIrisPregen" new="com.volmit.iris.manager.command.CommandIrisPregen">
|
||||
<method old="addNode(Ljava/lang/String;)V" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getAllNodes()Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getArgsUsage()Ljava/lang/String;" new="getMaxHeight" s="60" e="60"/>
|
||||
@@ -4334,7 +4334,7 @@
|
||||
<field old="command Lcom/volmit/iris/util/ICommand;" new="M"/>
|
||||
<field old="tag Ljava/lang/String;" new="H"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.gen.layer.GenLayerUpdate" new="com.volmit.iris.gen.layer.GenLayerUpdate">
|
||||
<class old="com.volmit.iris.generator.legacy.layer.GenLayerUpdate" new="com.volmit.iris.generator.legacy.layer.GenLayerUpdate">
|
||||
<method old="addItems(ZLorg/bukkit/inventory/Inventory;Lcom/volmit/iris/util/RNG;Lcom/volmit/iris/util/KList;Lcom/volmit/iris/object/InventorySlotType;IIII)V" new="ALLATORIxDEMOxanyValidIdentifierName" s="135" e="158"/>
|
||||
<method old="getLootTables(Lcom/volmit/iris/util/RNG;Lorg/bukkit/block/Block;)Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName" s="95" e="130"/>
|
||||
<method old="injectTables(Lcom/volmit/iris/util/KList;Lcom/volmit/iris/object/IrisLootReference;)V" new="ALLATORIxDEMOxanyValidIdentifierName" s="85" e="91"/>
|
||||
@@ -4534,7 +4534,7 @@
|
||||
<field old="ZIP64_MAGIC_SHORT I" new="H"/>
|
||||
<field old="ZIP64_MIN_VERSION I" new="M"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.gen.ContextualChunkGenerator" new="com.volmit.iris.gen.ContextualChunkGenerator">
|
||||
<class old="com.volmit.iris.generator.ContextualChunkGenerator" new="com.volmit.iris.generator.ContextualChunkGenerator">
|
||||
<method old="canEqual(Ljava/lang/Object;)Z" new="ALLATORIxDEMOxanyValidIdentifierName" s="47" e="47"/>
|
||||
<method old="canSpawn(Lorg/bukkit/World;II)Z" new="canSpawn" s="264" e="264"/>
|
||||
<method old="caveFloors(II)Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
@@ -4707,13 +4707,13 @@
|
||||
<field old="interval J" new="H"/>
|
||||
<field old="since J" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.noise.CellularNoise" new="com.volmit.iris.noise.CellularNoise">
|
||||
<class old="com.volmit.iris.generator.noise.CellularNoise" new="com.volmit.iris.generator.noise.CellularNoise">
|
||||
<method old="noise(D)D" new="ALLATORIxDEMOxanyValidIdentifierName" s="15" e="15"/>
|
||||
<method old="noise(DD)D" new="ALLATORIxDEMOxanyValidIdentifierName" s="20" e="20"/>
|
||||
<method old="noise(DDD)D" new="ALLATORIxDEMOxanyValidIdentifierName" s="25" e="25"/>
|
||||
<field old="n Lcom/volmit/iris/noise/FastNoise;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.noise.NoiseGenerator" new="com.volmit.iris.noise.NoiseGenerator">
|
||||
<class old="com.volmit.iris.generator.noise.NoiseGenerator" new="com.volmit.iris.generator.noise.NoiseGenerator">
|
||||
<method old="noise(D)D" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="noise(DD)D" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="noise(DDD)D" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
@@ -4943,11 +4943,11 @@
|
||||
<class old="com.volmit.iris.util.IRare" new="com.volmit.iris.util.IRare">
|
||||
<method old="getRarity()I" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.noise.FastNoise$Float2" new="com.volmit.iris.noise.FastNoise$Float2">
|
||||
<class old="com.volmit.iris.generator.noise.FastNoise$Float2" new="com.volmit.iris.generator.noise.FastNoise$Float2">
|
||||
<field old="x F" new="H"/>
|
||||
<field old="y F" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.noise.FastNoise$Float3" new="com.volmit.iris.noise.FastNoise$Float3">
|
||||
<class old="com.volmit.iris.generator.noise.FastNoise$Float3" new="com.volmit.iris.generator.noise.FastNoise$Float3">
|
||||
<field old="x F" new="M"/>
|
||||
<field old="y F" new="H"/>
|
||||
<field old="z F" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
@@ -4983,7 +4983,7 @@
|
||||
<field old="threads I" new="M"/>
|
||||
<field old="workload I" new="H"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.gen.layer.GenLayerCarve" new="com.volmit.iris.gen.layer.GenLayerCarve">
|
||||
<class old="com.volmit.iris.generator.legacy.layer.GenLayerCarve" new="com.volmit.iris.generator.legacy.layer.GenLayerCarve">
|
||||
<method old="AllatoriDecryptString(Ljava/lang/String;)Ljava/lang/String;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="generate(DD)D" new="ALLATORIxDEMOxanyValidIdentifierName" s="43" e="43"/>
|
||||
<method old="isCarved(III)Z" new="ALLATORIxDEMOxanyValidIdentifierName" s="22" e="37"/>
|
||||
@@ -6064,7 +6064,7 @@
|
||||
</class>
|
||||
<class old="com.volmit.iris.util.RegistryListBiome" new="com.volmit.iris.util.RegistryListBiome">
|
||||
</class>
|
||||
<class old="com.volmit.iris.command.CommandIrisStudioClose" new="com.volmit.iris.command.CommandIrisStudioClose">
|
||||
<class old="com.volmit.iris.manager.command.CommandIrisStudioClose" new="com.volmit.iris.manager.command.CommandIrisStudioClose">
|
||||
<method old="addNode(Ljava/lang/String;)V" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getAllNodes()Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getArgsUsage()Ljava/lang/String;" new="getMaxHeight" s="70" e="70"/>
|
||||
@@ -6437,7 +6437,7 @@
|
||||
<field old="prefix Ljava/lang/String;" new="H"/>
|
||||
<field old="suffix Ljava/lang/String;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.gen.post.PostWaterlogger" new="com.volmit.iris.gen.post.PostWaterlogger">
|
||||
<class old="com.volmit.iris.generator.legacy.post.PostWaterlogger" new="com.volmit.iris.generator.legacy.post.PostWaterlogger">
|
||||
<method old="canEqual(Ljava/lang/Object;)Z" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="caveFloors(II)Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="equals(Ljava/lang/Object;)Z" new="equals"/>
|
||||
@@ -6842,7 +6842,7 @@
|
||||
<field old="BYTE_1_SHIFT I" new="H"/>
|
||||
<field old="value I" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.gen.ParallaxChunkGenerator" new="com.volmit.iris.gen.ParallaxChunkGenerator">
|
||||
<class old="com.volmit.iris.generator.ParallaxChunkGenerator" new="com.volmit.iris.generator.ParallaxChunkGenerator">
|
||||
<method old="canEqual(Ljava/lang/Object;)Z" new="ALLATORIxDEMOxanyValidIdentifierName" s="38" e="38"/>
|
||||
<method old="canSpawn(Lorg/bukkit/World;II)Z" new="canSpawn"/>
|
||||
<method old="caveFloors(II)Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
@@ -7593,7 +7593,7 @@
|
||||
<field old="y F" new="M"/>
|
||||
<field old="z F" new="H"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.noise.PolygonGenerator" new="com.volmit.iris.noise.PolygonGenerator">
|
||||
<class old="com.volmit.iris.generator.noise.PolygonGenerator" new="com.volmit.iris.generator.noise.PolygonGenerator">
|
||||
<method old="AllatoriDecryptString(Ljava/lang/String;)Ljava/lang/String;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getClosestNeighbor([D)D" new="ALLATORIxDEMOxanyValidIdentifierName" s="131" e="143"/>
|
||||
<method old="getIndex([D)I" new="ALLATORIxDEMOxanyValidIdentifierName" s="148" e="169"/>
|
||||
@@ -7614,7 +7614,7 @@
|
||||
<field old="DOWN Lcom/volmit/iris/util/ScoreDirection;" new="H"/>
|
||||
<field old="UP Lcom/volmit/iris/util/ScoreDirection;" new="M"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.command.CommandIrisStructureSave" new="com.volmit.iris.command.CommandIrisStructureSave">
|
||||
<class old="com.volmit.iris.manager.command.CommandIrisStructureSave" new="com.volmit.iris.manager.command.CommandIrisStructureSave">
|
||||
<method old="addNode(Ljava/lang/String;)V" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getAllNodes()Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getArgsUsage()Ljava/lang/String;" new="getMaxHeight" s="47" e="47"/>
|
||||
@@ -7646,7 +7646,7 @@
|
||||
<field old="NUMBER Lcom/google/gson/stream/JsonToken;" new="j"/>
|
||||
<field old="STRING Lcom/google/gson/stream/JsonToken;" new="D"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.noise.FastNoise$NoiseType" new="com.volmit.iris.noise.FastNoise$NoiseType">
|
||||
<class old="com.volmit.iris.generator.noise.FastNoise$NoiseType" new="com.volmit.iris.generator.noise.FastNoise$NoiseType">
|
||||
<method old="valueOf(Ljava/lang/String;)Lcom/volmit/iris/noise/FastNoise$NoiseType;" new="valueOf" s="35" e="35"/>
|
||||
<method old="values()[Lcom/volmit/iris/noise/FastNoise$NoiseType;" new="values" s="35" e="35"/>
|
||||
<field old="$VALUES [Lcom/volmit/iris/noise/FastNoise$NoiseType;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
@@ -7933,7 +7933,7 @@
|
||||
<field old="val$path Ljava/lang/String;" new="H"/>
|
||||
<field old="val$zip Ljava/io/File;" new="M"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.command.CommandIrisMap" new="com.volmit.iris.command.CommandIrisMap">
|
||||
<class old="com.volmit.iris.manager.command.CommandIrisMap" new="com.volmit.iris.manager.command.CommandIrisMap">
|
||||
<method old="addNode(Ljava/lang/String;)V" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getAllNodes()Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getArgsUsage()Ljava/lang/String;" new="getMaxHeight" s="27" e="27"/>
|
||||
@@ -7980,7 +7980,7 @@
|
||||
<class old="com.volmit.iris.util.NoiseProvider" new="com.volmit.iris.util.NoiseProvider">
|
||||
<method old="noise(DD)D" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.noise.FastNoise" new="com.volmit.iris.noise.FastNoise">
|
||||
<class old="com.volmit.iris.generator.noise.FastNoise" new="com.volmit.iris.generator.noise.FastNoise">
|
||||
<method old="CalculateFractalBounding()V" new="ALLATORIxDEMOxanyValidIdentifierName" s="286" e="294"/>
|
||||
<method old="CubicLerp(FFFFF)F" new="ALLATORIxDEMOxanyValidIdentifierName" s="280" e="281"/>
|
||||
<method old="DGetWhiteNoise(DD)D" new="ALLATORIxDEMOxanyValidIdentifierName" s="672" e="675"/>
|
||||
@@ -8501,7 +8501,7 @@
|
||||
<method old="getPermissions(Ljava/io/File;)Lorg/zeroturnaround/zip/ZTFilePermissions;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="setPermissions(Ljava/io/File;Lorg/zeroturnaround/zip/ZTFilePermissions;)V" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.gen.atomics.MasterLock" new="com.volmit.iris.gen.atomics.MasterLock">
|
||||
<class old="com.volmit.iris.generator.legacy.atomics.MasterLock" new="com.volmit.iris.generator.legacy.atomics.MasterLock">
|
||||
<method old="clear()V" new="ALLATORIxDEMOxanyValidIdentifierName" s="19" e="20"/>
|
||||
<method old="lock(Ljava/lang/String;)V" new="hashCode" s="24" e="33"/>
|
||||
<method old="unlock(Ljava/lang/String;)V" new="ALLATORIxDEMOxanyValidIdentifierName" s="37" e="46"/>
|
||||
@@ -8532,7 +8532,7 @@
|
||||
<method old="v()Lcom/volmit/iris/util/KList;" new="hashCode"/>
|
||||
<field old="serialVersionUID J" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.command.CommandIrisStudioOpen" new="com.volmit.iris.command.CommandIrisStudioOpen">
|
||||
<class old="com.volmit.iris.manager.command.CommandIrisStudioOpen" new="com.volmit.iris.manager.command.CommandIrisStudioOpen">
|
||||
<method old="addNode(Ljava/lang/String;)V" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getAllNodes()Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getArgsUsage()Ljava/lang/String;" new="getMaxHeight" s="32" e="32"/>
|
||||
@@ -8699,7 +8699,7 @@
|
||||
<field old="constantToName Ljava/util/Map;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<field old="nameToConstant Ljava/util/Map;" new="H"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.noise.PolygonGenerator$EnumPolygonGenerator" new="com.volmit.iris.noise.PolygonGenerator$EnumPolygonGenerator">
|
||||
<class old="com.volmit.iris.generator.noise.PolygonGenerator$EnumPolygonGenerator" new="com.volmit.iris.generator.noise.PolygonGenerator$EnumPolygonGenerator">
|
||||
<method old="AllatoriDecryptString(Ljava/lang/String;)Ljava/lang/String;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getChoice([D)Ljava/lang/Object;" new="ALLATORIxDEMOxanyValidIdentifierName" s="216" e="216"/>
|
||||
<method old="getClosestNeighbor([D)D" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
@@ -8859,7 +8859,7 @@
|
||||
<field old="TYPE_SHORT I" new="e"/>
|
||||
<field old="TYPE_STRING I" new="g"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.gen.parallax.ParallaxWorld" new="com.volmit.iris.gen.parallax.ParallaxWorld">
|
||||
<class old="com.volmit.iris.generator.parallax.ParallaxWorld" new="com.volmit.iris.generator.parallax.ParallaxWorld">
|
||||
<method old="clean(J)V" new="hashCode" s="41" e="61"/>
|
||||
<method old="getBlock(III)Lorg/bukkit/block/data/BlockData;" new="ALLATORIxDEMOxanyValidIdentifierName" s="72" e="77"/>
|
||||
<method old="getRegion(II)Lcom/volmit/iris/gen/parallax/ParallaxRegion;" new="ALLATORIxDEMOxanyValidIdentifierName" s="97" e="100"/>
|
||||
@@ -9128,7 +9128,7 @@
|
||||
<field old="UPPER_CAMEL_CASE Lcom/google/gson/FieldNamingPolicy;" new="D"/>
|
||||
<field old="UPPER_CAMEL_CASE_WITH_SPACES Lcom/google/gson/FieldNamingPolicy;" new="j"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.command.CommandIrisStudioCreate" new="com.volmit.iris.command.CommandIrisStudioCreate">
|
||||
<class old="com.volmit.iris.manager.command.CommandIrisStudioCreate" new="com.volmit.iris.manager.command.CommandIrisStudioCreate">
|
||||
<method old="addNode(Ljava/lang/String;)V" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getAllNodes()Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getArgsUsage()Ljava/lang/String;" new="getMaxHeight" s="37" e="37"/>
|
||||
@@ -9462,7 +9462,7 @@
|
||||
<field old="ceiling I" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<field old="floor I" new="H"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.command.CommandIrisObjectSave" new="com.volmit.iris.command.CommandIrisObjectSave">
|
||||
<class old="com.volmit.iris.manager.command.CommandIrisObjectSave" new="com.volmit.iris.manager.command.CommandIrisObjectSave">
|
||||
<method old="addNode(Ljava/lang/String;)V" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getAllNodes()Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getArgsUsage()Ljava/lang/String;" new="getMaxHeight" s="85" e="85"/>
|
||||
@@ -9515,7 +9515,7 @@
|
||||
<method old="tick(Lorg/bukkit/entity/Player;)V" new="ALLATORIxDEMOxanyValidIdentifierName" s="49" e="60"/>
|
||||
<method old="update(ZLorg/bukkit/Location;Lorg/bukkit/inventory/ItemStack;)Lorg/bukkit/inventory/ItemStack;" new="ALLATORIxDEMOxanyValidIdentifierName" s="250" e="263"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.command.CommandIrisStudioVerify" new="com.volmit.iris.command.CommandIrisStudioVerify">
|
||||
<class old="com.volmit.iris.manager.command.CommandIrisStudioVerify" new="com.volmit.iris.manager.command.CommandIrisStudioVerify">
|
||||
<method old="addNode(Ljava/lang/String;)V" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getAllNodes()Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getArgsUsage()Ljava/lang/String;" new="getMaxHeight" s="46" e="46"/>
|
||||
@@ -9540,7 +9540,7 @@
|
||||
<field old="val$allocateInstance Ljava/lang/reflect/Method;" new="H"/>
|
||||
<field old="val$unsafe Ljava/lang/Object;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.noise.FractalRigidMultiSimplexNoise" new="com.volmit.iris.noise.FractalRigidMultiSimplexNoise">
|
||||
<class old="com.volmit.iris.generator.noise.FractalRigidMultiSimplexNoise" new="com.volmit.iris.generator.noise.FractalRigidMultiSimplexNoise">
|
||||
<method old="f(D)D" new="hashCode" s="16" e="16"/>
|
||||
<method old="noise(D)D" new="ALLATORIxDEMOxanyValidIdentifierName" s="21" e="21"/>
|
||||
<method old="noise(DD)D" new="ALLATORIxDEMOxanyValidIdentifierName" s="26" e="26"/>
|
||||
@@ -9580,7 +9580,7 @@
|
||||
<class old="com.volmit.iris.util.Function3" new="com.volmit.iris.util.Function3">
|
||||
<method old="apply(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.command.CommandIris" new="com.volmit.iris.command.CommandIris">
|
||||
<class old="com.volmit.iris.manager.command.CommandIris" new="com.volmit.iris.manager.command.CommandIris">
|
||||
<method old="addNode(Ljava/lang/String;)V" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getAllNodes()Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getArgsUsage()Ljava/lang/String;" new="getMaxHeight" s="45" e="45"/>
|
||||
@@ -9669,7 +9669,7 @@
|
||||
<class old="com.google.gson.JsonSerializer" new="com.google.gson.JsonSerializer">
|
||||
<method old="serialize(Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.gen.layer.BiomeDataProvider" new="com.volmit.iris.gen.layer.BiomeDataProvider">
|
||||
<class old="com.volmit.iris.generator.legacy.layer.BiomeDataProvider" new="com.volmit.iris.generator.legacy.layer.BiomeDataProvider">
|
||||
<method old="canEqual(Ljava/lang/Object;)Z" new="ALLATORIxDEMOxanyValidIdentifierName" s="12" e="12"/>
|
||||
<method old="equals(Ljava/lang/Object;)Z" new="equals" s="12" e="12"/>
|
||||
<method old="generateData(Lcom/volmit/iris/gen/ContextualChunkGenerator;DDIILcom/volmit/iris/object/IrisRegion;)Lcom/volmit/iris/util/BiomeResult;" new="ALLATORIxDEMOxanyValidIdentifierName" s="33" e="33"/>
|
||||
@@ -9722,7 +9722,7 @@
|
||||
<field old="refereceList Ljava/util/List;" new="D"/>
|
||||
<field old="serialVersionUID J" new="I"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.gen.layer.GenLayerCave" new="com.volmit.iris.gen.layer.GenLayerCave">
|
||||
<class old="com.volmit.iris.generator.legacy.layer.GenLayerCave" new="com.volmit.iris.generator.legacy.layer.GenLayerCave">
|
||||
<method old="AllatoriDecryptString(Ljava/lang/String;)Ljava/lang/String;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="can(Lorg/bukkit/Material;)Z" new="ALLATORIxDEMOxanyValidIdentifierName" s="191" e="191"/>
|
||||
<method old="canAir(Lorg/bukkit/Material;)Z" new="run" s="181" e="181"/>
|
||||
@@ -9851,7 +9851,7 @@
|
||||
<method old="getMarker(Ljava/lang/String;)Lorg/slf4j/Marker;" new="hashCode" s="63" e="72"/>
|
||||
<field old="markerMap Ljava/util/Map;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.noise.FastNoise$1" new="com.volmit.iris.noise.FastNoise$1">
|
||||
<class old="com.volmit.iris.generator.noise.FastNoise$1" new="com.volmit.iris.generator.noise.FastNoise$1">
|
||||
<field old="$SwitchMap$com$volmit$iris$noise$FastNoise$CellularDistanceFunction [I" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<field old="$SwitchMap$com$volmit$iris$noise$FastNoise$CellularReturnType [I" new="g"/>
|
||||
<field old="$SwitchMap$com$volmit$iris$noise$FastNoise$FractalType [I" new="j"/>
|
||||
@@ -9866,7 +9866,7 @@
|
||||
<method old="getLocalFileDataLength()Lorg/zeroturnaround/zip/extra/ZipShort;" new="hashCode"/>
|
||||
<method old="parseFromLocalFileData([BII)V" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.command.CommandIrisStructure" new="com.volmit.iris.command.CommandIrisStructure">
|
||||
<class old="com.volmit.iris.manager.command.CommandIrisStructure" new="com.volmit.iris.manager.command.CommandIrisStructure">
|
||||
<method old="addNode(Ljava/lang/String;)V" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getAllNodes()Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getArgsUsage()Ljava/lang/String;" new="getMaxHeight" s="50" e="50"/>
|
||||
@@ -10004,7 +10004,7 @@
|
||||
<method old="getType()Ljava/lang/String;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="op(Lorg/bukkit/util/Vector;)Lorg/bukkit/util/Vector;" new="ALLATORIxDEMOxanyValidIdentifierName" s="436" e="436"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.command.CommandIrisObjectContract" new="com.volmit.iris.command.CommandIrisObjectContract">
|
||||
<class old="com.volmit.iris.manager.command.CommandIrisObjectContract" new="com.volmit.iris.manager.command.CommandIrisObjectContract">
|
||||
<method old="addNode(Ljava/lang/String;)V" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getAllNodes()Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getArgsUsage()Ljava/lang/String;" new="getMaxHeight" s="60" e="60"/>
|
||||
@@ -10090,7 +10090,7 @@
|
||||
<field old="wallGenerator Lcom/volmit/iris/gen/atomics/AtomicCache;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<field old="wallStyle Lcom/volmit/iris/object/IrisGeneratorStyle;" new="C"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.gen.post.PostFloatingNibDeleter" new="com.volmit.iris.gen.post.PostFloatingNibDeleter">
|
||||
<class old="com.volmit.iris.generator.legacy.post.PostFloatingNibDeleter" new="com.volmit.iris.generator.legacy.post.PostFloatingNibDeleter">
|
||||
<method old="canEqual(Ljava/lang/Object;)Z" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="caveFloors(II)Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="equals(Ljava/lang/Object;)Z" new="equals"/>
|
||||
@@ -10123,7 +10123,7 @@
|
||||
<field old="AIR Lorg/bukkit/block/data/BlockData;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<field old="gen Lcom/volmit/iris/gen/PostBlockChunkGenerator;" new="g"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.noise.FlatNoise" new="com.volmit.iris.noise.FlatNoise">
|
||||
<class old="com.volmit.iris.generator.noise.FlatNoise" new="com.volmit.iris.generator.noise.FlatNoise">
|
||||
<method old="noise(D)D" new="ALLATORIxDEMOxanyValidIdentifierName" s="13" e="13"/>
|
||||
<method old="noise(DD)D" new="ALLATORIxDEMOxanyValidIdentifierName" s="19" e="19"/>
|
||||
<method old="noise(DDD)D" new="ALLATORIxDEMOxanyValidIdentifierName" s="25" e="25"/>
|
||||
@@ -10243,7 +10243,7 @@
|
||||
<field old="underwater Z" new="D"/>
|
||||
<field old="waterloggable Z" new="j"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.noise.CellGenerator" new="com.volmit.iris.noise.CellGenerator">
|
||||
<class old="com.volmit.iris.generator.noise.CellGenerator" new="com.volmit.iris.generator.noise.CellGenerator">
|
||||
<method old="getCellScale()D" new="hashCode" s="14" e="14"/>
|
||||
<method old="getDistance(DD)F" new="ALLATORIxDEMOxanyValidIdentifierName" s="41" e="41"/>
|
||||
<method old="getDistance(DDD)F" new="ALLATORIxDEMOxanyValidIdentifierName" s="46" e="46"/>
|
||||
@@ -10401,7 +10401,7 @@
|
||||
<method old="toString()Ljava/lang/String;" new="toString" s="66" e="71"/>
|
||||
<field old="value Ljava/lang/String;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.gen.atomics.AtomicSliver" new="com.volmit.iris.gen.atomics.AtomicSliver">
|
||||
<class old="com.volmit.iris.generator.legacy.atomics.AtomicSliver" new="com.volmit.iris.generator.legacy.atomics.AtomicSliver">
|
||||
<method old="canEqual(Ljava/lang/Object;)Z" new="ALLATORIxDEMOxanyValidIdentifierName" s="24" e="24"/>
|
||||
<method old="dontUpdate(I)V" new="run" s="67" e="68"/>
|
||||
<method old="equals(Ljava/lang/Object;)Z" new="equals" s="24" e="24"/>
|
||||
@@ -10651,7 +10651,7 @@
|
||||
<class old="org.slf4j.helpers.NOPLoggerFactory" new="org.slf4j.helpers.NOPLoggerFactory">
|
||||
<method old="getLogger(Ljava/lang/String;)Lorg/slf4j/Logger;" new="ALLATORIxDEMOxanyValidIdentifierName" s="46" e="46"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.noise.CNG" new="com.volmit.iris.noise.CNG">
|
||||
<class old="com.volmit.iris.generator.noise.CNG" new="com.volmit.iris.generator.noise.CNG">
|
||||
<method old="bake()Lcom/volmit/iris/noise/CNG;" new="ALLATORIxDEMOxanyValidIdentifierName" s="151" e="153"/>
|
||||
<method old="child(Lcom/volmit/iris/noise/CNG;)Lcom/volmit/iris/noise/CNG;" new="ALLATORIxDEMOxanyValidIdentifierName" s="158" e="164"/>
|
||||
<method old="down(D)Lcom/volmit/iris/noise/CNG;" new="hashCode" s="205" e="206"/>
|
||||
@@ -10773,7 +10773,7 @@
|
||||
<field old="type Ljava/lang/String;" new="H"/>
|
||||
<field old="unbreakable Z" new="A"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.command.CommandIrisMetrics" new="com.volmit.iris.command.CommandIrisMetrics">
|
||||
<class old="com.volmit.iris.manager.command.CommandIrisMetrics" new="com.volmit.iris.manager.command.CommandIrisMetrics">
|
||||
<method old="addNode(Ljava/lang/String;)V" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getAllNodes()Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getArgsUsage()Ljava/lang/String;" new="getMaxHeight" s="54" e="54"/>
|
||||
@@ -11003,7 +11003,7 @@
|
||||
<field old="serializeSpecialFloatingPointValues Z" new="j"/>
|
||||
<field old="timeStyle I" new="A"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.command.CommandIrisStructureMore" new="com.volmit.iris.command.CommandIrisStructureMore">
|
||||
<class old="com.volmit.iris.manager.command.CommandIrisStructureMore" new="com.volmit.iris.manager.command.CommandIrisStructureMore">
|
||||
<method old="addNode(Ljava/lang/String;)V" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getAllNodes()Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getArgsUsage()Ljava/lang/String;" new="getMaxHeight" s="47" e="47"/>
|
||||
@@ -11070,7 +11070,7 @@
|
||||
<field old="z1 I" new="g"/>
|
||||
<field old="z2 I" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.gen.atomics.AtomicIntMap" new="com.volmit.iris.gen.atomics.AtomicIntMap">
|
||||
<class old="com.volmit.iris.generator.legacy.atomics.AtomicIntMap" new="com.volmit.iris.generator.legacy.atomics.AtomicIntMap">
|
||||
<method old="get(II)I" new="ALLATORIxDEMOxanyValidIdentifierName" s="13" e="13"/>
|
||||
<method old="set(III)V" new="ALLATORIxDEMOxanyValidIdentifierName" s="17" e="18"/>
|
||||
<field old="data Ljava/util/concurrent/atomic/AtomicIntegerArray;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
@@ -11103,7 +11103,7 @@
|
||||
<field old="k Ljava/lang/Object;" new="H"/>
|
||||
<field old="v Ljava/lang/Object;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.gen.atomics.AtomicWorldData" new="com.volmit.iris.gen.atomics.AtomicWorldData">
|
||||
<class old="com.volmit.iris.generator.legacy.atomics.AtomicWorldData" new="com.volmit.iris.generator.legacy.atomics.AtomicWorldData">
|
||||
<method old="clean(I)V" new="ALLATORIxDEMOxanyValidIdentifierName" s="269" e="337"/>
|
||||
<method old="createSection(II)Lcom/volmit/iris/gen/atomics/AtomicRegionData;" new="ALLATORIxDEMOxanyValidIdentifierName" s="241" e="249"/>
|
||||
<method old="deleteSection(II)V" new="ALLATORIxDEMOxanyValidIdentifierName" s="86" e="88"/>
|
||||
@@ -11280,7 +11280,7 @@
|
||||
<method old="write(Lcom/google/gson/stream/JsonWriter;Ljava/lang/Object;)V" new="ALLATORIxDEMOxanyValidIdentifierName" s="410" e="410"/>
|
||||
<method old="write(Lcom/google/gson/stream/JsonWriter;Ljava/math/BigDecimal;)V" new="ALLATORIxDEMOxanyValidIdentifierName" s="424" e="425"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.noise.PerlinNoise" new="com.volmit.iris.noise.PerlinNoise">
|
||||
<class old="com.volmit.iris.generator.noise.PerlinNoise" new="com.volmit.iris.generator.noise.PerlinNoise">
|
||||
<method old="f(D)D" new="hashCode" s="16" e="16"/>
|
||||
<method old="noise(D)D" new="ALLATORIxDEMOxanyValidIdentifierName" s="21" e="34"/>
|
||||
<method old="noise(DD)D" new="ALLATORIxDEMOxanyValidIdentifierName" s="39" e="52"/>
|
||||
@@ -11338,7 +11338,7 @@
|
||||
<method old="process(Ljava/io/InputStream;Ljava/util/zip/ZipEntry;)V" new="ALLATORIxDEMOxanyValidIdentifierName" s="450" e="451"/>
|
||||
<field old="file Ljava/io/File;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.noise.FastNoise$CellularDistanceFunction" new="com.volmit.iris.noise.FastNoise$CellularDistanceFunction">
|
||||
<class old="com.volmit.iris.generator.noise.FastNoise$CellularDistanceFunction" new="com.volmit.iris.generator.noise.FastNoise$CellularDistanceFunction">
|
||||
<method old="valueOf(Ljava/lang/String;)Lcom/volmit/iris/noise/FastNoise$CellularDistanceFunction;" new="valueOf" s="63" e="63"/>
|
||||
<method old="values()[Lcom/volmit/iris/noise/FastNoise$CellularDistanceFunction;" new="values" s="63" e="63"/>
|
||||
<field old="$VALUES [Lcom/volmit/iris/noise/FastNoise$CellularDistanceFunction;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
@@ -11591,7 +11591,7 @@
|
||||
<field old="loadFile Ljava/io/File;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<field old="loadKey Ljava/lang/String;" new="H"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.noise.FastNoise$FractalType" new="com.volmit.iris.noise.FastNoise$FractalType">
|
||||
<class old="com.volmit.iris.generator.noise.FastNoise$FractalType" new="com.volmit.iris.generator.noise.FastNoise$FractalType">
|
||||
<method old="valueOf(Ljava/lang/String;)Lcom/volmit/iris/noise/FastNoise$FractalType;" new="valueOf" s="56" e="56"/>
|
||||
<method old="values()[Lcom/volmit/iris/noise/FastNoise$FractalType;" new="values" s="56" e="56"/>
|
||||
<field old="$VALUES [Lcom/volmit/iris/noise/FastNoise$FractalType;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
@@ -11602,7 +11602,7 @@
|
||||
<class old="com.google.gson.internal.bind.TimeTypeAdapter$1" new="com.google.gson.internal.bind.TimeTypeAdapter$1">
|
||||
<method old="create(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken;)Lcom/google/gson/TypeAdapter;" new="ALLATORIxDEMOxanyValidIdentifierName" s="44" e="44"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.command.CommandIrisHotload" new="com.volmit.iris.command.CommandIrisHotload">
|
||||
<class old="com.volmit.iris.manager.command.CommandIrisHotload" new="com.volmit.iris.manager.command.CommandIrisHotload">
|
||||
<method old="addNode(Ljava/lang/String;)V" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getAllNodes()Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getArgsUsage()Ljava/lang/String;" new="getMaxHeight" s="45" e="45"/>
|
||||
@@ -11792,7 +11792,7 @@
|
||||
</class>
|
||||
<class old="com.volmit.iris.util.RegistryListLoot" new="com.volmit.iris.util.RegistryListLoot">
|
||||
</class>
|
||||
<class old="com.volmit.iris.gen.parallax.ParallaxChunk" new="com.volmit.iris.gen.parallax.ParallaxChunk">
|
||||
<class old="com.volmit.iris.generator.parallax.ParallaxChunk" new="com.volmit.iris.generator.parallax.ParallaxChunk">
|
||||
<method old="export(Lorg/bukkit/generator/ChunkGenerator$ChunkData;)V" new="ALLATORIxDEMOxanyValidIdentifierName" s="57" e="80"/>
|
||||
<method old="get(III)Lorg/bukkit/block/data/BlockData;" new="ALLATORIxDEMOxanyValidIdentifierName" s="135" e="135"/>
|
||||
<method old="getSection(IZ)Lcom/volmit/iris/gen/parallax/ParallaxSection;" new="ALLATORIxDEMOxanyValidIdentifierName" s="145" e="155"/>
|
||||
@@ -11873,7 +11873,7 @@
|
||||
<method old="getValue()Ljava/lang/Object;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<field old="name Ljava/lang/String;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.command.CommandIrisObjectXAY" new="com.volmit.iris.command.CommandIrisObjectXAY">
|
||||
<class old="com.volmit.iris.manager.command.CommandIrisObjectXAY" new="com.volmit.iris.manager.command.CommandIrisObjectXAY">
|
||||
<method old="addNode(Ljava/lang/String;)V" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getAllNodes()Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getArgsUsage()Ljava/lang/String;" new="getMaxHeight" s="89" e="89"/>
|
||||
@@ -12060,7 +12060,7 @@
|
||||
<field old="soundDistance I" new="E"/>
|
||||
<field old="volume D" new="G"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.noise.NoiseType" new="com.volmit.iris.noise.NoiseType">
|
||||
<class old="com.volmit.iris.generator.noise.NoiseType" new="com.volmit.iris.generator.noise.NoiseType">
|
||||
<method old="create(J)Lcom/volmit/iris/noise/NoiseGenerator;" new="getTypeAndData" s="26" e="26"/>
|
||||
<method old="lambda$static$0(J)Lcom/volmit/iris/noise/NoiseGenerator;" new="ALLATORIxDEMOxanyValidIdentifierName" s="4" e="4"/>
|
||||
<method old="lambda$static$1(J)Lcom/volmit/iris/noise/NoiseGenerator;" new="hashCode" s="5" e="5"/>
|
||||
@@ -12176,14 +12176,14 @@
|
||||
<method old="toString()Ljava/lang/String;" new="toString" s="66" e="71"/>
|
||||
<field old="value I" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.noise.GlobNoise" new="com.volmit.iris.noise.GlobNoise">
|
||||
<class old="com.volmit.iris.generator.noise.GlobNoise" new="com.volmit.iris.generator.noise.GlobNoise">
|
||||
<method old="f(D)D" new="hashCode" s="15" e="15"/>
|
||||
<method old="noise(D)D" new="ALLATORIxDEMOxanyValidIdentifierName" s="20" e="20"/>
|
||||
<method old="noise(DD)D" new="ALLATORIxDEMOxanyValidIdentifierName" s="25" e="25"/>
|
||||
<method old="noise(DDD)D" new="ALLATORIxDEMOxanyValidIdentifierName" s="30" e="30"/>
|
||||
<field old="n Lcom/volmit/iris/noise/FastNoise;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.noise.OctaveNoise" new="com.volmit.iris.noise.OctaveNoise">
|
||||
<class old="com.volmit.iris.generator.noise.OctaveNoise" new="com.volmit.iris.generator.noise.OctaveNoise">
|
||||
<method old="setOctaves(I)V" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.util.ByteTag" new="com.volmit.iris.util.ByteTag">
|
||||
@@ -12193,7 +12193,7 @@
|
||||
<method old="toString()Ljava/lang/String;" new="toString" s="66" e="71"/>
|
||||
<field old="value B" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.gen.IrisChunkGenerator" new="com.volmit.iris.gen.IrisChunkGenerator">
|
||||
<class old="com.volmit.iris.generator.IrisChunkGenerator" new="com.volmit.iris.generator.IrisChunkGenerator">
|
||||
<method old="canEqual(Ljava/lang/Object;)Z" new="ALLATORIxDEMOxanyValidIdentifierName" s="33" e="33"/>
|
||||
<method old="canSpawn(Lorg/bukkit/World;II)Z" new="canSpawn"/>
|
||||
<method old="caveFloors(II)Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
@@ -12446,7 +12446,7 @@
|
||||
<method old="setHeight(III)V" new="ALLATORIxDEMOxanyValidIdentifierName" s="17" e="18"/>
|
||||
<field old="height [B" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.command.CommandIrisWorld" new="com.volmit.iris.command.CommandIrisWorld">
|
||||
<class old="com.volmit.iris.manager.command.CommandIrisWorld" new="com.volmit.iris.manager.command.CommandIrisWorld">
|
||||
<method old="addNode(Ljava/lang/String;)V" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getAllNodes()Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getArgsUsage()Ljava/lang/String;" new="getMaxHeight" s="52" e="52"/>
|
||||
@@ -12817,7 +12817,7 @@
|
||||
<field old="val$name Ljava/lang/String;" new="M"/>
|
||||
<field old="val$priority I" new="H"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.command.CommandIrisObjectPaste" new="com.volmit.iris.command.CommandIrisObjectPaste">
|
||||
<class old="com.volmit.iris.manager.command.CommandIrisObjectPaste" new="com.volmit.iris.manager.command.CommandIrisObjectPaste">
|
||||
<method old="addNode(Ljava/lang/String;)V" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getAllNodes()Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getArgsUsage()Ljava/lang/String;" new="getMaxHeight" s="83" e="83"/>
|
||||
@@ -12834,7 +12834,7 @@
|
||||
<method old="setCategory(Ljava/lang/String;)V" new="hashCode"/>
|
||||
<method old="setDescription(Ljava/lang/String;)V" new="getMaxHeight"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.command.CommandIrisTC" new="com.volmit.iris.command.CommandIrisTC">
|
||||
<class old="com.volmit.iris.manager.command.CommandIrisTC" new="com.volmit.iris.manager.command.CommandIrisTC">
|
||||
<method old="addNode(Ljava/lang/String;)V" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getAllNodes()Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getArgsUsage()Ljava/lang/String;" new="getMaxHeight" s="53" e="53"/>
|
||||
@@ -12851,7 +12851,7 @@
|
||||
<method old="setCategory(Ljava/lang/String;)V" new="hashCode"/>
|
||||
<method old="setDescription(Ljava/lang/String;)V" new="getMaxHeight"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.command.PermissionIrisStudio" new="com.volmit.iris.command.PermissionIrisStudio">
|
||||
<class old="com.volmit.iris.manager.command.PermissionIrisStudio" new="com.volmit.iris.manager.command.PermissionIrisStudio">
|
||||
<method old="AllatoriDecryptString(Ljava/lang/String;)Ljava/lang/String;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getChildren()Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getDescription()Ljava/lang/String;" new="ALLATORIxDEMOxanyValidIdentifierName" s="16" e="16"/>
|
||||
@@ -13083,7 +13083,7 @@
|
||||
<field old="b Ljava/lang/Object;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<field old="serialVersionUID J" new="M"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.command.CommandIrisStructureOpen" new="com.volmit.iris.command.CommandIrisStructureOpen">
|
||||
<class old="com.volmit.iris.manager.command.CommandIrisStructureOpen" new="com.volmit.iris.manager.command.CommandIrisStructureOpen">
|
||||
<method old="addNode(Ljava/lang/String;)V" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getAllNodes()Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getArgsUsage()Ljava/lang/String;" new="getMaxHeight" s="49" e="49"/>
|
||||
@@ -13103,7 +13103,7 @@
|
||||
<class old="com.volmit.iris.util.Cuboid$1" new="com.volmit.iris.util.Cuboid$1">
|
||||
<field old="$SwitchMap$com$volmit$iris$util$Cuboid$CuboidDirection [I" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.command.CommandIrisObject" new="com.volmit.iris.command.CommandIrisObject">
|
||||
<class old="com.volmit.iris.manager.command.CommandIrisObject" new="com.volmit.iris.manager.command.CommandIrisObject">
|
||||
<method old="addNode(Ljava/lang/String;)V" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getAllNodes()Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getArgsUsage()Ljava/lang/String;" new="getMaxHeight" s="59" e="59"/>
|
||||
@@ -13328,7 +13328,7 @@
|
||||
<field old="appendable Ljava/lang/Appendable;" new="H"/>
|
||||
<field old="currentWrite Lcom/google/gson/internal/Streams$AppendableWriter$CurrentWrite;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.gui.NoiseView" new="com.volmit.iris.gui.NoiseView">
|
||||
<class old="com.volmit.iris.manager.gui.NoiseView" new="com.volmit.iris.manager.gui.NoiseView">
|
||||
<method old="access$000(Lcom/volmit/iris/gen/IrisChunkGenerator;)V" new="ALLATORIxDEMOxanyValidIdentifierName" s="40" e="40"/>
|
||||
<method old="createAndShowGUI(Lcom/volmit/iris/gen/IrisChunkGenerator;)V" new="run" s="258" e="292"/>
|
||||
<method old="lambda$paint$0(II)V" new="ALLATORIxDEMOxanyValidIdentifierName" s="189" e="208"/>
|
||||
@@ -13369,7 +13369,7 @@
|
||||
<method old="getTypeCode(Ljava/lang/Class;)I" new="ALLATORIxDEMOxanyValidIdentifierName" s="91" e="116"/>
|
||||
<method old="getTypeName(Ljava/lang/Class;)Ljava/lang/String;" new="ALLATORIxDEMOxanyValidIdentifierName" s="54" e="79"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.gen.PostBlockChunkGenerator" new="com.volmit.iris.gen.PostBlockChunkGenerator">
|
||||
<class old="com.volmit.iris.generator.PostBlockChunkGenerator" new="com.volmit.iris.generator.PostBlockChunkGenerator">
|
||||
<method old="canEqual(Ljava/lang/Object;)Z" new="ALLATORIxDEMOxanyValidIdentifierName" s="19" e="19"/>
|
||||
<method old="canSpawn(Lorg/bukkit/World;II)Z" new="canSpawn"/>
|
||||
<method old="caveFloors(II)Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName" s="196" e="196"/>
|
||||
@@ -13630,7 +13630,7 @@
|
||||
<field old="max D" new="H"/>
|
||||
<field old="min D" new="M"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.noise.CellHeightNoise" new="com.volmit.iris.noise.CellHeightNoise">
|
||||
<class old="com.volmit.iris.generator.noise.CellHeightNoise" new="com.volmit.iris.generator.noise.CellHeightNoise">
|
||||
<method old="filter(D)D" new="hashCode" s="16" e="16"/>
|
||||
<method old="noise(D)D" new="ALLATORIxDEMOxanyValidIdentifierName" s="21" e="21"/>
|
||||
<method old="noise(DD)D" new="ALLATORIxDEMOxanyValidIdentifierName" s="26" e="26"/>
|
||||
@@ -13662,7 +13662,7 @@
|
||||
<field old="CLEAR Lcom/volmit/iris/object/LootMode;" new="M"/>
|
||||
<field old="REPLACE Lcom/volmit/iris/object/LootMode;" new="H"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.command.CommandIrisRetry" new="com.volmit.iris.command.CommandIrisRetry">
|
||||
<class old="com.volmit.iris.manager.command.CommandIrisRetry" new="com.volmit.iris.manager.command.CommandIrisRetry">
|
||||
<method old="addNode(Ljava/lang/String;)V" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getAllNodes()Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getArgsUsage()Ljava/lang/String;" new="getMaxHeight" s="53" e="53"/>
|
||||
@@ -13782,7 +13782,7 @@
|
||||
<field old="randomPop Z" new="H"/>
|
||||
<field old="reversePop Z" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.noise.FractalFBMSimplexNoise" new="com.volmit.iris.noise.FractalFBMSimplexNoise">
|
||||
<class old="com.volmit.iris.generator.noise.FractalFBMSimplexNoise" new="com.volmit.iris.generator.noise.FractalFBMSimplexNoise">
|
||||
<method old="f(D)D" new="hashCode" s="16" e="16"/>
|
||||
<method old="noise(D)D" new="ALLATORIxDEMOxanyValidIdentifierName" s="21" e="21"/>
|
||||
<method old="noise(DD)D" new="ALLATORIxDEMOxanyValidIdentifierName" s="26" e="26"/>
|
||||
@@ -13829,7 +13829,7 @@
|
||||
<field old="total Lcom/volmit/iris/util/RollingSequence;" new="g"/>
|
||||
<field old="update Lcom/volmit/iris/util/RollingSequence;" new="j"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.gen.post.PostPotholeFiller" new="com.volmit.iris.gen.post.PostPotholeFiller">
|
||||
<class old="com.volmit.iris.generator.legacy.post.PostPotholeFiller" new="com.volmit.iris.generator.legacy.post.PostPotholeFiller">
|
||||
<method old="canEqual(Ljava/lang/Object;)Z" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="caveFloors(II)Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="equals(Ljava/lang/Object;)Z" new="equals"/>
|
||||
@@ -13864,7 +13864,7 @@
|
||||
<class old="com.volmit.iris.object.StructureTileFace$1" new="com.volmit.iris.object.StructureTileFace$1">
|
||||
<field old="$SwitchMap$com$volmit$iris$object$StructureTileFace [I" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.command.CommandIrisStructureCreate" new="com.volmit.iris.command.CommandIrisStructureCreate">
|
||||
<class old="com.volmit.iris.manager.command.CommandIrisStructureCreate" new="com.volmit.iris.manager.command.CommandIrisStructureCreate">
|
||||
<method old="addNode(Ljava/lang/String;)V" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getAllNodes()Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getArgsUsage()Ljava/lang/String;" new="getMaxHeight" s="50" e="50"/>
|
||||
@@ -13899,7 +13899,7 @@
|
||||
</class>
|
||||
<class old="com.volmit.iris.util.Permission" new="com.volmit.iris.util.Permission">
|
||||
</class>
|
||||
<class old="com.volmit.iris.noise.FractalBillowPerlinNoise" new="com.volmit.iris.noise.FractalBillowPerlinNoise">
|
||||
<class old="com.volmit.iris.generator.noise.FractalBillowPerlinNoise" new="com.volmit.iris.generator.noise.FractalBillowPerlinNoise">
|
||||
<method old="f(D)D" new="hashCode" s="16" e="16"/>
|
||||
<method old="noise(D)D" new="ALLATORIxDEMOxanyValidIdentifierName" s="21" e="21"/>
|
||||
<method old="noise(DD)D" new="ALLATORIxDEMOxanyValidIdentifierName" s="26" e="26"/>
|
||||
@@ -13907,7 +13907,7 @@
|
||||
<method old="setOctaves(I)V" new="ALLATORIxDEMOxanyValidIdentifierName" s="36" e="37"/>
|
||||
<field old="n Lcom/volmit/iris/noise/FastNoise;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.command.CommandIrisStudioPackage" new="com.volmit.iris.command.CommandIrisStudioPackage">
|
||||
<class old="com.volmit.iris.manager.command.CommandIrisStudioPackage" new="com.volmit.iris.manager.command.CommandIrisStudioPackage">
|
||||
<method old="addNode(Ljava/lang/String;)V" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getAllNodes()Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getArgsUsage()Ljava/lang/String;" new="getMaxHeight" s="49" e="49"/>
|
||||
@@ -13948,7 +13948,7 @@
|
||||
<class old="com.google.gson.internal.bind.SqlDateTypeAdapter$1" new="com.google.gson.internal.bind.SqlDateTypeAdapter$1">
|
||||
<method old="create(Lcom/google/gson/Gson;Lcom/google/gson/reflect/TypeToken;)Lcom/google/gson/TypeAdapter;" new="ALLATORIxDEMOxanyValidIdentifierName" s="42" e="42"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.noise.CNGFactory" new="com.volmit.iris.noise.CNGFactory">
|
||||
<class old="com.volmit.iris.generator.noise.CNGFactory" new="com.volmit.iris.generator.noise.CNGFactory">
|
||||
<method old="create(Lcom/volmit/iris/util/RNG;)Lcom/volmit/iris/noise/CNG;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.object.IrisGenerator" new="com.volmit.iris.object.IrisGenerator">
|
||||
@@ -14123,7 +14123,7 @@
|
||||
<class old="javax.vecmath.VecMathI18N" new="javax.vecmath.VecMathI18N">
|
||||
<method old="getString(Ljava/lang/String;)Ljava/lang/String;" new="ALLATORIxDEMOxanyValidIdentifierName" s="42" e="48"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.gen.atomics.AtomicRegionMap" new="com.volmit.iris.gen.atomics.AtomicRegionMap">
|
||||
<class old="com.volmit.iris.generator.legacy.atomics.AtomicRegionMap" new="com.volmit.iris.generator.legacy.atomics.AtomicRegionMap">
|
||||
<method old="get(II)Ljava/lang/Object;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="set(IILjava/lang/Object;)V" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
@@ -14207,7 +14207,7 @@
|
||||
<field old="name Ljava/lang/String;" new="H"/>
|
||||
<field old="serialVersionUID J" new="H"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.noise.RarityCellGenerator" new="com.volmit.iris.noise.RarityCellGenerator">
|
||||
<class old="com.volmit.iris.generator.noise.RarityCellGenerator" new="com.volmit.iris.generator.noise.RarityCellGenerator">
|
||||
<method old="get(DDLcom/volmit/iris/util/KList;)Lcom/volmit/iris/util/IRare;" new="ALLATORIxDEMOxanyValidIdentifierName" s="16" e="65"/>
|
||||
<method old="getCellScale()D" new="hashCode"/>
|
||||
<method old="getDistance(DD)F" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
@@ -14276,7 +14276,7 @@
|
||||
<field old="mode I" new="D"/>
|
||||
<field old="uid I" new="j"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.noise.FastNoise$Interp" new="com.volmit.iris.noise.FastNoise$Interp">
|
||||
<class old="com.volmit.iris.generator.noise.FastNoise$Interp" new="com.volmit.iris.generator.noise.FastNoise$Interp">
|
||||
<method old="valueOf(Ljava/lang/String;)Lcom/volmit/iris/noise/FastNoise$Interp;" new="valueOf" s="49" e="49"/>
|
||||
<method old="values()[Lcom/volmit/iris/noise/FastNoise$Interp;" new="values" s="49" e="49"/>
|
||||
<field old="$VALUES [Lcom/volmit/iris/noise/FastNoise$Interp;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
@@ -14284,7 +14284,7 @@
|
||||
<field old="Linear Lcom/volmit/iris/noise/FastNoise$Interp;" new="g"/>
|
||||
<field old="Quintic Lcom/volmit/iris/noise/FastNoise$Interp;" new="H"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.noise.FractalBillowSimplexNoise" new="com.volmit.iris.noise.FractalBillowSimplexNoise">
|
||||
<class old="com.volmit.iris.generator.noise.FractalBillowSimplexNoise" new="com.volmit.iris.generator.noise.FractalBillowSimplexNoise">
|
||||
<method old="f(D)D" new="hashCode" s="16" e="16"/>
|
||||
<method old="noise(D)D" new="ALLATORIxDEMOxanyValidIdentifierName" s="21" e="21"/>
|
||||
<method old="noise(DD)D" new="ALLATORIxDEMOxanyValidIdentifierName" s="26" e="26"/>
|
||||
@@ -14304,7 +14304,7 @@
|
||||
<method old="compare(Ljava/lang/Object;Ljava/lang/Object;)I" new="compare" s="76" e="76"/>
|
||||
<field old="this$0 Lcom/volmit/iris/util/KMap;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.gen.layer.GenLayerBiome" new="com.volmit.iris.gen.layer.GenLayerBiome">
|
||||
<class old="com.volmit.iris.generator.legacy.layer.GenLayerBiome" new="com.volmit.iris.generator.legacy.layer.GenLayerBiome">
|
||||
<method old="AllatoriDecryptString(Ljava/lang/String;)Ljava/lang/String;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="canEqual(Ljava/lang/Object;)Z" new="ALLATORIxDEMOxanyValidIdentifierName" s="21" e="21"/>
|
||||
<method old="equals(Ljava/lang/Object;)Z" new="equals" s="21" e="21"/>
|
||||
@@ -14454,7 +14454,7 @@
|
||||
<method old="write(Lcom/google/gson/stream/JsonWriter;Ljava/lang/Number;)V" new="ALLATORIxDEMOxanyValidIdentifierName" s="189" e="190"/>
|
||||
<method old="write(Lcom/google/gson/stream/JsonWriter;Ljava/lang/Object;)V" new="ALLATORIxDEMOxanyValidIdentifierName" s="173" e="173"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.gen.atomics.AtomicCache" new="com.volmit.iris.gen.atomics.AtomicCache">
|
||||
<class old="com.volmit.iris.generator.legacy.atomics.AtomicCache" new="com.volmit.iris.generator.legacy.atomics.AtomicCache">
|
||||
<method old="aquire(Ljava/util/function/Supplier;)Ljava/lang/Object;" new="hashCode" s="48" e="87"/>
|
||||
<method old="aquireNull(Ljava/util/function/Supplier;)Ljava/lang/Object;" new="ALLATORIxDEMOxanyValidIdentifierName" s="92" e="117"/>
|
||||
<method old="reset()V" new="ALLATORIxDEMOxanyValidIdentifierName" s="36" e="44"/>
|
||||
@@ -14551,7 +14551,7 @@
|
||||
<method old="write(Lcom/google/gson/stream/JsonWriter;Ljava/lang/Object;)V" new="ALLATORIxDEMOxanyValidIdentifierName" s="254" e="254"/>
|
||||
<method old="write(Lcom/google/gson/stream/JsonWriter;Ljava/util/concurrent/atomic/AtomicBoolean;)V" new="ALLATORIxDEMOxanyValidIdentifierName" s="259" e="260"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.noise.FastNoise$CellularReturnType" new="com.volmit.iris.noise.FastNoise$CellularReturnType">
|
||||
<class old="com.volmit.iris.generator.noise.FastNoise$CellularReturnType" new="com.volmit.iris.generator.noise.FastNoise$CellularReturnType">
|
||||
<method old="valueOf(Ljava/lang/String;)Lcom/volmit/iris/noise/FastNoise$CellularReturnType;" new="valueOf" s="70" e="70"/>
|
||||
<method old="values()[Lcom/volmit/iris/noise/FastNoise$CellularReturnType;" new="values" s="70" e="70"/>
|
||||
<field old="$VALUES [Lcom/volmit/iris/noise/FastNoise$CellularReturnType;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
@@ -14610,7 +14610,7 @@
|
||||
<class old="com.volmit.iris.util.inventory.WindowDecorator" new="com.volmit.iris.util.inventory.WindowDecorator">
|
||||
<method old="onDecorateBackground(Lcom/volmit/iris/util/inventory/Window;II)Lcom/volmit/iris/util/inventory/Element;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.command.CommandIrisStructureExpand" new="com.volmit.iris.command.CommandIrisStructureExpand">
|
||||
<class old="com.volmit.iris.manager.command.CommandIrisStructureExpand" new="com.volmit.iris.manager.command.CommandIrisStructureExpand">
|
||||
<method old="addNode(Ljava/lang/String;)V" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getAllNodes()Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getArgsUsage()Ljava/lang/String;" new="getMaxHeight" s="47" e="47"/>
|
||||
@@ -14804,7 +14804,7 @@
|
||||
<field old="lock Ljava/util/concurrent/locks/ReentrantLock;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<field old="tx Lcom/volmit/iris/util/TaskExecutor;" new="H"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.noise.BasePerlinNoiseGenerator" new="com.volmit.iris.noise.BasePerlinNoiseGenerator">
|
||||
<class old="com.volmit.iris.generator.noise.BasePerlinNoiseGenerator" new="com.volmit.iris.generator.noise.BasePerlinNoiseGenerator">
|
||||
<method old="AllatoriDecryptString(Ljava/lang/String;)Ljava/lang/String;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="fade(D)D" new="hashCode"/>
|
||||
<method old="floor(D)I" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
@@ -14969,11 +14969,11 @@
|
||||
<method old="AllatoriDecryptString(Ljava/lang/String;)Ljava/lang/String;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<field old="serialVersionUID J" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.gen.atomics.AtomicBiomeMap" new="com.volmit.iris.gen.atomics.AtomicBiomeMap">
|
||||
<class old="com.volmit.iris.generator.legacy.atomics.AtomicBiomeMap" new="com.volmit.iris.generator.legacy.atomics.AtomicBiomeMap">
|
||||
<method old="get(II)Ljava/lang/Object;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="set(IILjava/lang/Object;)V" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.command.CommandIrisCreate" new="com.volmit.iris.command.CommandIrisCreate">
|
||||
<class old="com.volmit.iris.manager.command.CommandIrisCreate" new="com.volmit.iris.manager.command.CommandIrisCreate">
|
||||
<method old="addNode(Ljava/lang/String;)V" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getAllNodes()Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getArgsUsage()Ljava/lang/String;" new="getMaxHeight" s="197" e="197"/>
|
||||
@@ -15031,7 +15031,7 @@
|
||||
<field old="spot Lcom/volmit/iris/gen/atomics/AtomicCache;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<field old="type Lcom/volmit/iris/object/InferredType;" new="I"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.noise.NoiseFactory" new="com.volmit.iris.noise.NoiseFactory">
|
||||
<class old="com.volmit.iris.generator.noise.NoiseFactory" new="com.volmit.iris.generator.noise.NoiseFactory">
|
||||
<method old="create(J)Lcom/volmit/iris/noise/NoiseGenerator;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.util.MortarPermission" new="com.volmit.iris.util.MortarPermission">
|
||||
@@ -15194,7 +15194,7 @@
|
||||
<method old="onDecorateBackground(Lcom/volmit/iris/util/inventory/Window;II)Lcom/volmit/iris/util/inventory/Element;" new="ALLATORIxDEMOxanyValidIdentifierName" s="17" e="17"/>
|
||||
<field old="element Lcom/volmit/iris/util/inventory/Element;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.command.CommandIrisWhat" new="com.volmit.iris.command.CommandIrisWhat">
|
||||
<class old="com.volmit.iris.manager.command.CommandIrisWhat" new="com.volmit.iris.manager.command.CommandIrisWhat">
|
||||
<method old="addNode(Ljava/lang/String;)V" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getAllNodes()Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getArgsUsage()Ljava/lang/String;" new="getMaxHeight" s="61" e="61"/>
|
||||
@@ -15301,7 +15301,7 @@
|
||||
<method old="v()Lcom/volmit/iris/util/KList;" new="hashCode" s="325" e="325"/>
|
||||
<field old="serialVersionUID J" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.command.CommandIrisObjectP1" new="com.volmit.iris.command.CommandIrisObjectP1">
|
||||
<class old="com.volmit.iris.manager.command.CommandIrisObjectP1" new="com.volmit.iris.manager.command.CommandIrisObjectP1">
|
||||
<method old="addNode(Ljava/lang/String;)V" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getAllNodes()Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getArgsUsage()Ljava/lang/String;" new="getMaxHeight" s="64" e="64"/>
|
||||
@@ -15385,7 +15385,7 @@
|
||||
<field old="name Ljava/lang/String;" new="H"/>
|
||||
<field old="serialVersionUID J" new="M"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.command.CommandIrisObjectP2" new="com.volmit.iris.command.CommandIrisObjectP2">
|
||||
<class old="com.volmit.iris.manager.command.CommandIrisObjectP2" new="com.volmit.iris.manager.command.CommandIrisObjectP2">
|
||||
<method old="addNode(Ljava/lang/String;)V" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getAllNodes()Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getArgsUsage()Ljava/lang/String;" new="getMaxHeight" s="64" e="64"/>
|
||||
@@ -15437,7 +15437,7 @@
|
||||
<field old="y I" new="M"/>
|
||||
<field old="z I" new="H"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.gen.post.PostSlabber" new="com.volmit.iris.gen.post.PostSlabber">
|
||||
<class old="com.volmit.iris.generator.legacy.post.PostSlabber" new="com.volmit.iris.generator.legacy.post.PostSlabber">
|
||||
<method old="canEqual(Ljava/lang/Object;)Z" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="caveFloors(II)Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="equals(Ljava/lang/Object;)Z" new="equals"/>
|
||||
@@ -15473,14 +15473,14 @@
|
||||
<field old="gen Lcom/volmit/iris/gen/PostBlockChunkGenerator;" new="g"/>
|
||||
<field old="rng Lcom/volmit/iris/util/RNG;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.noise.VascularNoise" new="com.volmit.iris.noise.VascularNoise">
|
||||
<class old="com.volmit.iris.generator.noise.VascularNoise" new="com.volmit.iris.generator.noise.VascularNoise">
|
||||
<method old="filter(D)D" new="hashCode" s="16" e="16"/>
|
||||
<method old="noise(D)D" new="ALLATORIxDEMOxanyValidIdentifierName" s="21" e="21"/>
|
||||
<method old="noise(DD)D" new="ALLATORIxDEMOxanyValidIdentifierName" s="26" e="26"/>
|
||||
<method old="noise(DDD)D" new="ALLATORIxDEMOxanyValidIdentifierName" s="31" e="31"/>
|
||||
<field old="n Lcom/volmit/iris/noise/FastNoise;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
</class>
|
||||
<class old="com.volmit.iris.command.CommandIrisObjectWand" new="com.volmit.iris.command.CommandIrisObjectWand">
|
||||
<class old="com.volmit.iris.manager.command.CommandIrisObjectWand" new="com.volmit.iris.manager.command.CommandIrisObjectWand">
|
||||
<method old="addNode(Ljava/lang/String;)V" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getAllNodes()Lcom/volmit/iris/util/KList;" new="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<method old="getArgsUsage()Ljava/lang/String;" new="getMaxHeight" s="38" e="38"/>
|
||||
@@ -15521,7 +15521,7 @@
|
||||
<annotation oldClassName="com.google.gson.annotations.JsonAdapter" oldMethodName="value" newMethodName="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<annotation oldClassName="com.google.gson.annotations.Expose" oldMethodName="serialize" newMethodName="hashCode"/>
|
||||
<annotation oldClassName="com.volmit.iris.util.ArrayType" oldMethodName="min" newMethodName="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<annotation oldClassName="com.volmit.iris.gen.post.Post" oldMethodName="value" newMethodName="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<annotation oldClassName="com.volmit.iris.generator.legacy.post.Post" oldMethodName="value" newMethodName="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<annotation oldClassName="com.volmit.iris.util.MinNumber" oldMethodName="value" newMethodName="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<annotation oldClassName="com.google.gson.annotations.JsonAdapter" oldMethodName="nullSafe" newMethodName="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
<annotation oldClassName="com.google.gson.annotations.SerializedName" oldMethodName="value" newMethodName="ALLATORIxDEMOxanyValidIdentifierName"/>
|
||||
|
||||
@@ -26,7 +26,7 @@ open "C:\Users\cyberpwn\Documents\development\workspace\Iris\lint\in.jar"
|
||||
trimExclude *.Iris and
|
||||
* extends com.volmit.iris.util.MortarCommand and
|
||||
*.* @com.volmit.iris.util.Command * and
|
||||
@com.volmit.iris.gen.post.Post *.* and
|
||||
@com.volmit.iris.generator.legacy.post.Post *.* and
|
||||
@org.bukkit.event.EventHandler *.* and
|
||||
*.* @org.bukkit.event.EventHandler * and
|
||||
*.* @org.bukkit.event.EventHandler *(*) and
|
||||
@@ -57,8 +57,8 @@ exclude @com.volmit.iris.util.DontObfuscate *.* and
|
||||
*.* extends com.volmit.iris.util.IrisPostBlockFilter *(*) and
|
||||
*.PostBlockChunkGenerator * and
|
||||
*.PostBlockChunkGenerator *(*) and
|
||||
com.volmit.iris.gen.post.^* and
|
||||
com.volmit.iris.gen.post.;
|
||||
com.volmit.iris.generator.legacy.post.^* and
|
||||
com.volmit.iris.generator.legacy.post.;
|
||||
|
||||
obfuscate changeLogFileIn=""
|
||||
changeLogFileOut="ChangeLog.txt"
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
package com.volmit.iris;
|
||||
|
||||
import com.volmit.iris.command.CommandIris;
|
||||
import com.volmit.iris.command.PermissionIris;
|
||||
import com.volmit.iris.gen.IrisTerrainProvider;
|
||||
import com.volmit.iris.gen.nms.INMS;
|
||||
import com.volmit.iris.gen.provisions.ProvisionBukkit;
|
||||
import com.volmit.iris.gen.scaffold.IrisGenConfiguration;
|
||||
import com.volmit.iris.gen.scaffold.IrisWorlds;
|
||||
import com.volmit.iris.gen.scaffold.TerrainTarget;
|
||||
import com.volmit.iris.link.BKLink;
|
||||
import com.volmit.iris.link.CitizensLink;
|
||||
import com.volmit.iris.link.MultiverseCoreLink;
|
||||
import com.volmit.iris.link.MythicMobsLink;
|
||||
import com.volmit.iris.manager.command.CommandIris;
|
||||
import com.volmit.iris.manager.command.PermissionIris;
|
||||
import com.volmit.iris.generator.legacy.IrisTerrainProvider;
|
||||
import com.volmit.iris.generator.legacy.nms.INMS;
|
||||
import com.volmit.iris.generator.legacy.provisions.ProvisionBukkit;
|
||||
import com.volmit.iris.generator.legacy.scaffold.IrisGenConfiguration;
|
||||
import com.volmit.iris.scaffold.IrisWorlds;
|
||||
import com.volmit.iris.generator.legacy.scaffold.TerrainTarget;
|
||||
import com.volmit.iris.manager.link.BKLink;
|
||||
import com.volmit.iris.manager.link.CitizensLink;
|
||||
import com.volmit.iris.manager.link.MultiverseCoreLink;
|
||||
import com.volmit.iris.manager.link.MythicMobsLink;
|
||||
import com.volmit.iris.manager.*;
|
||||
import com.volmit.iris.object.IrisCompat;
|
||||
import com.volmit.iris.util.*;
|
||||
@@ -241,7 +241,7 @@ public class Iris extends VolmitPlugin
|
||||
{
|
||||
if(IrisWorlds.isIrisWorld(i))
|
||||
{
|
||||
IrisWorlds.getProvider(i).close();
|
||||
IrisWorlds.access(i).close();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,16 +0,0 @@
|
||||
package com.volmit.iris.gen.nms.v16_2;
|
||||
|
||||
import com.volmit.iris.gen.atomics.AtomicCache;
|
||||
import com.volmit.iris.gen.nms.INMSBinding;
|
||||
import com.volmit.iris.gen.nms.INMSCreator;
|
||||
|
||||
public class NMSBinding16_2 implements INMSBinding
|
||||
{
|
||||
private final AtomicCache<INMSCreator> creator = new AtomicCache<>();
|
||||
|
||||
@Override
|
||||
public INMSCreator getCreator()
|
||||
{
|
||||
return creator.aquire(NMSCreator16_2::new);
|
||||
}
|
||||
}
|
||||
@@ -1,732 +0,0 @@
|
||||
package com.volmit.iris.gen.nms.v16_2;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Random;
|
||||
import java.util.function.Supplier;
|
||||
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.block.Biome;
|
||||
import org.bukkit.block.data.BlockData;
|
||||
import org.bukkit.craftbukkit.libs.it.unimi.dsi.fastutil.objects.ObjectArrayList;
|
||||
import org.bukkit.craftbukkit.libs.it.unimi.dsi.fastutil.objects.ObjectList;
|
||||
import org.bukkit.craftbukkit.v1_16_R2.block.CraftBlock;
|
||||
import org.bukkit.craftbukkit.v1_16_R2.block.data.CraftBlockData;
|
||||
import org.bukkit.craftbukkit.v1_16_R2.util.CraftMagicNumbers;
|
||||
import org.bukkit.generator.ChunkGenerator.BiomeGrid;
|
||||
import org.bukkit.generator.ChunkGenerator.ChunkData;
|
||||
import org.bukkit.material.MaterialData;
|
||||
|
||||
import com.mojang.serialization.Codec;
|
||||
import com.volmit.iris.gen.IrisTerrainProvider;
|
||||
import com.volmit.iris.gen.provisions.ProvisionBukkit;
|
||||
import com.volmit.iris.gen.scaffold.GeneratedChunk;
|
||||
import com.volmit.iris.gen.scaffold.Provisioned;
|
||||
import com.volmit.iris.gen.scaffold.ProvisionedHolder;
|
||||
import com.volmit.iris.gen.scaffold.TerrainProvider;
|
||||
import com.volmit.iris.util.O;
|
||||
import com.volmit.iris.util.V;
|
||||
|
||||
import net.minecraft.server.v1_16_R2.BiomeBase;
|
||||
import net.minecraft.server.v1_16_R2.BiomeManager;
|
||||
import net.minecraft.server.v1_16_R2.BiomeSettingsMobs;
|
||||
import net.minecraft.server.v1_16_R2.Block;
|
||||
import net.minecraft.server.v1_16_R2.BlockColumn;
|
||||
import net.minecraft.server.v1_16_R2.BlockPosition;
|
||||
import net.minecraft.server.v1_16_R2.Blocks;
|
||||
import net.minecraft.server.v1_16_R2.ChunkCoordIntPair;
|
||||
import net.minecraft.server.v1_16_R2.ChunkGenerator;
|
||||
import net.minecraft.server.v1_16_R2.ChunkGeneratorAbstract;
|
||||
import net.minecraft.server.v1_16_R2.CrashReport;
|
||||
import net.minecraft.server.v1_16_R2.CrashReportSystemDetails;
|
||||
import net.minecraft.server.v1_16_R2.DefinedStructureManager;
|
||||
import net.minecraft.server.v1_16_R2.EnumCreatureType;
|
||||
import net.minecraft.server.v1_16_R2.GeneratorAccess;
|
||||
import net.minecraft.server.v1_16_R2.GeneratorAccessSeed;
|
||||
import net.minecraft.server.v1_16_R2.GeneratorSettingBase;
|
||||
import net.minecraft.server.v1_16_R2.HeightMap;
|
||||
import net.minecraft.server.v1_16_R2.IBlockAccess;
|
||||
import net.minecraft.server.v1_16_R2.IBlockData;
|
||||
import net.minecraft.server.v1_16_R2.IChunkAccess;
|
||||
import net.minecraft.server.v1_16_R2.IRegistry;
|
||||
import net.minecraft.server.v1_16_R2.IRegistryCustom;
|
||||
import net.minecraft.server.v1_16_R2.IStructureAccess;
|
||||
import net.minecraft.server.v1_16_R2.NoiseSettings;
|
||||
import net.minecraft.server.v1_16_R2.PacketDebug;
|
||||
import net.minecraft.server.v1_16_R2.ProtoChunk;
|
||||
import net.minecraft.server.v1_16_R2.RegionLimitedWorldAccess;
|
||||
import net.minecraft.server.v1_16_R2.ReportedException;
|
||||
import net.minecraft.server.v1_16_R2.ResourceKey;
|
||||
import net.minecraft.server.v1_16_R2.SectionPosition;
|
||||
import net.minecraft.server.v1_16_R2.SeededRandom;
|
||||
import net.minecraft.server.v1_16_R2.SpawnerCreature;
|
||||
import net.minecraft.server.v1_16_R2.StructureBoundingBox;
|
||||
import net.minecraft.server.v1_16_R2.StructureFeature;
|
||||
import net.minecraft.server.v1_16_R2.StructureFeatures;
|
||||
import net.minecraft.server.v1_16_R2.StructureGenerator;
|
||||
import net.minecraft.server.v1_16_R2.StructureManager;
|
||||
import net.minecraft.server.v1_16_R2.StructurePiece;
|
||||
import net.minecraft.server.v1_16_R2.StructureSettingsFeature;
|
||||
import net.minecraft.server.v1_16_R2.StructureStart;
|
||||
import net.minecraft.server.v1_16_R2.WorldChunkManager;
|
||||
import net.minecraft.server.v1_16_R2.WorldGenFeatureDefinedStructureJigsawJunction;
|
||||
import net.minecraft.server.v1_16_R2.WorldGenFeatureDefinedStructurePoolTemplate;
|
||||
import net.minecraft.server.v1_16_R2.WorldGenFeaturePillagerOutpostPoolPiece;
|
||||
import net.minecraft.server.v1_16_R2.WorldGenStage;
|
||||
import net.minecraft.server.v1_16_R2.WorldServer;
|
||||
|
||||
@SuppressWarnings("deprecation")
|
||||
public class NMSChunkGenerator16_2_SPIGOT extends ChunkGenerator implements ProvisionedHolder
|
||||
{
|
||||
private static final IBlockData k = Blocks.AIR.getBlockData();
|
||||
private final Provisioned provisioned;
|
||||
private final int maxHeight;
|
||||
private final int xzSize;
|
||||
protected final IBlockData f;
|
||||
protected final IBlockData g;
|
||||
private final long w;
|
||||
protected final Supplier<GeneratorSettingBase> h;
|
||||
private final O<WorldServer> ws;
|
||||
private BlockColumn BC;
|
||||
|
||||
public NMSChunkGenerator16_2_SPIGOT(Provisioned p, O<WorldServer> ws, WorldChunkManager worldchunkmanager, long i, Supplier<GeneratorSettingBase> supplier)
|
||||
{
|
||||
this(p, ws, worldchunkmanager, worldchunkmanager, i, supplier);
|
||||
}
|
||||
|
||||
private NMSChunkGenerator16_2_SPIGOT(Provisioned p, O<WorldServer> ws, WorldChunkManager worldchunkmanager, WorldChunkManager worldchunkmanager1, long i, Supplier<GeneratorSettingBase> supplier)
|
||||
{
|
||||
super(worldchunkmanager, worldchunkmanager1, supplier.get().a(), i);
|
||||
this.provisioned = p;
|
||||
this.ws = ws;
|
||||
this.w = i;
|
||||
GeneratorSettingBase generatorsettingbase = supplier.get();
|
||||
|
||||
this.h = supplier;
|
||||
NoiseSettings noisesettings = generatorsettingbase.b();
|
||||
|
||||
this.maxHeight = noisesettings.f() * 4;
|
||||
this.f = generatorsettingbase.c();
|
||||
this.g = generatorsettingbase.d();
|
||||
this.xzSize = noisesettings.a() / this.maxHeight;
|
||||
BC = new BlockColumn(new IBlockData[this.xzSize * this.maxHeight]);
|
||||
}
|
||||
|
||||
public int getSpawnHeight()
|
||||
{
|
||||
return getSeaLevel() + 8;
|
||||
}
|
||||
|
||||
public WorldChunkManager getWorldChunkManager()
|
||||
{
|
||||
return this.c;
|
||||
}
|
||||
|
||||
public int getGenerationDepth()
|
||||
{
|
||||
return 256;
|
||||
}
|
||||
|
||||
public void doCarving(long i, BiomeManager biomemanager, IChunkAccess ichunkaccess, WorldGenStage.Features worldgenstage_features)
|
||||
{
|
||||
if(((IrisTerrainProvider) provisioned.getProvider()).getDimension().isVanillaCaves())
|
||||
{
|
||||
super.doCarving(i, biomemanager, ichunkaccess, worldgenstage_features);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Codec<? extends ChunkGenerator> a()
|
||||
{
|
||||
return ChunkGeneratorAbstract.d;
|
||||
}
|
||||
|
||||
public boolean a(long i, ResourceKey<GeneratorSettingBase> resourcekey)
|
||||
{
|
||||
return this.w == i && this.h.get().a(resourcekey);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getBaseHeight(int i, int j, HeightMap.Type heightmap_type)
|
||||
{
|
||||
return 63;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IBlockAccess a(int x, int z)
|
||||
{
|
||||
return BC;
|
||||
}
|
||||
|
||||
protected IBlockData a(double d0, int i)
|
||||
{
|
||||
IBlockData iblockdata;
|
||||
|
||||
if(d0 > 0.0D)
|
||||
{
|
||||
iblockdata = this.f;
|
||||
}
|
||||
else if(i < this.getSeaLevel())
|
||||
{
|
||||
iblockdata = this.g;
|
||||
}
|
||||
else
|
||||
{
|
||||
iblockdata = NMSChunkGenerator16_2_SPIGOT.k;
|
||||
}
|
||||
|
||||
return iblockdata;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void buildBase(RegionLimitedWorldAccess regionlimitedworldaccess, IChunkAccess ichunkaccess)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void buildNoise(GeneratorAccess generatoraccess, StructureManager structuremanager, IChunkAccess ichunkaccess)
|
||||
{
|
||||
ObjectList<StructurePiece> objectlist = new ObjectArrayList<StructurePiece>(10);
|
||||
ObjectList<WorldGenFeatureDefinedStructureJigsawJunction> objectlist1 = new ObjectArrayList<WorldGenFeatureDefinedStructureJigsawJunction>(32);
|
||||
ChunkCoordIntPair chunkcoordintpair = ichunkaccess.getPos();
|
||||
int i = chunkcoordintpair.x;
|
||||
int j = chunkcoordintpair.z;
|
||||
|
||||
if(((IrisTerrainProvider) provisioned.getProvider()).shouldGenerateVanillaStructures())
|
||||
{
|
||||
int k = i << 4;
|
||||
int l = j << 4;
|
||||
Iterator<?> iterator = StructureGenerator.t.iterator();
|
||||
|
||||
while(iterator.hasNext())
|
||||
{
|
||||
StructureGenerator<?> structuregenerator = (StructureGenerator<?>) iterator.next();
|
||||
|
||||
structuremanager.a(SectionPosition.a(chunkcoordintpair, 0), structuregenerator).forEach((structurestart) ->
|
||||
{
|
||||
Iterator<?> iterator1 = structurestart.d().iterator();
|
||||
|
||||
while(iterator1.hasNext())
|
||||
{
|
||||
StructurePiece structurepiece = (StructurePiece) iterator1.next();
|
||||
|
||||
if(structurepiece.a(chunkcoordintpair, 12))
|
||||
{
|
||||
if(structurepiece instanceof WorldGenFeaturePillagerOutpostPoolPiece)
|
||||
{
|
||||
WorldGenFeaturePillagerOutpostPoolPiece worldgenfeaturepillageroutpostpoolpiece = (WorldGenFeaturePillagerOutpostPoolPiece) structurepiece;
|
||||
WorldGenFeatureDefinedStructurePoolTemplate.Matching worldgenfeaturedefinedstructurepooltemplate_matching = worldgenfeaturepillageroutpostpoolpiece.b().e();
|
||||
|
||||
if(worldgenfeaturedefinedstructurepooltemplate_matching == WorldGenFeatureDefinedStructurePoolTemplate.Matching.RIGID)
|
||||
{
|
||||
objectlist.add(worldgenfeaturepillageroutpostpoolpiece);
|
||||
}
|
||||
|
||||
Iterator<?> iterator2 = worldgenfeaturepillageroutpostpoolpiece.e().iterator();
|
||||
|
||||
while(iterator2.hasNext())
|
||||
{
|
||||
WorldGenFeatureDefinedStructureJigsawJunction worldgenfeaturedefinedstructurejigsawjunction = (WorldGenFeatureDefinedStructureJigsawJunction) iterator2.next();
|
||||
int i1 = worldgenfeaturedefinedstructurejigsawjunction.a();
|
||||
int j1 = worldgenfeaturedefinedstructurejigsawjunction.c();
|
||||
|
||||
if(i1 > k - 12 && j1 > l - 12 && i1 < k + 15 + 12 && j1 < l + 15 + 12)
|
||||
{
|
||||
objectlist1.add(worldgenfeaturedefinedstructurejigsawjunction);
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
objectlist.add(structurepiece);
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
ProtoChunk protochunk = (ProtoChunk) ichunkaccess;
|
||||
HeightMap heightmap = protochunk.a(HeightMap.Type.OCEAN_FLOOR_WG);
|
||||
HeightMap heightmap1 = protochunk.a(HeightMap.Type.WORLD_SURFACE_WG);
|
||||
GeneratedChunk gc = ((ProvisionBukkit) provisioned).generateNMSChunkData(ws.get().getWorld(), new Random(i + j), i, j, new ChunkData()
|
||||
{
|
||||
public int getMaxHeight()
|
||||
{
|
||||
return 256;
|
||||
}
|
||||
|
||||
public void setBlock(int x, int y, int z, Material material)
|
||||
{
|
||||
this.setBlock(x, y, z, material.createBlockData());
|
||||
}
|
||||
|
||||
public void setBlock(int x, int y, int z, MaterialData material)
|
||||
{
|
||||
this.setBlock(x, y, z, CraftMagicNumbers.getBlock((MaterialData) material));
|
||||
}
|
||||
|
||||
public void setBlock(int x, int y, int z, BlockData blockData)
|
||||
{
|
||||
this.setBlock(x, y, z, ((CraftBlockData) blockData).getState());
|
||||
}
|
||||
|
||||
public void setRegion(int xMin, int yMin, int zMin, int xMax, int yMax, int zMax, Material material)
|
||||
{
|
||||
this.setRegion(xMin, yMin, zMin, xMax, yMax, zMax, material.createBlockData());
|
||||
}
|
||||
|
||||
public void setRegion(int xMin, int yMin, int zMin, int xMax, int yMax, int zMax, MaterialData material)
|
||||
{
|
||||
this.setRegion(xMin, yMin, zMin, xMax, yMax, zMax, CraftMagicNumbers.getBlock((MaterialData) material));
|
||||
}
|
||||
|
||||
public void setRegion(int xMin, int yMin, int zMin, int xMax, int yMax, int zMax, BlockData blockData)
|
||||
{
|
||||
this.setRegion(xMin, yMin, zMin, xMax, yMax, zMax, ((CraftBlockData) blockData).getState());
|
||||
}
|
||||
|
||||
public Material getType(int x, int y, int z)
|
||||
{
|
||||
return CraftMagicNumbers.getMaterial((Block) this.getTypeId(x, y, z).getBlock());
|
||||
}
|
||||
|
||||
public MaterialData getTypeAndData(int x, int y, int z)
|
||||
{
|
||||
return CraftMagicNumbers.getMaterial((IBlockData) this.getTypeId(x, y, z));
|
||||
}
|
||||
|
||||
public BlockData getBlockData(int x, int y, int z)
|
||||
{
|
||||
return CraftBlockData.fromData((IBlockData) this.getTypeId(x, y, z));
|
||||
}
|
||||
|
||||
public void setRegion(int xMin, int yMin, int zMin, int xMax, int yMax, int zMax, IBlockData type)
|
||||
{
|
||||
if(xMin > 15 || yMin >= getMaxHeight() || zMin > 15)
|
||||
{
|
||||
return;
|
||||
}
|
||||
if(xMin < 0)
|
||||
{
|
||||
xMin = 0;
|
||||
}
|
||||
if(yMin < 0)
|
||||
{
|
||||
yMin = 0;
|
||||
}
|
||||
if(zMin < 0)
|
||||
{
|
||||
zMin = 0;
|
||||
}
|
||||
if(xMax > 16)
|
||||
{
|
||||
xMax = 16;
|
||||
}
|
||||
if(yMax > getMaxHeight())
|
||||
{
|
||||
yMax = getMaxHeight();
|
||||
}
|
||||
if(zMax > 16)
|
||||
{
|
||||
zMax = 16;
|
||||
}
|
||||
if(xMin >= xMax || yMin >= yMax || zMin >= zMax)
|
||||
{
|
||||
return;
|
||||
}
|
||||
int y = yMin;
|
||||
while(y < yMax)
|
||||
{
|
||||
int x = xMin;
|
||||
while(x < xMax)
|
||||
{
|
||||
int z = zMin;
|
||||
while(z < zMax)
|
||||
{
|
||||
protochunk.setType(new BlockPosition(x, y, z), type, false);
|
||||
++z;
|
||||
}
|
||||
++x;
|
||||
}
|
||||
++y;
|
||||
}
|
||||
}
|
||||
|
||||
public IBlockData getTypeId(int x, int y, int z)
|
||||
{
|
||||
if(x != (x & 15) || y < 0 || y >= getMaxHeight() || z != (z & 15))
|
||||
{
|
||||
return Blocks.AIR.getBlockData();
|
||||
}
|
||||
return protochunk.getType(new BlockPosition(x, y, z));
|
||||
}
|
||||
|
||||
public byte getData(int x, int y, int z)
|
||||
{
|
||||
return CraftMagicNumbers.toLegacyData((IBlockData) this.getTypeId(x, y, z));
|
||||
}
|
||||
|
||||
private void setBlock(int x, int y, int z, IBlockData type)
|
||||
{
|
||||
if(x != (x & 15) || y < 0 || y >= getMaxHeight() || z != (z & 15))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
protochunk.setType(new BlockPosition(x, y, z), type, false);
|
||||
|
||||
if(type.getBlock().isTileEntity())
|
||||
{
|
||||
// if (this.tiles == null) {
|
||||
// this.tiles = new HashSet<BlockPosition>();
|
||||
// }
|
||||
// this.tiles.add(new BlockPosition(x, y, z));
|
||||
}
|
||||
}
|
||||
}, new BiomeGrid()
|
||||
{
|
||||
@Override
|
||||
public void setBiome(int x, int y, int z, Biome bio)
|
||||
{
|
||||
protochunk.getBiomeIndex().setBiome(x, y, z, CraftBlock.biomeToBiomeBase(ws.get().r().b(IRegistry.ay), bio));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setBiome(int x, int z, Biome bio)
|
||||
{
|
||||
protochunk.getBiomeIndex().setBiome(x, 0, z, CraftBlock.biomeToBiomeBase(ws.get().r().b(IRegistry.ay), bio));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Biome getBiome(int x, int y, int z)
|
||||
{
|
||||
return CraftBlock.biomeBaseToBiome(ws.get().r().b(IRegistry.ay), protochunk.getBiomeIndex().getBiome(x, y, z));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Biome getBiome(int x, int z)
|
||||
{
|
||||
return CraftBlock.biomeBaseToBiome(ws.get().r().b(IRegistry.ay), protochunk.getBiomeIndex().getBiome(x, 0, z));
|
||||
}
|
||||
});
|
||||
|
||||
for(int xx = 0; xx < 16; xx++)
|
||||
{
|
||||
for(int zz = 0; zz < 16; zz++)
|
||||
{
|
||||
int y = gc.getHeight().getHeight(xx, zz);
|
||||
if(y < getSeaLevel())
|
||||
{
|
||||
heightmap.a(xx, y, zz, Blocks.STONE.getBlockData());
|
||||
}
|
||||
heightmap1.a(xx, Math.max(y, getSeaLevel()), zz, Blocks.STONE.getBlockData());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void addDecorations(RegionLimitedWorldAccess regionlimitedworldaccess, StructureManager structuremanager)
|
||||
{
|
||||
if(((IrisTerrainProvider) provisioned.getProvider()).shouldGenerateVanillaStructures())
|
||||
{
|
||||
int i = regionlimitedworldaccess.a();
|
||||
int j = regionlimitedworldaccess.b();
|
||||
int k = i * 16;
|
||||
int l = j * 16;
|
||||
BlockPosition blockposition = new BlockPosition(k, 0, l);
|
||||
BiomeBase biomebase = this.b.getBiome((i << 2) + 2, 2, (j << 2) + 2);
|
||||
SeededRandom seededrandom = new SeededRandom();
|
||||
long i1 = seededrandom.a(regionlimitedworldaccess.getSeed(), k, l);
|
||||
try
|
||||
{
|
||||
a(biomebase, structuremanager, this, regionlimitedworldaccess, i1, seededrandom, blockposition);
|
||||
}
|
||||
catch(Exception exception)
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void a(BiomeBase bbase, StructureManager var0, ChunkGenerator var1, RegionLimitedWorldAccess var2, long var3, SeededRandom var5, BlockPosition var6)
|
||||
{
|
||||
if(!((IrisTerrainProvider) provisioned.getProvider()).shouldGenerateVanillaStructures())
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
int stages = WorldGenStage.Decoration.values().length;
|
||||
for(int stage = 0; stage < stages; ++stage)
|
||||
{
|
||||
WorldGenStage.Decoration st = WorldGenStage.Decoration.values()[stage];
|
||||
|
||||
if(st.equals(WorldGenStage.Decoration.LAKES))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if(st.equals(WorldGenStage.Decoration.LOCAL_MODIFICATIONS))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if(st.equals(WorldGenStage.Decoration.RAW_GENERATION))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if(st.equals(WorldGenStage.Decoration.TOP_LAYER_MODIFICATION))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if(st.equals(WorldGenStage.Decoration.UNDERGROUND_DECORATION))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if(st.equals(WorldGenStage.Decoration.UNDERGROUND_ORES))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if(st.equals(WorldGenStage.Decoration.VEGETAL_DECORATION))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
StructureGenerator<?> var13;
|
||||
int var10 = 0;
|
||||
if(var0.a())
|
||||
{
|
||||
@SuppressWarnings("unchecked")
|
||||
List<StructureGenerator<?>> structureGenerators = ((Map<Integer, List<StructureGenerator<?>>>) new V(bbase).get("g")).getOrDefault(stage, Collections.emptyList());
|
||||
Iterator<StructureGenerator<?>> iterator = structureGenerators.iterator();
|
||||
while(iterator.hasNext())
|
||||
{
|
||||
var13 = (StructureGenerator<?>) iterator.next();
|
||||
|
||||
if(var13.equals(StructureGenerator.VILLAGE))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if(var13.equals(StructureGenerator.JUNGLE_PYRAMID))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if(var13.equals(StructureGenerator.OCEAN_RUIN))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if(var13.equals(StructureGenerator.IGLOO))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if(var13.equals(StructureGenerator.MINESHAFT))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if(var13.equals(StructureGenerator.NETHER_FOSSIL))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if(var13.equals(StructureGenerator.SHIPWRECK))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if(var13.equals(StructureGenerator.SHIPWRECK))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if(var13.equals(StructureGenerator.MONUMENT))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if(var13.equals(StructureGenerator.BASTION_REMNANT))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
var5.b(var3, var10, stage);
|
||||
int var14 = var6.getX() >> 4;
|
||||
int var15 = var6.getZ() >> 4;
|
||||
int var16 = var14 << 4;
|
||||
int var17 = var15 << 4;
|
||||
|
||||
try
|
||||
{
|
||||
var0.a(SectionPosition.a((BlockPosition) var6), var13).forEach(var8 -> var8.a((GeneratorAccessSeed) var2, var0, var1, (Random) var5, new StructureBoundingBox(var16, var17, var16 + 15, var17 + 15), new ChunkCoordIntPair(var14, var15)));
|
||||
}
|
||||
|
||||
catch(Exception var18)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
++var10;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getSeaLevel()
|
||||
{
|
||||
return ((IrisTerrainProvider) provisioned.getProvider()).getFluidHeight();
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<BiomeSettingsMobs.c> getMobsFor(BiomeBase biomebase, StructureManager structuremanager, EnumCreatureType enumcreaturetype, BlockPosition blockposition)
|
||||
{
|
||||
if(structuremanager.a(blockposition, true, StructureGenerator.SWAMP_HUT).e())
|
||||
{
|
||||
if(enumcreaturetype == EnumCreatureType.MONSTER)
|
||||
{
|
||||
return StructureGenerator.SWAMP_HUT.c();
|
||||
}
|
||||
|
||||
if(enumcreaturetype == EnumCreatureType.CREATURE)
|
||||
{
|
||||
return StructureGenerator.SWAMP_HUT.j();
|
||||
}
|
||||
}
|
||||
|
||||
if(enumcreaturetype == EnumCreatureType.MONSTER)
|
||||
{
|
||||
if(structuremanager.a(blockposition, false, StructureGenerator.PILLAGER_OUTPOST).e())
|
||||
{
|
||||
return StructureGenerator.PILLAGER_OUTPOST.c();
|
||||
}
|
||||
|
||||
if(structuremanager.a(blockposition, false, StructureGenerator.MONUMENT).e())
|
||||
{
|
||||
return StructureGenerator.MONUMENT.c();
|
||||
}
|
||||
|
||||
if(structuremanager.a(blockposition, true, StructureGenerator.FORTRESS).e())
|
||||
{
|
||||
return StructureGenerator.FORTRESS.c();
|
||||
}
|
||||
}
|
||||
|
||||
return super.getMobsFor(biomebase, structuremanager, enumcreaturetype, blockposition);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addMobs(RegionLimitedWorldAccess regionlimitedworldaccess)
|
||||
{
|
||||
int i = regionlimitedworldaccess.a();
|
||||
int j = regionlimitedworldaccess.b();
|
||||
BiomeBase biomebase = regionlimitedworldaccess.getBiome((new ChunkCoordIntPair(i, j)).l());
|
||||
SeededRandom seededrandom = new SeededRandom();
|
||||
seededrandom.a(regionlimitedworldaccess.getSeed(), i << 4, j << 4);
|
||||
SpawnerCreature.a(regionlimitedworldaccess, biomebase, i, j, seededrandom);
|
||||
}
|
||||
|
||||
public void createStructures(IRegistryCustom iregistrycustom, StructureManager structuremanager, IChunkAccess ichunkaccess, DefinedStructureManager definedstructuremanager, long i)
|
||||
{
|
||||
ChunkCoordIntPair chunkcoordintpair = ichunkaccess.getPos();
|
||||
BiomeBase biomebase = this.b.getBiome((chunkcoordintpair.x << 2) + 2, 0, (chunkcoordintpair.z << 2) + 2);
|
||||
this.a(StructureFeatures.k, iregistrycustom, structuremanager, ichunkaccess, definedstructuremanager, i, chunkcoordintpair, biomebase);
|
||||
for(Supplier<StructureFeature<?, ?>> supplier : biomebase.e().a())
|
||||
{
|
||||
StructureFeature<?, ?> structurefeature = (StructureFeature<?, ?>) supplier.get();
|
||||
if(StructureFeature.c == StructureGenerator.STRONGHOLD)
|
||||
{
|
||||
StructureFeature<?, ?> structureFeature = structurefeature;
|
||||
synchronized(structureFeature)
|
||||
{
|
||||
this.a(structurefeature, iregistrycustom, structuremanager, ichunkaccess, definedstructuremanager, i, chunkcoordintpair, biomebase);
|
||||
continue;
|
||||
}
|
||||
}
|
||||
this.a(structurefeature, iregistrycustom, structuremanager, ichunkaccess, definedstructuremanager, i, chunkcoordintpair, biomebase);
|
||||
}
|
||||
}
|
||||
|
||||
private void a(StructureFeature<?, ?> structurefeature, IRegistryCustom iregistrycustom, StructureManager structuremanager, IChunkAccess ichunkaccess, DefinedStructureManager definedstructuremanager, long i, ChunkCoordIntPair chunkcoordintpair, BiomeBase biomebase)
|
||||
{
|
||||
StructureStart<?> structurestart = structuremanager.a(SectionPosition.a((ChunkCoordIntPair) ichunkaccess.getPos(), (int) 0), structurefeature.d, (IStructureAccess) ichunkaccess);
|
||||
int j = structurestart != null ? structurestart.j() : 0;
|
||||
StructureSettingsFeature structuresettingsfeature = getSettings().a(structurefeature.d);
|
||||
if(structuresettingsfeature != null)
|
||||
{
|
||||
StructureStart<?> structurestart1 = structurefeature.a(iregistrycustom, this, this.b, definedstructuremanager, i, chunkcoordintpair, biomebase, j, structuresettingsfeature);
|
||||
structuremanager.a(SectionPosition.a((ChunkCoordIntPair) ichunkaccess.getPos(), (int) 0), structurefeature.d, structurestart1, (IStructureAccess) ichunkaccess);
|
||||
}
|
||||
}
|
||||
|
||||
public void storeStructures(GeneratorAccessSeed generatoraccessseed, StructureManager structuremanager, IChunkAccess ichunkaccess)
|
||||
{
|
||||
int i = ichunkaccess.getPos().x;
|
||||
int j = ichunkaccess.getPos().z;
|
||||
int k = i << 4;
|
||||
int l = j << 4;
|
||||
SectionPosition sectionposition = SectionPosition.a((ChunkCoordIntPair) ichunkaccess.getPos(), (int) 0);
|
||||
int i1 = i - 8;
|
||||
while(i1 <= i + 8)
|
||||
{
|
||||
int j1 = j - 8;
|
||||
while(j1 <= j + 8)
|
||||
{
|
||||
long k1 = ChunkCoordIntPair.pair((int) i1, (int) j1);
|
||||
for(StructureStart<?> structurestart : generatoraccessseed.getChunkAt(i1, j1).h().values())
|
||||
{
|
||||
try
|
||||
{
|
||||
if(structurestart == StructureStart.a || !structurestart.c().a(k, l, k + 15, l + 15))
|
||||
continue;
|
||||
structuremanager.a(sectionposition, structurestart.l(), k1, (IStructureAccess) ichunkaccess);
|
||||
PacketDebug.a((GeneratorAccessSeed) generatoraccessseed, (StructureStart<?>) structurestart);
|
||||
}
|
||||
catch(Exception exception)
|
||||
{
|
||||
CrashReport crashreport = CrashReport.a((Throwable) exception, (String) "Generating structure reference");
|
||||
CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Structure");
|
||||
crashreportsystemdetails.a("Name", () -> structurestart.l().i());
|
||||
crashreportsystemdetails.a("Class", () -> structurestart.l().getClass().getCanonicalName());
|
||||
throw new ReportedException(crashreport);
|
||||
}
|
||||
}
|
||||
++j1;
|
||||
}
|
||||
++i1;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public Provisioned getProvisioned()
|
||||
{
|
||||
return provisioned;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void clearRegeneratedLists()
|
||||
{
|
||||
getProvisioned().clearRegeneratedLists();
|
||||
}
|
||||
|
||||
@Override
|
||||
public TerrainProvider getProvider()
|
||||
{
|
||||
return getProvisioned().getProvider();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void regenerate(int x, int z)
|
||||
{
|
||||
getProvisioned().regenerate(x, z);
|
||||
}
|
||||
}
|
||||
@@ -1,302 +0,0 @@
|
||||
package com.volmit.iris.gen.nms.v16_2;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.lang.reflect.Field;
|
||||
import java.lang.reflect.Modifier;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
import java.util.Properties;
|
||||
|
||||
import org.apache.commons.lang.Validate;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.WorldCreator;
|
||||
import org.bukkit.World.Environment;
|
||||
import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
|
||||
import org.bukkit.event.Event;
|
||||
import org.bukkit.event.world.WorldInitEvent;
|
||||
import org.bukkit.event.world.WorldLoadEvent;
|
||||
|
||||
import com.google.common.base.Preconditions;
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.google.common.collect.ImmutableSet;
|
||||
import com.mojang.serialization.DynamicOps;
|
||||
import com.mojang.serialization.Lifecycle;
|
||||
import com.volmit.iris.gen.nms.INMSCreator;
|
||||
import com.volmit.iris.gen.scaffold.IrisWorlds;
|
||||
import com.volmit.iris.gen.scaffold.Provisioned;
|
||||
import com.volmit.iris.util.O;
|
||||
import com.volmit.iris.util.V;
|
||||
|
||||
import io.papermc.lib.PaperLib;
|
||||
import net.minecraft.server.v1_16_R2.BiomeBase;
|
||||
import net.minecraft.server.v1_16_R2.BiomeManager;
|
||||
import net.minecraft.server.v1_16_R2.Convertable;
|
||||
import net.minecraft.server.v1_16_R2.DataConverterRegistry;
|
||||
import net.minecraft.server.v1_16_R2.DedicatedServer;
|
||||
import net.minecraft.server.v1_16_R2.DimensionManager;
|
||||
import net.minecraft.server.v1_16_R2.DynamicOpsNBT;
|
||||
import net.minecraft.server.v1_16_R2.EnumDifficulty;
|
||||
import net.minecraft.server.v1_16_R2.EnumGamemode;
|
||||
import net.minecraft.server.v1_16_R2.GameRules;
|
||||
import net.minecraft.server.v1_16_R2.GeneratorSettingBase;
|
||||
import net.minecraft.server.v1_16_R2.GeneratorSettings;
|
||||
import net.minecraft.server.v1_16_R2.IRegistry;
|
||||
import net.minecraft.server.v1_16_R2.IRegistryCustom.Dimension;
|
||||
import net.minecraft.server.v1_16_R2.IWorldDataServer;
|
||||
import net.minecraft.server.v1_16_R2.MinecraftKey;
|
||||
import net.minecraft.server.v1_16_R2.MinecraftServer;
|
||||
import net.minecraft.server.v1_16_R2.MobSpawner;
|
||||
import net.minecraft.server.v1_16_R2.MobSpawnerCat;
|
||||
import net.minecraft.server.v1_16_R2.MobSpawnerPatrol;
|
||||
import net.minecraft.server.v1_16_R2.MobSpawnerPhantom;
|
||||
import net.minecraft.server.v1_16_R2.MobSpawnerTrader;
|
||||
import net.minecraft.server.v1_16_R2.NBTBase;
|
||||
import net.minecraft.server.v1_16_R2.RegistryReadOps;
|
||||
import net.minecraft.server.v1_16_R2.ResourceKey;
|
||||
import net.minecraft.server.v1_16_R2.SaveData;
|
||||
import net.minecraft.server.v1_16_R2.VillageSiege;
|
||||
import net.minecraft.server.v1_16_R2.WorldChunkManager;
|
||||
import net.minecraft.server.v1_16_R2.WorldChunkManagerOverworld;
|
||||
import net.minecraft.server.v1_16_R2.WorldDataServer;
|
||||
import net.minecraft.server.v1_16_R2.WorldDimension;
|
||||
import net.minecraft.server.v1_16_R2.WorldServer;
|
||||
import net.minecraft.server.v1_16_R2.WorldSettings;
|
||||
|
||||
class NMSCreator16_2 implements INMSCreator
|
||||
{
|
||||
@SuppressWarnings({"unchecked", "rawtypes", "resource"})
|
||||
public World createWorld(WorldCreator creator, boolean loadSpawn)
|
||||
{
|
||||
if(!creator.environment().equals(Environment.NORMAL))
|
||||
{
|
||||
return creator.createWorld();
|
||||
}
|
||||
|
||||
Provisioned pro = (Provisioned) creator.generator();
|
||||
CraftServer server = ((CraftServer) Bukkit.getServer());
|
||||
Map<String, World> worlds = new V(server).get("worlds");
|
||||
DedicatedServer console = new V(server).get("console");
|
||||
Preconditions.checkState(!console.worldServer.isEmpty(), (Object) "Cannot create additional worlds on STARTUP");
|
||||
Validate.notNull((Object) creator, "Creator may not be null");
|
||||
final String name = creator.name();
|
||||
org.bukkit.generator.ChunkGenerator generator = creator.generator();
|
||||
final File folder = new File(server.getWorldContainer(), name);
|
||||
final World world = server.getWorld(name);
|
||||
|
||||
if(world != null)
|
||||
{
|
||||
return world;
|
||||
}
|
||||
|
||||
if(folder.exists() && !folder.isDirectory())
|
||||
{
|
||||
throw new IllegalArgumentException("File exists with the name '" + name + "' and isn't a folder");
|
||||
}
|
||||
|
||||
if(generator == null)
|
||||
{
|
||||
generator = server.getGenerator(name);
|
||||
}
|
||||
|
||||
ResourceKey<WorldDimension> actualDimension = null;
|
||||
switch(creator.environment())
|
||||
{
|
||||
case NORMAL:
|
||||
{
|
||||
actualDimension = (ResourceKey<WorldDimension>) WorldDimension.OVERWORLD;
|
||||
break;
|
||||
}
|
||||
case NETHER:
|
||||
{
|
||||
actualDimension = (ResourceKey<WorldDimension>) WorldDimension.THE_NETHER;
|
||||
break;
|
||||
}
|
||||
case THE_END:
|
||||
{
|
||||
actualDimension = (ResourceKey<WorldDimension>) WorldDimension.THE_END;
|
||||
break;
|
||||
}
|
||||
default:
|
||||
{
|
||||
throw new IllegalArgumentException("Illegal dimension");
|
||||
}
|
||||
}
|
||||
Convertable.ConversionSession worldSession;
|
||||
try
|
||||
{
|
||||
worldSession = Convertable.a(server.getWorldContainer().toPath()).c(name, (ResourceKey) actualDimension);
|
||||
}
|
||||
catch(IOException ex)
|
||||
{
|
||||
throw new RuntimeException(ex);
|
||||
}
|
||||
MinecraftServer.convertWorld(worldSession);
|
||||
final boolean hardcore = creator.hardcore();
|
||||
final RegistryReadOps<NBTBase> registryreadops = (RegistryReadOps<NBTBase>) RegistryReadOps.a((DynamicOps) DynamicOpsNBT.a, console.dataPackResources.h(), getConsoleDimension(console));
|
||||
WorldDataServer worlddata = (WorldDataServer) worldSession.a((DynamicOps) registryreadops, console.datapackconfiguration);
|
||||
if(worlddata == null)
|
||||
{
|
||||
final Properties properties = new Properties();
|
||||
properties.put("generator-settings", Objects.toString(creator.generatorSettings()));
|
||||
properties.put("level-seed", Objects.toString(creator.seed()));
|
||||
properties.put("generate-structures", Objects.toString(creator.generateStructures()));
|
||||
properties.put("level-type", Objects.toString(creator.type().getName()));
|
||||
final GeneratorSettings generatorsettings = GeneratorSettings.a(getConsoleDimension(console), properties);
|
||||
@SuppressWarnings("deprecation")
|
||||
final WorldSettings worldSettings = new WorldSettings(name, EnumGamemode.getById(server.getDefaultGameMode().getValue()), hardcore, EnumDifficulty.EASY, false, new GameRules(), console.datapackconfiguration);
|
||||
worlddata = new WorldDataServer(worldSettings, generatorsettings, Lifecycle.stable());
|
||||
}
|
||||
worlddata.checkName(name);
|
||||
worlddata.a(console.getServerModName(), console.getModded().isPresent());
|
||||
if(console.options.has("forceUpgrade"))
|
||||
{
|
||||
net.minecraft.server.v1_16_R2.Main.convertWorld(worldSession, DataConverterRegistry.a(), console.options.has("eraseCache"), () -> true, (ImmutableSet) worlddata.getGeneratorSettings().d().d().stream().map(entry -> ResourceKey.a(IRegistry.K, entry.getKey().a())).collect(ImmutableSet.toImmutableSet()));
|
||||
}
|
||||
final long j = BiomeManager.a(creator.seed());
|
||||
final List<MobSpawner> list = (List<MobSpawner>) ImmutableList.of((MobSpawner) new MobSpawnerPhantom(), (MobSpawner) new MobSpawnerPatrol(), (MobSpawner) new MobSpawnerCat(), (MobSpawner) new VillageSiege(), (MobSpawner) new MobSpawnerTrader((IWorldDataServer) worlddata));
|
||||
DimensionManager dimensionmanager;
|
||||
net.minecraft.server.v1_16_R2.ChunkGenerator chunkgenerator;
|
||||
long ll = creator.seed();
|
||||
dimensionmanager = (DimensionManager) getConsoleDimension(console).a().d(DimensionManager.OVERWORLD);
|
||||
O<WorldServer> ws = new O<WorldServer>();
|
||||
chunkgenerator = PaperLib.isPaper() ? new NMSChunkGenerator16_2_PAPER(pro, ws, (WorldChunkManager) new WorldChunkManagerOverworld(ll, false, false, (IRegistry<BiomeBase>) getConsoleDimension(console).b(IRegistry.ay)), ll, () -> (GeneratorSettingBase) getConsoleDimension(console).b(IRegistry.ar).d(GeneratorSettingBase.c)) : new NMSChunkGenerator16_2_SPIGOT(pro, ws, (WorldChunkManager) new WorldChunkManagerOverworld(ll, false, false, (IRegistry<BiomeBase>) getConsoleDimension(console).b(IRegistry.ay)), ll, () -> (GeneratorSettingBase) getConsoleDimension(console).b(IRegistry.ar).d(GeneratorSettingBase.c));
|
||||
final ResourceKey<net.minecraft.server.v1_16_R2.World> worldKey = (ResourceKey<net.minecraft.server.v1_16_R2.World>) ResourceKey.a(IRegistry.L, new MinecraftKey(name.toLowerCase(Locale.ENGLISH)));
|
||||
//@builder
|
||||
final WorldServer internal = new WorldServer((MinecraftServer) console,
|
||||
console.executorService, worldSession,
|
||||
(IWorldDataServer) worlddata,
|
||||
(ResourceKey) worldKey,
|
||||
dimensionmanager,
|
||||
server.getServer().worldLoadListenerFactory.create(11),
|
||||
chunkgenerator,
|
||||
worlddata.getGeneratorSettings().isDebugWorld(),
|
||||
j,
|
||||
(List) ((creator.environment() == World.Environment.NORMAL) ? list : ImmutableList.of()),
|
||||
true,
|
||||
creator.environment(),
|
||||
server.getGenerator(name));
|
||||
//@done
|
||||
IrisWorlds.register(internal.getWorld(), pro);
|
||||
ws.set(internal);
|
||||
if(!worlds.containsKey(name.toLowerCase(Locale.ENGLISH)))
|
||||
{
|
||||
try
|
||||
{
|
||||
internal.close();
|
||||
}
|
||||
|
||||
catch(IOException e)
|
||||
{
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
console.initWorld(internal, (IWorldDataServer) worlddata, (SaveData) worlddata, worlddata.getGeneratorSettings());
|
||||
internal.setSpawnFlags(true, true);
|
||||
console.worldServer.put(internal.getDimensionKey(), internal);
|
||||
server.getPluginManager().callEvent((Event) new WorldInitEvent((World) internal.getWorld()));
|
||||
|
||||
if(loadSpawn)
|
||||
{
|
||||
server.getServer().loadSpawn(internal.getChunkProvider().playerChunkMap.worldLoadListener, internal);
|
||||
}
|
||||
|
||||
else
|
||||
{
|
||||
MinecraftServer.LOGGER.info("Preparing start region for dimens... Oh wait, We don't do that here anymore.");
|
||||
}
|
||||
|
||||
server.getPluginManager().callEvent((Event) new WorldLoadEvent((World) internal.getWorld()));
|
||||
return (World) internal.getWorld();
|
||||
}
|
||||
|
||||
private Dimension getConsoleDimension(DedicatedServer console)
|
||||
{
|
||||
Dimension dim = null;
|
||||
|
||||
try
|
||||
{
|
||||
dim = new V((MinecraftServer) console, true).get("customRegistry");
|
||||
|
||||
if(dim != null)
|
||||
{
|
||||
return dim;
|
||||
}
|
||||
}
|
||||
|
||||
catch(Throwable e)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
dim = new V((MinecraftServer) console, true).get("f");
|
||||
|
||||
if(dim != null)
|
||||
{
|
||||
return dim;
|
||||
}
|
||||
}
|
||||
|
||||
catch(Throwable e)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
for(Field i : MinecraftServer.class.getDeclaredFields())
|
||||
{
|
||||
if(i.getType().equals(dim.getClass()))
|
||||
{
|
||||
i.setAccessible(true);
|
||||
|
||||
if(Modifier.isStatic(i.getModifiers()))
|
||||
{
|
||||
try
|
||||
{
|
||||
return (Dimension) i.get(null);
|
||||
}
|
||||
|
||||
catch(Throwable e)
|
||||
{
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
else
|
||||
{
|
||||
try
|
||||
{
|
||||
return (Dimension) i.get((MinecraftServer) console);
|
||||
}
|
||||
|
||||
catch(Throwable e)
|
||||
{
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(dim == null)
|
||||
{
|
||||
try
|
||||
{
|
||||
throw new RuntimeException("Cannot find dimension field!");
|
||||
}
|
||||
|
||||
catch(Throwable e)
|
||||
{
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
return dim;
|
||||
}
|
||||
}
|
||||
@@ -1,16 +0,0 @@
|
||||
package com.volmit.iris.gen.nms.v16_3;
|
||||
|
||||
import com.volmit.iris.gen.atomics.AtomicCache;
|
||||
import com.volmit.iris.gen.nms.INMSBinding;
|
||||
import com.volmit.iris.gen.nms.INMSCreator;
|
||||
|
||||
public class NMSBinding16_3 implements INMSBinding
|
||||
{
|
||||
private final AtomicCache<INMSCreator> creator = new AtomicCache<>();
|
||||
|
||||
@Override
|
||||
public INMSCreator getCreator()
|
||||
{
|
||||
return creator.aquire(NMSCreator16_3::new);
|
||||
}
|
||||
}
|
||||
@@ -1,688 +0,0 @@
|
||||
package com.volmit.iris.gen.nms.v16_3;
|
||||
|
||||
import com.mojang.serialization.Codec;
|
||||
import com.volmit.iris.gen.IrisTerrainProvider;
|
||||
import com.volmit.iris.gen.provisions.ProvisionBukkit;
|
||||
import com.volmit.iris.gen.scaffold.GeneratedChunk;
|
||||
import com.volmit.iris.gen.scaffold.Provisioned;
|
||||
import com.volmit.iris.gen.scaffold.ProvisionedHolder;
|
||||
import com.volmit.iris.gen.scaffold.TerrainProvider;
|
||||
import com.volmit.iris.util.O;
|
||||
import com.volmit.iris.util.V;
|
||||
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
|
||||
import it.unimi.dsi.fastutil.objects.ObjectList;
|
||||
import net.minecraft.server.v1_16_R3.*;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.block.Biome;
|
||||
import org.bukkit.block.data.BlockData;
|
||||
import org.bukkit.craftbukkit.v1_16_R3.block.CraftBlock;
|
||||
import org.bukkit.craftbukkit.v1_16_R3.block.data.CraftBlockData;
|
||||
import org.bukkit.craftbukkit.v1_16_R3.util.CraftMagicNumbers;
|
||||
import org.bukkit.generator.ChunkGenerator.BiomeGrid;
|
||||
import org.bukkit.generator.ChunkGenerator.ChunkData;
|
||||
import org.bukkit.material.MaterialData;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.function.Supplier;
|
||||
|
||||
@SuppressWarnings("deprecation")
|
||||
public class NMSChunkGenerator16_3_PAPER extends ChunkGenerator implements ProvisionedHolder
|
||||
{
|
||||
private static final IBlockData k = Blocks.AIR.getBlockData();
|
||||
private final Provisioned provisioned;
|
||||
private final int maxHeight;
|
||||
private final int xzSize;
|
||||
protected final IBlockData f;
|
||||
protected final IBlockData g;
|
||||
private final long w;
|
||||
protected final Supplier<GeneratorSettingBase> h;
|
||||
private final O<WorldServer> ws;
|
||||
private BlockColumn BC;
|
||||
|
||||
public NMSChunkGenerator16_3_PAPER(Provisioned p, O<WorldServer> ws, WorldChunkManager worldchunkmanager, long i, Supplier<GeneratorSettingBase> supplier)
|
||||
{
|
||||
this(p, ws, worldchunkmanager, worldchunkmanager, i, supplier);
|
||||
}
|
||||
|
||||
private NMSChunkGenerator16_3_PAPER(Provisioned p, O<WorldServer> ws, WorldChunkManager worldchunkmanager, WorldChunkManager worldchunkmanager1, long i, Supplier<GeneratorSettingBase> supplier)
|
||||
{
|
||||
super(worldchunkmanager, worldchunkmanager1, supplier.get().a(), i);
|
||||
this.provisioned = p;
|
||||
this.ws = ws;
|
||||
this.w = i;
|
||||
GeneratorSettingBase generatorsettingbase = supplier.get();
|
||||
|
||||
this.h = supplier;
|
||||
NoiseSettings noisesettings = generatorsettingbase.b();
|
||||
|
||||
this.maxHeight = noisesettings.f() * 4;
|
||||
this.f = generatorsettingbase.c();
|
||||
this.g = generatorsettingbase.d();
|
||||
this.xzSize = noisesettings.a() / this.maxHeight;
|
||||
BC = new BlockColumn(new IBlockData[this.xzSize * this.maxHeight]);
|
||||
}
|
||||
|
||||
public int getSpawnHeight()
|
||||
{
|
||||
return getSeaLevel() + 8;
|
||||
}
|
||||
|
||||
public WorldChunkManager getWorldChunkManager()
|
||||
{
|
||||
return this.c;
|
||||
}
|
||||
|
||||
public int getGenerationDepth()
|
||||
{
|
||||
return 256;
|
||||
}
|
||||
|
||||
public void doCarving(long i, BiomeManager biomemanager, IChunkAccess ichunkaccess, WorldGenStage.Features worldgenstage_features)
|
||||
{
|
||||
if(((IrisTerrainProvider) provisioned.getProvider()).getDimension().isVanillaCaves())
|
||||
{
|
||||
super.doCarving(i, biomemanager, ichunkaccess, worldgenstage_features);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Codec<? extends ChunkGenerator> a()
|
||||
{
|
||||
return ChunkGeneratorAbstract.d;
|
||||
}
|
||||
|
||||
public boolean a(long i, ResourceKey<GeneratorSettingBase> resourcekey)
|
||||
{
|
||||
return this.w == i && this.h.get().a(resourcekey);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getBaseHeight(int i, int j, HeightMap.Type heightmap_type)
|
||||
{
|
||||
return 63;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IBlockAccess a(int x, int z)
|
||||
{
|
||||
return BC;
|
||||
}
|
||||
|
||||
protected IBlockData a(double d0, int i)
|
||||
{
|
||||
IBlockData iblockdata;
|
||||
|
||||
if(d0 > 0.0D)
|
||||
{
|
||||
iblockdata = this.f;
|
||||
}
|
||||
else if(i < this.getSeaLevel())
|
||||
{
|
||||
iblockdata = this.g;
|
||||
}
|
||||
else
|
||||
{
|
||||
iblockdata = NMSChunkGenerator16_3_PAPER.k;
|
||||
}
|
||||
|
||||
return iblockdata;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void buildBase(RegionLimitedWorldAccess regionlimitedworldaccess, IChunkAccess ichunkaccess)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void buildNoise(GeneratorAccess generatoraccess, StructureManager structuremanager, IChunkAccess ichunkaccess)
|
||||
{
|
||||
ObjectList<StructurePiece> objectlist = new ObjectArrayList<StructurePiece>(10);
|
||||
ObjectList<WorldGenFeatureDefinedStructureJigsawJunction> objectlist1 = new ObjectArrayList<WorldGenFeatureDefinedStructureJigsawJunction>(32);
|
||||
ChunkCoordIntPair chunkcoordintpair = ichunkaccess.getPos();
|
||||
int i = chunkcoordintpair.x;
|
||||
int j = chunkcoordintpair.z;
|
||||
|
||||
if(((IrisTerrainProvider) provisioned.getProvider()).shouldGenerateVanillaStructures())
|
||||
{
|
||||
int k = i << 4;
|
||||
int l = j << 4;
|
||||
Iterator<?> iterator = StructureGenerator.t.iterator();
|
||||
|
||||
while(iterator.hasNext())
|
||||
{
|
||||
StructureGenerator<?> structuregenerator = (StructureGenerator<?>) iterator.next();
|
||||
|
||||
structuremanager.a(SectionPosition.a(chunkcoordintpair, 0), structuregenerator).forEach((structurestart) ->
|
||||
{
|
||||
Iterator<?> iterator1 = structurestart.d().iterator();
|
||||
|
||||
while(iterator1.hasNext())
|
||||
{
|
||||
StructurePiece structurepiece = (StructurePiece) iterator1.next();
|
||||
|
||||
if(structurepiece.a(chunkcoordintpair, 12))
|
||||
{
|
||||
if(structurepiece instanceof WorldGenFeaturePillagerOutpostPoolPiece)
|
||||
{
|
||||
WorldGenFeaturePillagerOutpostPoolPiece worldgenfeaturepillageroutpostpoolpiece = (WorldGenFeaturePillagerOutpostPoolPiece) structurepiece;
|
||||
WorldGenFeatureDefinedStructurePoolTemplate.Matching worldgenfeaturedefinedstructurepooltemplate_matching = worldgenfeaturepillageroutpostpoolpiece.b().e();
|
||||
|
||||
if(worldgenfeaturedefinedstructurepooltemplate_matching == WorldGenFeatureDefinedStructurePoolTemplate.Matching.RIGID)
|
||||
{
|
||||
objectlist.add(worldgenfeaturepillageroutpostpoolpiece);
|
||||
}
|
||||
|
||||
Iterator<?> iterator2 = worldgenfeaturepillageroutpostpoolpiece.e().iterator();
|
||||
|
||||
while(iterator2.hasNext())
|
||||
{
|
||||
WorldGenFeatureDefinedStructureJigsawJunction worldgenfeaturedefinedstructurejigsawjunction = (WorldGenFeatureDefinedStructureJigsawJunction) iterator2.next();
|
||||
int i1 = worldgenfeaturedefinedstructurejigsawjunction.a();
|
||||
int j1 = worldgenfeaturedefinedstructurejigsawjunction.c();
|
||||
|
||||
if(i1 > k - 12 && j1 > l - 12 && i1 < k + 15 + 12 && j1 < l + 15 + 12)
|
||||
{
|
||||
objectlist1.add(worldgenfeaturedefinedstructurejigsawjunction);
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
objectlist.add(structurepiece);
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
ProtoChunk protochunk = (ProtoChunk) ichunkaccess;
|
||||
HeightMap heightmap = protochunk.a(HeightMap.Type.OCEAN_FLOOR_WG);
|
||||
HeightMap heightmap1 = protochunk.a(HeightMap.Type.WORLD_SURFACE_WG);
|
||||
GeneratedChunk gc = ((ProvisionBukkit) provisioned).generateNMSChunkData(ws.get().getWorld(), new Random(i + j), i, j, new ChunkData()
|
||||
{
|
||||
public int getMaxHeight()
|
||||
{
|
||||
return 256;
|
||||
}
|
||||
|
||||
public void setBlock(int x, int y, int z, Material material)
|
||||
{
|
||||
this.setBlock(x, y, z, material.createBlockData());
|
||||
}
|
||||
|
||||
public void setBlock(int x, int y, int z, MaterialData material)
|
||||
{
|
||||
this.setBlock(x, y, z, CraftMagicNumbers.getBlock((MaterialData) material));
|
||||
}
|
||||
|
||||
public void setBlock(int x, int y, int z, BlockData blockData)
|
||||
{
|
||||
this.setBlock(x, y, z, ((CraftBlockData) blockData).getState());
|
||||
}
|
||||
|
||||
public void setRegion(int xMin, int yMin, int zMin, int xMax, int yMax, int zMax, Material material)
|
||||
{
|
||||
this.setRegion(xMin, yMin, zMin, xMax, yMax, zMax, material.createBlockData());
|
||||
}
|
||||
|
||||
public void setRegion(int xMin, int yMin, int zMin, int xMax, int yMax, int zMax, MaterialData material)
|
||||
{
|
||||
this.setRegion(xMin, yMin, zMin, xMax, yMax, zMax, CraftMagicNumbers.getBlock((MaterialData) material));
|
||||
}
|
||||
|
||||
public void setRegion(int xMin, int yMin, int zMin, int xMax, int yMax, int zMax, BlockData blockData)
|
||||
{
|
||||
this.setRegion(xMin, yMin, zMin, xMax, yMax, zMax, ((CraftBlockData) blockData).getState());
|
||||
}
|
||||
|
||||
public Material getType(int x, int y, int z)
|
||||
{
|
||||
return CraftMagicNumbers.getMaterial((Block) this.getTypeId(x, y, z).getBlock());
|
||||
}
|
||||
|
||||
public MaterialData getTypeAndData(int x, int y, int z)
|
||||
{
|
||||
return CraftMagicNumbers.getMaterial((IBlockData) this.getTypeId(x, y, z));
|
||||
}
|
||||
|
||||
public BlockData getBlockData(int x, int y, int z)
|
||||
{
|
||||
return CraftBlockData.fromData((IBlockData) this.getTypeId(x, y, z));
|
||||
}
|
||||
|
||||
public void setRegion(int xMin, int yMin, int zMin, int xMax, int yMax, int zMax, IBlockData type)
|
||||
{
|
||||
if(xMin > 15 || yMin >= getMaxHeight() || zMin > 15)
|
||||
{
|
||||
return;
|
||||
}
|
||||
if(xMin < 0)
|
||||
{
|
||||
xMin = 0;
|
||||
}
|
||||
if(yMin < 0)
|
||||
{
|
||||
yMin = 0;
|
||||
}
|
||||
if(zMin < 0)
|
||||
{
|
||||
zMin = 0;
|
||||
}
|
||||
if(xMax > 16)
|
||||
{
|
||||
xMax = 16;
|
||||
}
|
||||
if(yMax > getMaxHeight())
|
||||
{
|
||||
yMax = getMaxHeight();
|
||||
}
|
||||
if(zMax > 16)
|
||||
{
|
||||
zMax = 16;
|
||||
}
|
||||
if(xMin >= xMax || yMin >= yMax || zMin >= zMax)
|
||||
{
|
||||
return;
|
||||
}
|
||||
int y = yMin;
|
||||
while(y < yMax)
|
||||
{
|
||||
int x = xMin;
|
||||
while(x < xMax)
|
||||
{
|
||||
int z = zMin;
|
||||
while(z < zMax)
|
||||
{
|
||||
protochunk.setType(new BlockPosition(x, y, z), type, false);
|
||||
++z;
|
||||
}
|
||||
++x;
|
||||
}
|
||||
++y;
|
||||
}
|
||||
}
|
||||
|
||||
public IBlockData getTypeId(int x, int y, int z)
|
||||
{
|
||||
if(x != (x & 15) || y < 0 || y >= getMaxHeight() || z != (z & 15))
|
||||
{
|
||||
return Blocks.AIR.getBlockData();
|
||||
}
|
||||
return protochunk.getType(new BlockPosition(x, y, z));
|
||||
}
|
||||
|
||||
public byte getData(int x, int y, int z)
|
||||
{
|
||||
return CraftMagicNumbers.toLegacyData((IBlockData) this.getTypeId(x, y, z));
|
||||
}
|
||||
|
||||
private void setBlock(int x, int y, int z, IBlockData type)
|
||||
{
|
||||
if(x != (x & 15) || y < 0 || y >= getMaxHeight() || z != (z & 15))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
protochunk.setType(new BlockPosition(x, y, z), type, false);
|
||||
|
||||
if(type.getBlock().isTileEntity())
|
||||
{
|
||||
// if (this.tiles == null) {
|
||||
// this.tiles = new HashSet<BlockPosition>();
|
||||
// }
|
||||
// this.tiles.add(new BlockPosition(x, y, z));
|
||||
}
|
||||
}
|
||||
}, new BiomeGrid()
|
||||
{
|
||||
@Override
|
||||
public void setBiome(int x, int y, int z, Biome bio)
|
||||
{
|
||||
protochunk.getBiomeIndex().setBiome(x, y, z, CraftBlock.biomeToBiomeBase(ws.get().r().b(IRegistry.ay), bio));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setBiome(int x, int z, Biome bio)
|
||||
{
|
||||
protochunk.getBiomeIndex().setBiome(x, 0, z, CraftBlock.biomeToBiomeBase(ws.get().r().b(IRegistry.ay), bio));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Biome getBiome(int x, int y, int z)
|
||||
{
|
||||
return CraftBlock.biomeBaseToBiome(ws.get().r().b(IRegistry.ay), protochunk.getBiomeIndex().getBiome(x, y, z));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Biome getBiome(int x, int z)
|
||||
{
|
||||
return CraftBlock.biomeBaseToBiome(ws.get().r().b(IRegistry.ay), protochunk.getBiomeIndex().getBiome(x, 0, z));
|
||||
}
|
||||
});
|
||||
|
||||
for(int xx = 0; xx < 16; xx++)
|
||||
{
|
||||
for(int zz = 0; zz < 16; zz++)
|
||||
{
|
||||
try
|
||||
{
|
||||
int y = gc.getHeight().getHeight(xx, zz);
|
||||
if(y < getSeaLevel())
|
||||
{
|
||||
heightmap.a(xx, y, zz, Blocks.STONE.getBlockData());
|
||||
}
|
||||
heightmap1.a(xx, Math.max(y, getSeaLevel()), zz, Blocks.STONE.getBlockData());
|
||||
}
|
||||
|
||||
catch(Throwable e)
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void addDecorations(RegionLimitedWorldAccess regionlimitedworldaccess, StructureManager structuremanager)
|
||||
{
|
||||
if(((IrisTerrainProvider) provisioned.getProvider()).shouldGenerateVanillaStructures())
|
||||
{
|
||||
int i = regionlimitedworldaccess.a();
|
||||
int j = regionlimitedworldaccess.b();
|
||||
int k = i * 16;
|
||||
int l = j * 16;
|
||||
BlockPosition blockposition = new BlockPosition(k, 0, l);
|
||||
BiomeBase biomebase = this.b.getBiome((i << 2) + 2, 2, (j << 2) + 2);
|
||||
SeededRandom seededrandom = new SeededRandom();
|
||||
long i1 = seededrandom.a(regionlimitedworldaccess.getSeed(), k, l);
|
||||
try
|
||||
{
|
||||
a(biomebase, structuremanager, this, regionlimitedworldaccess, i1, seededrandom, blockposition);
|
||||
}
|
||||
catch(Exception exception)
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void a(BiomeBase bbase, StructureManager var0, ChunkGenerator var1, RegionLimitedWorldAccess var2, long var3, SeededRandom var5, BlockPosition var6)
|
||||
{
|
||||
if(!((IrisTerrainProvider) provisioned.getProvider()).shouldGenerateVanillaStructures())
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
int stages = WorldGenStage.Decoration.values().length;
|
||||
for(int stage = 0; stage < stages; ++stage)
|
||||
{
|
||||
WorldGenStage.Decoration st = WorldGenStage.Decoration.values()[stage];
|
||||
|
||||
if(st.equals(WorldGenStage.Decoration.LAKES))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if(st.equals(WorldGenStage.Decoration.LOCAL_MODIFICATIONS))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if(st.equals(WorldGenStage.Decoration.RAW_GENERATION))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if(st.equals(WorldGenStage.Decoration.TOP_LAYER_MODIFICATION))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if(st.equals(WorldGenStage.Decoration.UNDERGROUND_DECORATION))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if(st.equals(WorldGenStage.Decoration.UNDERGROUND_ORES))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if(st.equals(WorldGenStage.Decoration.VEGETAL_DECORATION))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
StructureGenerator<?> var13;
|
||||
int var10 = 0;
|
||||
if(var0.a())
|
||||
{
|
||||
@SuppressWarnings("unchecked")
|
||||
List<StructureGenerator<?>> structureGenerators = ((Map<Integer, List<StructureGenerator<?>>>) new V(bbase).get("g")).getOrDefault(stage, Collections.emptyList());
|
||||
Iterator<StructureGenerator<?>> iterator = structureGenerators.iterator();
|
||||
while(iterator.hasNext())
|
||||
{
|
||||
var13 = (StructureGenerator<?>) iterator.next();
|
||||
|
||||
if(var13.equals(StructureGenerator.VILLAGE))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if(var13.equals(StructureGenerator.JUNGLE_PYRAMID))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if(var13.equals(StructureGenerator.IGLOO))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if(var13.equals(StructureGenerator.MINESHAFT))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if(var13.equals(StructureGenerator.NETHER_FOSSIL))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if(var13.equals(StructureGenerator.SHIPWRECK))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if(var13.equals(StructureGenerator.SHIPWRECK))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if(var13.equals(StructureGenerator.MONUMENT))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if(var13.equals(StructureGenerator.OCEAN_RUIN))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if(var13.equals(StructureGenerator.BASTION_REMNANT))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
var5.b(var3, var10, stage);
|
||||
int var14 = var6.getX() >> 4;
|
||||
int var15 = var6.getZ() >> 4;
|
||||
int var16 = var14 << 4;
|
||||
int var17 = var15 << 4;
|
||||
|
||||
try
|
||||
{
|
||||
var0.a(SectionPosition.a((BlockPosition) var6), var13).forEach(var8 -> var8.a((GeneratorAccessSeed) var2, var0, var1, (Random) var5, new StructureBoundingBox(var16, var17, var16 + 15, var17 + 15), new ChunkCoordIntPair(var14, var15)));
|
||||
}
|
||||
|
||||
catch(Exception var18)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
++var10;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getSeaLevel()
|
||||
{
|
||||
return ((IrisTerrainProvider) provisioned.getProvider()).getFluidHeight();
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<BiomeSettingsMobs.c> getMobsFor(BiomeBase biomebase, StructureManager structuremanager, EnumCreatureType enumcreaturetype, BlockPosition blockposition)
|
||||
{
|
||||
if(structuremanager.a(blockposition, true, StructureGenerator.SWAMP_HUT).e())
|
||||
{
|
||||
if(enumcreaturetype == EnumCreatureType.MONSTER)
|
||||
{
|
||||
return StructureGenerator.SWAMP_HUT.c();
|
||||
}
|
||||
|
||||
if(enumcreaturetype == EnumCreatureType.CREATURE)
|
||||
{
|
||||
return StructureGenerator.SWAMP_HUT.j();
|
||||
}
|
||||
}
|
||||
|
||||
if(enumcreaturetype == EnumCreatureType.MONSTER)
|
||||
{
|
||||
if(structuremanager.a(blockposition, false, StructureGenerator.PILLAGER_OUTPOST).e())
|
||||
{
|
||||
return StructureGenerator.PILLAGER_OUTPOST.c();
|
||||
}
|
||||
|
||||
if(structuremanager.a(blockposition, false, StructureGenerator.MONUMENT).e())
|
||||
{
|
||||
return StructureGenerator.MONUMENT.c();
|
||||
}
|
||||
|
||||
if(structuremanager.a(blockposition, true, StructureGenerator.FORTRESS).e())
|
||||
{
|
||||
return StructureGenerator.FORTRESS.c();
|
||||
}
|
||||
}
|
||||
|
||||
return super.getMobsFor(biomebase, structuremanager, enumcreaturetype, blockposition);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addMobs(RegionLimitedWorldAccess regionlimitedworldaccess)
|
||||
{
|
||||
int i = regionlimitedworldaccess.a();
|
||||
int j = regionlimitedworldaccess.b();
|
||||
BiomeBase biomebase = regionlimitedworldaccess.getBiome((new ChunkCoordIntPair(i, j)).l());
|
||||
SeededRandom seededrandom = new SeededRandom();
|
||||
seededrandom.a(regionlimitedworldaccess.getSeed(), i << 4, j << 4);
|
||||
SpawnerCreature.a(regionlimitedworldaccess, biomebase, i, j, seededrandom);
|
||||
}
|
||||
|
||||
public void createStructures(IRegistryCustom iregistrycustom, StructureManager structuremanager, IChunkAccess ichunkaccess, DefinedStructureManager definedstructuremanager, long i)
|
||||
{
|
||||
ChunkCoordIntPair chunkcoordintpair = ichunkaccess.getPos();
|
||||
BiomeBase biomebase = this.b.getBiome((chunkcoordintpair.x << 2) + 2, 0, (chunkcoordintpair.z << 2) + 2);
|
||||
this.a(StructureFeatures.k, iregistrycustom, structuremanager, ichunkaccess, definedstructuremanager, i, chunkcoordintpair, biomebase);
|
||||
for(Supplier<StructureFeature<?, ?>> supplier : biomebase.e().a())
|
||||
{
|
||||
StructureFeature<?, ?> structurefeature = (StructureFeature<?, ?>) supplier.get();
|
||||
if(StructureFeature.c == StructureGenerator.STRONGHOLD)
|
||||
{
|
||||
StructureFeature<?, ?> structureFeature = structurefeature;
|
||||
synchronized(structureFeature)
|
||||
{
|
||||
this.a(structurefeature, iregistrycustom, structuremanager, ichunkaccess, definedstructuremanager, i, chunkcoordintpair, biomebase);
|
||||
continue;
|
||||
}
|
||||
}
|
||||
this.a(structurefeature, iregistrycustom, structuremanager, ichunkaccess, definedstructuremanager, i, chunkcoordintpair, biomebase);
|
||||
}
|
||||
}
|
||||
|
||||
private void a(StructureFeature<?, ?> structurefeature, IRegistryCustom iregistrycustom, StructureManager structuremanager, IChunkAccess ichunkaccess, DefinedStructureManager definedstructuremanager, long i, ChunkCoordIntPair chunkcoordintpair, BiomeBase biomebase)
|
||||
{
|
||||
StructureStart<?> structurestart = structuremanager.a(SectionPosition.a((ChunkCoordIntPair) ichunkaccess.getPos(), (int) 0), structurefeature.d, (IStructureAccess) ichunkaccess);
|
||||
int j = structurestart != null ? structurestart.j() : 0;
|
||||
StructureSettingsFeature structuresettingsfeature = getSettings().a(structurefeature.d);
|
||||
if(structuresettingsfeature != null)
|
||||
{
|
||||
StructureStart<?> structurestart1 = structurefeature.a(iregistrycustom, this, this.b, definedstructuremanager, i, chunkcoordintpair, biomebase, j, structuresettingsfeature);
|
||||
structuremanager.a(SectionPosition.a((ChunkCoordIntPair) ichunkaccess.getPos(), (int) 0), structurefeature.d, structurestart1, (IStructureAccess) ichunkaccess);
|
||||
}
|
||||
}
|
||||
|
||||
public void storeStructures(GeneratorAccessSeed generatoraccessseed, StructureManager structuremanager, IChunkAccess ichunkaccess)
|
||||
{
|
||||
int i = ichunkaccess.getPos().x;
|
||||
int j = ichunkaccess.getPos().z;
|
||||
int k = i << 4;
|
||||
int l = j << 4;
|
||||
SectionPosition sectionposition = SectionPosition.a((ChunkCoordIntPair) ichunkaccess.getPos(), (int) 0);
|
||||
int i1 = i - 8;
|
||||
while(i1 <= i + 8)
|
||||
{
|
||||
int j1 = j - 8;
|
||||
while(j1 <= j + 8)
|
||||
{
|
||||
long k1 = ChunkCoordIntPair.pair((int) i1, (int) j1);
|
||||
for(StructureStart<?> structurestart : generatoraccessseed.getChunkAt(i1, j1).h().values())
|
||||
{
|
||||
try
|
||||
{
|
||||
if(structurestart == StructureStart.a || !structurestart.c().a(k, l, k + 15, l + 15))
|
||||
continue;
|
||||
structuremanager.a(sectionposition, structurestart.l(), k1, (IStructureAccess) ichunkaccess);
|
||||
PacketDebug.a((GeneratorAccessSeed) generatoraccessseed, (StructureStart<?>) structurestart);
|
||||
}
|
||||
catch(Exception exception)
|
||||
{
|
||||
CrashReport crashreport = CrashReport.a((Throwable) exception, (String) "Generating structure reference");
|
||||
CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Structure");
|
||||
crashreportsystemdetails.a("Name", () -> structurestart.l().i());
|
||||
crashreportsystemdetails.a("Class", () -> structurestart.l().getClass().getCanonicalName());
|
||||
throw new ReportedException(crashreport);
|
||||
}
|
||||
}
|
||||
++j1;
|
||||
}
|
||||
++i1;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public Provisioned getProvisioned()
|
||||
{
|
||||
return provisioned;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void clearRegeneratedLists()
|
||||
{
|
||||
getProvisioned().clearRegeneratedLists();
|
||||
}
|
||||
|
||||
@Override
|
||||
public TerrainProvider getProvider()
|
||||
{
|
||||
return getProvisioned().getProvider();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void regenerate(int x, int z)
|
||||
{
|
||||
getProvisioned().regenerate(x, z);
|
||||
}
|
||||
}
|
||||
@@ -1,680 +0,0 @@
|
||||
package com.volmit.iris.gen.nms.v16_3;
|
||||
|
||||
import com.mojang.serialization.Codec;
|
||||
import com.volmit.iris.gen.IrisTerrainProvider;
|
||||
import com.volmit.iris.gen.provisions.ProvisionBukkit;
|
||||
import com.volmit.iris.gen.scaffold.GeneratedChunk;
|
||||
import com.volmit.iris.gen.scaffold.Provisioned;
|
||||
import com.volmit.iris.gen.scaffold.ProvisionedHolder;
|
||||
import com.volmit.iris.gen.scaffold.TerrainProvider;
|
||||
import com.volmit.iris.util.O;
|
||||
import com.volmit.iris.util.V;
|
||||
import net.minecraft.server.v1_16_R3.*;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.block.Biome;
|
||||
import org.bukkit.block.data.BlockData;
|
||||
import org.bukkit.craftbukkit.libs.it.unimi.dsi.fastutil.objects.ObjectArrayList;
|
||||
import org.bukkit.craftbukkit.libs.it.unimi.dsi.fastutil.objects.ObjectList;
|
||||
import org.bukkit.craftbukkit.v1_16_R3.block.CraftBlock;
|
||||
import org.bukkit.craftbukkit.v1_16_R3.block.data.CraftBlockData;
|
||||
import org.bukkit.craftbukkit.v1_16_R3.util.CraftMagicNumbers;
|
||||
import org.bukkit.generator.ChunkGenerator.BiomeGrid;
|
||||
import org.bukkit.generator.ChunkGenerator.ChunkData;
|
||||
import org.bukkit.material.MaterialData;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.function.Supplier;
|
||||
|
||||
@SuppressWarnings("deprecation")
|
||||
public class NMSChunkGenerator16_3_SPIGOT extends ChunkGenerator implements ProvisionedHolder
|
||||
{
|
||||
private static final IBlockData k = Blocks.AIR.getBlockData();
|
||||
private final Provisioned provisioned;
|
||||
private final int maxHeight;
|
||||
private final int xzSize;
|
||||
protected final IBlockData f;
|
||||
protected final IBlockData g;
|
||||
private final long w;
|
||||
protected final Supplier<GeneratorSettingBase> h;
|
||||
private final O<WorldServer> ws;
|
||||
private BlockColumn BC;
|
||||
|
||||
public NMSChunkGenerator16_3_SPIGOT(Provisioned p, O<WorldServer> ws, WorldChunkManager worldchunkmanager, long i, Supplier<GeneratorSettingBase> supplier)
|
||||
{
|
||||
this(p, ws, worldchunkmanager, worldchunkmanager, i, supplier);
|
||||
}
|
||||
|
||||
private NMSChunkGenerator16_3_SPIGOT(Provisioned p, O<WorldServer> ws, WorldChunkManager worldchunkmanager, WorldChunkManager worldchunkmanager1, long i, Supplier<GeneratorSettingBase> supplier)
|
||||
{
|
||||
super(worldchunkmanager, worldchunkmanager1, supplier.get().a(), i);
|
||||
this.provisioned = p;
|
||||
this.ws = ws;
|
||||
this.w = i;
|
||||
GeneratorSettingBase generatorsettingbase = supplier.get();
|
||||
|
||||
this.h = supplier;
|
||||
NoiseSettings noisesettings = generatorsettingbase.b();
|
||||
|
||||
this.maxHeight = noisesettings.f() * 4;
|
||||
this.f = generatorsettingbase.c();
|
||||
this.g = generatorsettingbase.d();
|
||||
this.xzSize = noisesettings.a() / this.maxHeight;
|
||||
BC = new BlockColumn(new IBlockData[this.xzSize * this.maxHeight]);
|
||||
}
|
||||
|
||||
public int getSpawnHeight()
|
||||
{
|
||||
return getSeaLevel() + 8;
|
||||
}
|
||||
|
||||
public WorldChunkManager getWorldChunkManager()
|
||||
{
|
||||
return this.c;
|
||||
}
|
||||
|
||||
public int getGenerationDepth()
|
||||
{
|
||||
return 256;
|
||||
}
|
||||
|
||||
public void doCarving(long i, BiomeManager biomemanager, IChunkAccess ichunkaccess, WorldGenStage.Features worldgenstage_features)
|
||||
{
|
||||
if(((IrisTerrainProvider) provisioned.getProvider()).getDimension().isVanillaCaves())
|
||||
{
|
||||
super.doCarving(i, biomemanager, ichunkaccess, worldgenstage_features);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Codec<? extends ChunkGenerator> a()
|
||||
{
|
||||
return ChunkGeneratorAbstract.d;
|
||||
}
|
||||
|
||||
public boolean a(long i, ResourceKey<GeneratorSettingBase> resourcekey)
|
||||
{
|
||||
return this.w == i && this.h.get().a(resourcekey);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getBaseHeight(int i, int j, HeightMap.Type heightmap_type)
|
||||
{
|
||||
return 63;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IBlockAccess a(int x, int z)
|
||||
{
|
||||
return BC;
|
||||
}
|
||||
|
||||
protected IBlockData a(double d0, int i)
|
||||
{
|
||||
IBlockData iblockdata;
|
||||
|
||||
if(d0 > 0.0D)
|
||||
{
|
||||
iblockdata = this.f;
|
||||
}
|
||||
else if(i < this.getSeaLevel())
|
||||
{
|
||||
iblockdata = this.g;
|
||||
}
|
||||
else
|
||||
{
|
||||
iblockdata = NMSChunkGenerator16_3_SPIGOT.k;
|
||||
}
|
||||
|
||||
return iblockdata;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void buildBase(RegionLimitedWorldAccess regionlimitedworldaccess, IChunkAccess ichunkaccess)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void buildNoise(GeneratorAccess generatoraccess, StructureManager structuremanager, IChunkAccess ichunkaccess)
|
||||
{
|
||||
ObjectList<StructurePiece> objectlist = new ObjectArrayList<StructurePiece>(10);
|
||||
ObjectList<WorldGenFeatureDefinedStructureJigsawJunction> objectlist1 = new ObjectArrayList<WorldGenFeatureDefinedStructureJigsawJunction>(32);
|
||||
ChunkCoordIntPair chunkcoordintpair = ichunkaccess.getPos();
|
||||
int i = chunkcoordintpair.x;
|
||||
int j = chunkcoordintpair.z;
|
||||
|
||||
if(((IrisTerrainProvider) provisioned.getProvider()).shouldGenerateVanillaStructures())
|
||||
{
|
||||
int k = i << 4;
|
||||
int l = j << 4;
|
||||
Iterator<?> iterator = StructureGenerator.t.iterator();
|
||||
|
||||
while(iterator.hasNext())
|
||||
{
|
||||
StructureGenerator<?> structuregenerator = (StructureGenerator<?>) iterator.next();
|
||||
|
||||
structuremanager.a(SectionPosition.a(chunkcoordintpair, 0), structuregenerator).forEach((structurestart) ->
|
||||
{
|
||||
Iterator<?> iterator1 = structurestart.d().iterator();
|
||||
|
||||
while(iterator1.hasNext())
|
||||
{
|
||||
StructurePiece structurepiece = (StructurePiece) iterator1.next();
|
||||
|
||||
if(structurepiece.a(chunkcoordintpair, 12))
|
||||
{
|
||||
if(structurepiece instanceof WorldGenFeaturePillagerOutpostPoolPiece)
|
||||
{
|
||||
WorldGenFeaturePillagerOutpostPoolPiece worldgenfeaturepillageroutpostpoolpiece = (WorldGenFeaturePillagerOutpostPoolPiece) structurepiece;
|
||||
WorldGenFeatureDefinedStructurePoolTemplate.Matching worldgenfeaturedefinedstructurepooltemplate_matching = worldgenfeaturepillageroutpostpoolpiece.b().e();
|
||||
|
||||
if(worldgenfeaturedefinedstructurepooltemplate_matching == WorldGenFeatureDefinedStructurePoolTemplate.Matching.RIGID)
|
||||
{
|
||||
objectlist.add(worldgenfeaturepillageroutpostpoolpiece);
|
||||
}
|
||||
|
||||
Iterator<?> iterator2 = worldgenfeaturepillageroutpostpoolpiece.e().iterator();
|
||||
|
||||
while(iterator2.hasNext())
|
||||
{
|
||||
WorldGenFeatureDefinedStructureJigsawJunction worldgenfeaturedefinedstructurejigsawjunction = (WorldGenFeatureDefinedStructureJigsawJunction) iterator2.next();
|
||||
int i1 = worldgenfeaturedefinedstructurejigsawjunction.a();
|
||||
int j1 = worldgenfeaturedefinedstructurejigsawjunction.c();
|
||||
|
||||
if(i1 > k - 12 && j1 > l - 12 && i1 < k + 15 + 12 && j1 < l + 15 + 12)
|
||||
{
|
||||
objectlist1.add(worldgenfeaturedefinedstructurejigsawjunction);
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
objectlist.add(structurepiece);
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
ProtoChunk protochunk = (ProtoChunk) ichunkaccess;
|
||||
HeightMap heightmap = protochunk.a(HeightMap.Type.OCEAN_FLOOR_WG);
|
||||
HeightMap heightmap1 = protochunk.a(HeightMap.Type.WORLD_SURFACE_WG);
|
||||
GeneratedChunk gc = ((ProvisionBukkit) provisioned).generateNMSChunkData(ws.get().getWorld(), new Random(i + j), i, j, new ChunkData()
|
||||
{
|
||||
public int getMaxHeight()
|
||||
{
|
||||
return 256;
|
||||
}
|
||||
|
||||
public void setBlock(int x, int y, int z, Material material)
|
||||
{
|
||||
this.setBlock(x, y, z, material.createBlockData());
|
||||
}
|
||||
|
||||
public void setBlock(int x, int y, int z, MaterialData material)
|
||||
{
|
||||
this.setBlock(x, y, z, CraftMagicNumbers.getBlock((MaterialData) material));
|
||||
}
|
||||
|
||||
public void setBlock(int x, int y, int z, BlockData blockData)
|
||||
{
|
||||
this.setBlock(x, y, z, ((CraftBlockData) blockData).getState());
|
||||
}
|
||||
|
||||
public void setRegion(int xMin, int yMin, int zMin, int xMax, int yMax, int zMax, Material material)
|
||||
{
|
||||
this.setRegion(xMin, yMin, zMin, xMax, yMax, zMax, material.createBlockData());
|
||||
}
|
||||
|
||||
public void setRegion(int xMin, int yMin, int zMin, int xMax, int yMax, int zMax, MaterialData material)
|
||||
{
|
||||
this.setRegion(xMin, yMin, zMin, xMax, yMax, zMax, CraftMagicNumbers.getBlock((MaterialData) material));
|
||||
}
|
||||
|
||||
public void setRegion(int xMin, int yMin, int zMin, int xMax, int yMax, int zMax, BlockData blockData)
|
||||
{
|
||||
this.setRegion(xMin, yMin, zMin, xMax, yMax, zMax, ((CraftBlockData) blockData).getState());
|
||||
}
|
||||
|
||||
public Material getType(int x, int y, int z)
|
||||
{
|
||||
return CraftMagicNumbers.getMaterial((Block) this.getTypeId(x, y, z).getBlock());
|
||||
}
|
||||
|
||||
public MaterialData getTypeAndData(int x, int y, int z)
|
||||
{
|
||||
return CraftMagicNumbers.getMaterial((IBlockData) this.getTypeId(x, y, z));
|
||||
}
|
||||
|
||||
public BlockData getBlockData(int x, int y, int z)
|
||||
{
|
||||
return CraftBlockData.fromData((IBlockData) this.getTypeId(x, y, z));
|
||||
}
|
||||
|
||||
public void setRegion(int xMin, int yMin, int zMin, int xMax, int yMax, int zMax, IBlockData type)
|
||||
{
|
||||
if(xMin > 15 || yMin >= getMaxHeight() || zMin > 15)
|
||||
{
|
||||
return;
|
||||
}
|
||||
if(xMin < 0)
|
||||
{
|
||||
xMin = 0;
|
||||
}
|
||||
if(yMin < 0)
|
||||
{
|
||||
yMin = 0;
|
||||
}
|
||||
if(zMin < 0)
|
||||
{
|
||||
zMin = 0;
|
||||
}
|
||||
if(xMax > 16)
|
||||
{
|
||||
xMax = 16;
|
||||
}
|
||||
if(yMax > getMaxHeight())
|
||||
{
|
||||
yMax = getMaxHeight();
|
||||
}
|
||||
if(zMax > 16)
|
||||
{
|
||||
zMax = 16;
|
||||
}
|
||||
if(xMin >= xMax || yMin >= yMax || zMin >= zMax)
|
||||
{
|
||||
return;
|
||||
}
|
||||
int y = yMin;
|
||||
while(y < yMax)
|
||||
{
|
||||
int x = xMin;
|
||||
while(x < xMax)
|
||||
{
|
||||
int z = zMin;
|
||||
while(z < zMax)
|
||||
{
|
||||
protochunk.setType(new BlockPosition(x, y, z), type, false);
|
||||
++z;
|
||||
}
|
||||
++x;
|
||||
}
|
||||
++y;
|
||||
}
|
||||
}
|
||||
|
||||
public IBlockData getTypeId(int x, int y, int z)
|
||||
{
|
||||
if(x != (x & 15) || y < 0 || y >= getMaxHeight() || z != (z & 15))
|
||||
{
|
||||
return Blocks.AIR.getBlockData();
|
||||
}
|
||||
return protochunk.getType(new BlockPosition(x, y, z));
|
||||
}
|
||||
|
||||
public byte getData(int x, int y, int z)
|
||||
{
|
||||
return CraftMagicNumbers.toLegacyData((IBlockData) this.getTypeId(x, y, z));
|
||||
}
|
||||
|
||||
private void setBlock(int x, int y, int z, IBlockData type)
|
||||
{
|
||||
if(x != (x & 15) || y < 0 || y >= getMaxHeight() || z != (z & 15))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
protochunk.setType(new BlockPosition(x, y, z), type, false);
|
||||
|
||||
if(type.getBlock().isTileEntity())
|
||||
{
|
||||
// if (this.tiles == null) {
|
||||
// this.tiles = new HashSet<BlockPosition>();
|
||||
// }
|
||||
// this.tiles.add(new BlockPosition(x, y, z));
|
||||
}
|
||||
}
|
||||
}, new BiomeGrid()
|
||||
{
|
||||
@Override
|
||||
public void setBiome(int x, int y, int z, Biome bio)
|
||||
{
|
||||
protochunk.getBiomeIndex().setBiome(x, y, z, CraftBlock.biomeToBiomeBase(ws.get().r().b(IRegistry.ay), bio));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setBiome(int x, int z, Biome bio)
|
||||
{
|
||||
protochunk.getBiomeIndex().setBiome(x, 0, z, CraftBlock.biomeToBiomeBase(ws.get().r().b(IRegistry.ay), bio));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Biome getBiome(int x, int y, int z)
|
||||
{
|
||||
return CraftBlock.biomeBaseToBiome(ws.get().r().b(IRegistry.ay), protochunk.getBiomeIndex().getBiome(x, y, z));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Biome getBiome(int x, int z)
|
||||
{
|
||||
return CraftBlock.biomeBaseToBiome(ws.get().r().b(IRegistry.ay), protochunk.getBiomeIndex().getBiome(x, 0, z));
|
||||
}
|
||||
});
|
||||
|
||||
for(int xx = 0; xx < 16; xx++)
|
||||
{
|
||||
for(int zz = 0; zz < 16; zz++)
|
||||
{
|
||||
int y = gc.getHeight().getHeight(xx, zz);
|
||||
if(y < getSeaLevel())
|
||||
{
|
||||
heightmap.a(xx, y, zz, Blocks.STONE.getBlockData());
|
||||
}
|
||||
heightmap1.a(xx, Math.max(y, getSeaLevel()), zz, Blocks.STONE.getBlockData());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void addDecorations(RegionLimitedWorldAccess regionlimitedworldaccess, StructureManager structuremanager)
|
||||
{
|
||||
if(((IrisTerrainProvider) provisioned.getProvider()).shouldGenerateVanillaStructures())
|
||||
{
|
||||
int i = regionlimitedworldaccess.a();
|
||||
int j = regionlimitedworldaccess.b();
|
||||
int k = i * 16;
|
||||
int l = j * 16;
|
||||
BlockPosition blockposition = new BlockPosition(k, 0, l);
|
||||
BiomeBase biomebase = this.b.getBiome((i << 2) + 2, 2, (j << 2) + 2);
|
||||
SeededRandom seededrandom = new SeededRandom();
|
||||
long i1 = seededrandom.a(regionlimitedworldaccess.getSeed(), k, l);
|
||||
try
|
||||
{
|
||||
a(biomebase, structuremanager, this, regionlimitedworldaccess, i1, seededrandom, blockposition);
|
||||
}
|
||||
catch(Exception exception)
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void a(BiomeBase bbase, StructureManager var0, ChunkGenerator var1, RegionLimitedWorldAccess var2, long var3, SeededRandom var5, BlockPosition var6)
|
||||
{
|
||||
if(!((IrisTerrainProvider) provisioned.getProvider()).shouldGenerateVanillaStructures())
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
int stages = WorldGenStage.Decoration.values().length;
|
||||
for(int stage = 0; stage < stages; ++stage)
|
||||
{
|
||||
WorldGenStage.Decoration st = WorldGenStage.Decoration.values()[stage];
|
||||
|
||||
if(st.equals(WorldGenStage.Decoration.LAKES))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if(st.equals(WorldGenStage.Decoration.LOCAL_MODIFICATIONS))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if(st.equals(WorldGenStage.Decoration.RAW_GENERATION))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if(st.equals(WorldGenStage.Decoration.TOP_LAYER_MODIFICATION))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if(st.equals(WorldGenStage.Decoration.UNDERGROUND_DECORATION))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if(st.equals(WorldGenStage.Decoration.UNDERGROUND_ORES))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if(st.equals(WorldGenStage.Decoration.VEGETAL_DECORATION))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
StructureGenerator<?> var13;
|
||||
int var10 = 0;
|
||||
if(var0.a())
|
||||
{
|
||||
@SuppressWarnings("unchecked")
|
||||
List<StructureGenerator<?>> structureGenerators = ((Map<Integer, List<StructureGenerator<?>>>) new V(bbase).get("g")).getOrDefault(stage, Collections.emptyList());
|
||||
Iterator<StructureGenerator<?>> iterator = structureGenerators.iterator();
|
||||
while(iterator.hasNext())
|
||||
{
|
||||
var13 = (StructureGenerator<?>) iterator.next();
|
||||
|
||||
if(var13.equals(StructureGenerator.VILLAGE))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if(var13.equals(StructureGenerator.JUNGLE_PYRAMID))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if(var13.equals(StructureGenerator.OCEAN_RUIN))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if(var13.equals(StructureGenerator.IGLOO))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if(var13.equals(StructureGenerator.MINESHAFT))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if(var13.equals(StructureGenerator.NETHER_FOSSIL))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if(var13.equals(StructureGenerator.SHIPWRECK))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if(var13.equals(StructureGenerator.SHIPWRECK))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if(var13.equals(StructureGenerator.MONUMENT))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if(var13.equals(StructureGenerator.BASTION_REMNANT))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
var5.b(var3, var10, stage);
|
||||
int var14 = var6.getX() >> 4;
|
||||
int var15 = var6.getZ() >> 4;
|
||||
int var16 = var14 << 4;
|
||||
int var17 = var15 << 4;
|
||||
|
||||
try
|
||||
{
|
||||
var0.a(SectionPosition.a((BlockPosition) var6), var13).forEach(var8 -> var8.a((GeneratorAccessSeed) var2, var0, var1, (Random) var5, new StructureBoundingBox(var16, var17, var16 + 15, var17 + 15), new ChunkCoordIntPair(var14, var15)));
|
||||
}
|
||||
|
||||
catch(Exception var18)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
++var10;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getSeaLevel()
|
||||
{
|
||||
return ((IrisTerrainProvider) provisioned.getProvider()).getFluidHeight();
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<BiomeSettingsMobs.c> getMobsFor(BiomeBase biomebase, StructureManager structuremanager, EnumCreatureType enumcreaturetype, BlockPosition blockposition)
|
||||
{
|
||||
if(structuremanager.a(blockposition, true, StructureGenerator.SWAMP_HUT).e())
|
||||
{
|
||||
if(enumcreaturetype == EnumCreatureType.MONSTER)
|
||||
{
|
||||
return StructureGenerator.SWAMP_HUT.c();
|
||||
}
|
||||
|
||||
if(enumcreaturetype == EnumCreatureType.CREATURE)
|
||||
{
|
||||
return StructureGenerator.SWAMP_HUT.j();
|
||||
}
|
||||
}
|
||||
|
||||
if(enumcreaturetype == EnumCreatureType.MONSTER)
|
||||
{
|
||||
if(structuremanager.a(blockposition, false, StructureGenerator.PILLAGER_OUTPOST).e())
|
||||
{
|
||||
return StructureGenerator.PILLAGER_OUTPOST.c();
|
||||
}
|
||||
|
||||
if(structuremanager.a(blockposition, false, StructureGenerator.MONUMENT).e())
|
||||
{
|
||||
return StructureGenerator.MONUMENT.c();
|
||||
}
|
||||
|
||||
if(structuremanager.a(blockposition, true, StructureGenerator.FORTRESS).e())
|
||||
{
|
||||
return StructureGenerator.FORTRESS.c();
|
||||
}
|
||||
}
|
||||
|
||||
return super.getMobsFor(biomebase, structuremanager, enumcreaturetype, blockposition);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addMobs(RegionLimitedWorldAccess regionlimitedworldaccess)
|
||||
{
|
||||
int i = regionlimitedworldaccess.a();
|
||||
int j = regionlimitedworldaccess.b();
|
||||
BiomeBase biomebase = regionlimitedworldaccess.getBiome((new ChunkCoordIntPair(i, j)).l());
|
||||
SeededRandom seededrandom = new SeededRandom();
|
||||
seededrandom.a(regionlimitedworldaccess.getSeed(), i << 4, j << 4);
|
||||
SpawnerCreature.a(regionlimitedworldaccess, biomebase, i, j, seededrandom);
|
||||
}
|
||||
|
||||
public void createStructures(IRegistryCustom iregistrycustom, StructureManager structuremanager, IChunkAccess ichunkaccess, DefinedStructureManager definedstructuremanager, long i)
|
||||
{
|
||||
ChunkCoordIntPair chunkcoordintpair = ichunkaccess.getPos();
|
||||
BiomeBase biomebase = this.b.getBiome((chunkcoordintpair.x << 2) + 2, 0, (chunkcoordintpair.z << 2) + 2);
|
||||
this.a(StructureFeatures.k, iregistrycustom, structuremanager, ichunkaccess, definedstructuremanager, i, chunkcoordintpair, biomebase);
|
||||
for(Supplier<StructureFeature<?, ?>> supplier : biomebase.e().a())
|
||||
{
|
||||
StructureFeature<?, ?> structurefeature = (StructureFeature<?, ?>) supplier.get();
|
||||
if(StructureFeature.c == StructureGenerator.STRONGHOLD)
|
||||
{
|
||||
StructureFeature<?, ?> structureFeature = structurefeature;
|
||||
synchronized(structureFeature)
|
||||
{
|
||||
this.a(structurefeature, iregistrycustom, structuremanager, ichunkaccess, definedstructuremanager, i, chunkcoordintpair, biomebase);
|
||||
continue;
|
||||
}
|
||||
}
|
||||
this.a(structurefeature, iregistrycustom, structuremanager, ichunkaccess, definedstructuremanager, i, chunkcoordintpair, biomebase);
|
||||
}
|
||||
}
|
||||
|
||||
private void a(StructureFeature<?, ?> structurefeature, IRegistryCustom iregistrycustom, StructureManager structuremanager, IChunkAccess ichunkaccess, DefinedStructureManager definedstructuremanager, long i, ChunkCoordIntPair chunkcoordintpair, BiomeBase biomebase)
|
||||
{
|
||||
StructureStart<?> structurestart = structuremanager.a(SectionPosition.a((ChunkCoordIntPair) ichunkaccess.getPos(), (int) 0), structurefeature.d, (IStructureAccess) ichunkaccess);
|
||||
int j = structurestart != null ? structurestart.j() : 0;
|
||||
StructureSettingsFeature structuresettingsfeature = getSettings().a(structurefeature.d);
|
||||
if(structuresettingsfeature != null)
|
||||
{
|
||||
StructureStart<?> structurestart1 = structurefeature.a(iregistrycustom, this, this.b, definedstructuremanager, i, chunkcoordintpair, biomebase, j, structuresettingsfeature);
|
||||
structuremanager.a(SectionPosition.a((ChunkCoordIntPair) ichunkaccess.getPos(), (int) 0), structurefeature.d, structurestart1, (IStructureAccess) ichunkaccess);
|
||||
}
|
||||
}
|
||||
|
||||
public void storeStructures(GeneratorAccessSeed generatoraccessseed, StructureManager structuremanager, IChunkAccess ichunkaccess)
|
||||
{
|
||||
int i = ichunkaccess.getPos().x;
|
||||
int j = ichunkaccess.getPos().z;
|
||||
int k = i << 4;
|
||||
int l = j << 4;
|
||||
SectionPosition sectionposition = SectionPosition.a((ChunkCoordIntPair) ichunkaccess.getPos(), (int) 0);
|
||||
int i1 = i - 8;
|
||||
while(i1 <= i + 8)
|
||||
{
|
||||
int j1 = j - 8;
|
||||
while(j1 <= j + 8)
|
||||
{
|
||||
long k1 = ChunkCoordIntPair.pair((int) i1, (int) j1);
|
||||
for(StructureStart<?> structurestart : generatoraccessseed.getChunkAt(i1, j1).h().values())
|
||||
{
|
||||
try
|
||||
{
|
||||
if(structurestart == StructureStart.a || !structurestart.c().a(k, l, k + 15, l + 15))
|
||||
continue;
|
||||
structuremanager.a(sectionposition, structurestart.l(), k1, (IStructureAccess) ichunkaccess);
|
||||
PacketDebug.a((GeneratorAccessSeed) generatoraccessseed, (StructureStart<?>) structurestart);
|
||||
}
|
||||
catch(Exception exception)
|
||||
{
|
||||
CrashReport crashreport = CrashReport.a((Throwable) exception, (String) "Generating structure reference");
|
||||
CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Structure");
|
||||
crashreportsystemdetails.a("Name", () -> structurestart.l().i());
|
||||
crashreportsystemdetails.a("Class", () -> structurestart.l().getClass().getCanonicalName());
|
||||
throw new ReportedException(crashreport);
|
||||
}
|
||||
}
|
||||
++j1;
|
||||
}
|
||||
++i1;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public Provisioned getProvisioned()
|
||||
{
|
||||
return provisioned;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void clearRegeneratedLists()
|
||||
{
|
||||
getProvisioned().clearRegeneratedLists();
|
||||
}
|
||||
|
||||
@Override
|
||||
public TerrainProvider getProvider()
|
||||
{
|
||||
return getProvisioned().getProvider();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void regenerate(int x, int z)
|
||||
{
|
||||
getProvisioned().regenerate(x, z);
|
||||
}
|
||||
}
|
||||
@@ -1,16 +0,0 @@
|
||||
package com.volmit.iris.gen.nms.v1X;
|
||||
|
||||
import com.volmit.iris.gen.atomics.AtomicCache;
|
||||
import com.volmit.iris.gen.nms.INMSBinding;
|
||||
import com.volmit.iris.gen.nms.INMSCreator;
|
||||
|
||||
public class NMSBinding1X implements INMSBinding
|
||||
{
|
||||
private final AtomicCache<INMSCreator> creator = new AtomicCache<>();
|
||||
|
||||
@Override
|
||||
public INMSCreator getCreator()
|
||||
{
|
||||
return creator.aquire(NMSCreator1X::new);
|
||||
}
|
||||
}
|
||||
@@ -1,57 +0,0 @@
|
||||
package com.volmit.iris.gen.scaffold;
|
||||
|
||||
import org.bukkit.World;
|
||||
|
||||
import com.volmit.iris.gen.IrisTerrainProvider;
|
||||
import com.volmit.iris.gen.provisions.ProvisionBukkit;
|
||||
import com.volmit.iris.util.KMap;
|
||||
|
||||
public class IrisWorlds
|
||||
{
|
||||
private static final KMap<String, Provisioned> provisioned = new KMap<>();
|
||||
|
||||
public static void register(World w, Provisioned p)
|
||||
{
|
||||
provisioned.put(w.getUID().toString(), p);
|
||||
}
|
||||
|
||||
public static boolean isIrisWorld(World world)
|
||||
{
|
||||
if(provisioned.containsKey(world.getUID().toString()))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
return world.getGenerator() instanceof Provisioned || world.getGenerator() instanceof ProvisionedHolder;
|
||||
}
|
||||
|
||||
public static IrisTerrainProvider getProvider(World world)
|
||||
{
|
||||
if(isIrisWorld(world))
|
||||
{
|
||||
return (IrisTerrainProvider) getProvisioned(world).getProvider();
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
public static ProvisionBukkit getProvisioned(World world)
|
||||
{
|
||||
if(isIrisWorld(world))
|
||||
{
|
||||
if(provisioned.containsKey(world.getUID().toString()))
|
||||
{
|
||||
return (ProvisionBukkit) provisioned.get(world.getUID().toString());
|
||||
}
|
||||
|
||||
if(world.getGenerator() instanceof ProvisionedHolder)
|
||||
{
|
||||
return (ProvisionBukkit) ((ProvisionedHolder) world.getGenerator()).getProvisioned();
|
||||
}
|
||||
|
||||
return ((ProvisionBukkit) world.getGenerator());
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -1,18 +1,18 @@
|
||||
package com.volmit.iris.v2.generator;
|
||||
package com.volmit.iris.generator;
|
||||
|
||||
import com.volmit.iris.object.*;
|
||||
import com.volmit.iris.util.*;
|
||||
import com.volmit.iris.v2.scaffold.data.DataProvider;
|
||||
import com.volmit.iris.v2.scaffold.engine.Engine;
|
||||
import com.volmit.iris.scaffold.data.DataProvider;
|
||||
import com.volmit.iris.scaffold.engine.Engine;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.block.Biome;
|
||||
import org.bukkit.block.data.BlockData;
|
||||
|
||||
import com.volmit.iris.Iris;
|
||||
import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
|
||||
import com.volmit.iris.v2.scaffold.stream.interpolation.Interpolated;
|
||||
import com.volmit.iris.scaffold.stream.ProceduralStream;
|
||||
import com.volmit.iris.scaffold.stream.interpolation.Interpolated;
|
||||
import com.volmit.iris.manager.IrisDataManager;
|
||||
import com.volmit.iris.noise.CNG;
|
||||
import com.volmit.iris.generator.noise.CNG;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
119
src/main/java/com/volmit/iris/generator/IrisEngine.java
Normal file
119
src/main/java/com/volmit/iris/generator/IrisEngine.java
Normal file
@@ -0,0 +1,119 @@
|
||||
package com.volmit.iris.generator;
|
||||
|
||||
import com.volmit.iris.Iris;
|
||||
import com.volmit.iris.scaffold.engine.*;
|
||||
import com.volmit.iris.scaffold.hunk.Hunk;
|
||||
import com.volmit.iris.scaffold.parallel.MultiBurst;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import org.bukkit.Chunk;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.block.Biome;
|
||||
import org.bukkit.block.data.BlockData;
|
||||
import org.bukkit.generator.BlockPopulator;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
public class IrisEngine extends BlockPopulator implements Engine
|
||||
{
|
||||
@Getter
|
||||
private final EngineCompound compound;
|
||||
|
||||
@Getter
|
||||
private final EngineTarget target;
|
||||
|
||||
@Getter
|
||||
private final EngineFramework framework;
|
||||
|
||||
@Getter
|
||||
private final EngineWorldManager worldManager;
|
||||
|
||||
@Setter
|
||||
@Getter
|
||||
private volatile int parallelism;
|
||||
|
||||
@Setter
|
||||
@Getter
|
||||
private volatile int minHeight;
|
||||
private boolean failing;
|
||||
private boolean closed;
|
||||
|
||||
public IrisEngine(EngineTarget target, EngineCompound compound)
|
||||
{
|
||||
Iris.info("Initializing Engine: " + target.getWorld().getName() + "/" + target.getDimension().getLoadKey() + " (" + target.getHeight() + " height)");
|
||||
this.target = target;
|
||||
this.framework = new IrisEngineFramework(this);
|
||||
worldManager = new IrisWorldManager(this);
|
||||
this.compound = compound;
|
||||
minHeight = 0;
|
||||
failing = false;
|
||||
closed = false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void close()
|
||||
{
|
||||
closed = true;
|
||||
getWorldManager().close();
|
||||
getFramework().close();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isClosed() {
|
||||
return closed;
|
||||
}
|
||||
|
||||
@Override
|
||||
public double modifyX(double x) {
|
||||
return x / getDimension().getTerrainZoom();
|
||||
}
|
||||
|
||||
@Override
|
||||
public double modifyZ(double z) {
|
||||
return z / getDimension().getTerrainZoom();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void generate(int x, int z, Hunk<BlockData> vblocks, Hunk<Biome> vbiomes) {
|
||||
Hunk<Biome> biomes = vbiomes.synchronize();
|
||||
Hunk<BlockData> blocks = vblocks.synchronize().listen((xx,y,zz,t) -> catchBlockUpdates(x+xx,y+getMinHeight(),z+zz, t));
|
||||
|
||||
MultiBurst.burst.burst(
|
||||
() -> getFramework().getEngineParallax().generateParallaxArea(x, z),
|
||||
() -> getFramework().getBiomeActuator().actuate(x, z, biomes),
|
||||
() -> getFramework().getTerrainActuator().actuate(x, z, blocks)
|
||||
);
|
||||
MultiBurst.burst.burst(
|
||||
() -> getFramework().getCaveModifier().modify(x, z, blocks),
|
||||
() -> getFramework().getRavineModifier().modify(x, z, blocks)
|
||||
);
|
||||
MultiBurst.burst.burst(
|
||||
() -> getFramework().getDecorantActuator().actuate(x, z, blocks),
|
||||
() -> getFramework().getDepositModifier().modify(x, z, blocks),
|
||||
() -> getFramework().getPostModifier().modify(x, z, blocks),
|
||||
() -> getFramework().getEngineParallax().insertParallax(x, z, blocks)
|
||||
);
|
||||
|
||||
getFramework().recycle();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void populate(@NotNull World world, @NotNull Random random, @NotNull Chunk c)
|
||||
{
|
||||
getWorldManager().spawnInitialEntities(c);
|
||||
updateChunk(c);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void fail(String error, Throwable e) {
|
||||
failing = true;
|
||||
Iris.error(error);
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean hasFailed() {
|
||||
return failing;
|
||||
}
|
||||
}
|
||||
@@ -1,17 +1,17 @@
|
||||
package com.volmit.iris.v2.generator;
|
||||
package com.volmit.iris.generator;
|
||||
|
||||
import com.volmit.iris.Iris;
|
||||
import com.volmit.iris.manager.IrisDataManager;
|
||||
import com.volmit.iris.object.IrisDimension;
|
||||
import com.volmit.iris.object.IrisDimensionIndex;
|
||||
import com.volmit.iris.util.KList;
|
||||
import com.volmit.iris.v2.scaffold.engine.Engine;
|
||||
import com.volmit.iris.v2.scaffold.engine.EngineCompound;
|
||||
import com.volmit.iris.v2.scaffold.engine.EngineData;
|
||||
import com.volmit.iris.v2.scaffold.engine.EngineTarget;
|
||||
import com.volmit.iris.v2.scaffold.hunk.Hunk;
|
||||
import com.volmit.iris.v2.scaffold.parallel.BurstExecutor;
|
||||
import com.volmit.iris.v2.scaffold.parallel.MultiBurst;
|
||||
import com.volmit.iris.scaffold.engine.Engine;
|
||||
import com.volmit.iris.scaffold.engine.EngineCompound;
|
||||
import com.volmit.iris.scaffold.engine.EngineData;
|
||||
import com.volmit.iris.scaffold.engine.EngineTarget;
|
||||
import com.volmit.iris.scaffold.hunk.Hunk;
|
||||
import com.volmit.iris.scaffold.parallel.BurstExecutor;
|
||||
import com.volmit.iris.scaffold.parallel.MultiBurst;
|
||||
import lombok.Getter;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.block.Biome;
|
||||
@@ -54,7 +54,7 @@ public class IrisEngineCompound implements EngineCompound {
|
||||
if(rootDimension.getDimensionalComposite().isEmpty())
|
||||
{
|
||||
burster = null;
|
||||
engines = new Engine[]{new IrisEngine(new EngineTarget(world, rootDimension, data, 256, maximumThreads))};
|
||||
engines = new Engine[]{new IrisEngine(new EngineTarget(world, rootDimension, data, 256, maximumThreads), this)};
|
||||
}
|
||||
|
||||
else
|
||||
@@ -80,7 +80,7 @@ public class IrisEngineCompound implements EngineCompound {
|
||||
{
|
||||
IrisDimensionIndex index = rootDimension.getDimensionalComposite().get(i);
|
||||
IrisDimension dimension = data.getDimensionLoader().load(index.getDimension());
|
||||
engines[i] = new IrisEngine(new EngineTarget(world, dimension, data.copy().preferFolder(rootDimension.getLoadKey()), (int)Math.floor(256D * (index.getWeight() / totalWeight)), index.isInverted(), threadDist));
|
||||
engines[i] = new IrisEngine(new EngineTarget(world, dimension, data.copy().preferFolder(rootDimension.getLoadKey()), (int)Math.floor(256D * (index.getWeight() / totalWeight)), index.isInverted(), threadDist), this);
|
||||
engines[i].setMinHeight(buf);
|
||||
buf += engines[i].getHeight();
|
||||
}
|
||||
@@ -173,4 +173,9 @@ public class IrisEngineCompound implements EngineCompound {
|
||||
public void saveEngineMetadata() {
|
||||
engineMetadata.save(getEngineMetadataFile());
|
||||
}
|
||||
|
||||
@Override
|
||||
public IrisDataManager getData(int height) {
|
||||
return getEngineForHeight(height).getData();
|
||||
}
|
||||
}
|
||||
@@ -1,11 +1,11 @@
|
||||
package com.volmit.iris.v2.generator;
|
||||
package com.volmit.iris.generator;
|
||||
|
||||
import com.volmit.iris.v2.generator.actuator.*;
|
||||
import com.volmit.iris.v2.generator.modifier.IrisCaveModifier;
|
||||
import com.volmit.iris.v2.generator.modifier.IrisDepositModifier;
|
||||
import com.volmit.iris.v2.generator.modifier.IrisPostModifier;
|
||||
import com.volmit.iris.v2.generator.modifier.IrisRavineModifier;
|
||||
import com.volmit.iris.v2.scaffold.engine.*;
|
||||
import com.volmit.iris.generator.actuator.*;
|
||||
import com.volmit.iris.generator.modifier.IrisCaveModifier;
|
||||
import com.volmit.iris.generator.modifier.IrisDepositModifier;
|
||||
import com.volmit.iris.generator.modifier.IrisPostModifier;
|
||||
import com.volmit.iris.generator.modifier.IrisRavineModifier;
|
||||
import com.volmit.iris.scaffold.engine.*;
|
||||
import lombok.Getter;
|
||||
import org.bukkit.block.Biome;
|
||||
import org.bukkit.block.data.BlockData;
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.volmit.iris.v2.generator;
|
||||
package com.volmit.iris.generator;
|
||||
|
||||
import com.volmit.iris.v2.scaffold.engine.Engine;
|
||||
import com.volmit.iris.v2.scaffold.engine.EngineParallaxManager;
|
||||
import com.volmit.iris.v2.scaffold.engine.EngineStructureManager;
|
||||
import com.volmit.iris.scaffold.engine.Engine;
|
||||
import com.volmit.iris.scaffold.engine.EngineParallaxManager;
|
||||
import com.volmit.iris.scaffold.engine.EngineStructureManager;
|
||||
import lombok.Getter;
|
||||
|
||||
public class IrisEngineParallax implements EngineParallaxManager {
|
||||
@@ -0,0 +1,10 @@
|
||||
package com.volmit.iris.generator;
|
||||
|
||||
import com.volmit.iris.scaffold.engine.Engine;
|
||||
import com.volmit.iris.scaffold.engine.EngineAssignedStructureManager;
|
||||
|
||||
public class IrisEngineStructure extends EngineAssignedStructureManager {
|
||||
public IrisEngineStructure(Engine engine) {
|
||||
super(engine);
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.volmit.iris.v2.generator;
|
||||
package com.volmit.iris.generator;
|
||||
|
||||
import com.volmit.iris.v2.scaffold.engine.Engine;
|
||||
import com.volmit.iris.v2.scaffold.engine.EngineAssignedWorldManager;
|
||||
import com.volmit.iris.scaffold.engine.Engine;
|
||||
import com.volmit.iris.scaffold.engine.EngineAssignedWorldManager;
|
||||
import org.bukkit.Chunk;
|
||||
import org.bukkit.event.block.BlockBreakEvent;
|
||||
import org.bukkit.event.block.BlockPlaceEvent;
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.volmit.iris.v2.generator.actuator;
|
||||
package com.volmit.iris.generator.actuator;
|
||||
|
||||
import com.volmit.iris.v2.scaffold.engine.Engine;
|
||||
import com.volmit.iris.v2.scaffold.engine.EngineAssignedActuator;
|
||||
import com.volmit.iris.v2.scaffold.hunk.Hunk;
|
||||
import com.volmit.iris.scaffold.engine.Engine;
|
||||
import com.volmit.iris.scaffold.engine.EngineAssignedActuator;
|
||||
import com.volmit.iris.scaffold.hunk.Hunk;
|
||||
import org.bukkit.block.Biome;
|
||||
|
||||
public class IrisBiomeActuator extends EngineAssignedActuator<Biome>
|
||||
@@ -1,15 +1,15 @@
|
||||
package com.volmit.iris.v2.generator.actuator;
|
||||
package com.volmit.iris.generator.actuator;
|
||||
|
||||
import com.volmit.iris.object.IrisBiome;
|
||||
import com.volmit.iris.util.RNG;
|
||||
import com.volmit.iris.v2.generator.decorator.IrisCeilingDecorator;
|
||||
import com.volmit.iris.v2.generator.decorator.IrisSeaSurfaceDecorator;
|
||||
import com.volmit.iris.v2.generator.decorator.IrisShoreLineDecorator;
|
||||
import com.volmit.iris.v2.generator.decorator.IrisSurfaceDecorator;
|
||||
import com.volmit.iris.v2.scaffold.engine.Engine;
|
||||
import com.volmit.iris.v2.scaffold.engine.EngineAssignedActuator;
|
||||
import com.volmit.iris.v2.scaffold.engine.EngineDecorator;
|
||||
import com.volmit.iris.v2.scaffold.hunk.Hunk;
|
||||
import com.volmit.iris.generator.decorator.IrisCeilingDecorator;
|
||||
import com.volmit.iris.generator.decorator.IrisSeaSurfaceDecorator;
|
||||
import com.volmit.iris.generator.decorator.IrisShoreLineDecorator;
|
||||
import com.volmit.iris.generator.decorator.IrisSurfaceDecorator;
|
||||
import com.volmit.iris.scaffold.engine.Engine;
|
||||
import com.volmit.iris.scaffold.engine.EngineAssignedActuator;
|
||||
import com.volmit.iris.scaffold.engine.EngineDecorator;
|
||||
import com.volmit.iris.scaffold.hunk.Hunk;
|
||||
import lombok.Getter;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.block.data.BlockData;
|
||||
@@ -1,11 +1,11 @@
|
||||
package com.volmit.iris.v2.generator.actuator;
|
||||
package com.volmit.iris.generator.actuator;
|
||||
|
||||
import com.volmit.iris.object.IrisBiome;
|
||||
import com.volmit.iris.util.KList;
|
||||
import com.volmit.iris.util.RNG;
|
||||
import com.volmit.iris.v2.scaffold.engine.Engine;
|
||||
import com.volmit.iris.v2.scaffold.engine.EngineAssignedActuator;
|
||||
import com.volmit.iris.v2.scaffold.hunk.Hunk;
|
||||
import com.volmit.iris.scaffold.engine.Engine;
|
||||
import com.volmit.iris.scaffold.engine.EngineAssignedActuator;
|
||||
import com.volmit.iris.scaffold.hunk.Hunk;
|
||||
import lombok.Getter;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.block.data.BlockData;
|
||||
@@ -1,11 +1,11 @@
|
||||
package com.volmit.iris.v2.generator.decorator;
|
||||
package com.volmit.iris.generator.decorator;
|
||||
|
||||
import com.volmit.iris.object.DecorationPart;
|
||||
import com.volmit.iris.object.IrisBiome;
|
||||
import com.volmit.iris.object.IrisDecorator;
|
||||
import com.volmit.iris.v2.scaffold.cache.Cache;
|
||||
import com.volmit.iris.v2.scaffold.engine.Engine;
|
||||
import com.volmit.iris.v2.scaffold.hunk.Hunk;
|
||||
import com.volmit.iris.scaffold.cache.Cache;
|
||||
import com.volmit.iris.scaffold.engine.Engine;
|
||||
import com.volmit.iris.scaffold.hunk.Hunk;
|
||||
import org.bukkit.block.data.BlockData;
|
||||
|
||||
public class IrisCeilingDecorator extends IrisEngineDecorator
|
||||
@@ -1,12 +1,12 @@
|
||||
package com.volmit.iris.v2.generator.decorator;
|
||||
package com.volmit.iris.generator.decorator;
|
||||
|
||||
import com.volmit.iris.object.DecorationPart;
|
||||
import com.volmit.iris.object.IrisBiome;
|
||||
import com.volmit.iris.object.IrisDecorator;
|
||||
import com.volmit.iris.util.RNG;
|
||||
import com.volmit.iris.v2.scaffold.engine.Engine;
|
||||
import com.volmit.iris.v2.scaffold.engine.EngineAssignedComponent;
|
||||
import com.volmit.iris.v2.scaffold.engine.EngineDecorator;
|
||||
import com.volmit.iris.scaffold.engine.Engine;
|
||||
import com.volmit.iris.scaffold.engine.EngineAssignedComponent;
|
||||
import com.volmit.iris.scaffold.engine.EngineDecorator;
|
||||
import lombok.Getter;
|
||||
|
||||
public abstract class IrisEngineDecorator extends EngineAssignedComponent implements EngineDecorator {
|
||||
@@ -1,11 +1,11 @@
|
||||
package com.volmit.iris.v2.generator.decorator;
|
||||
package com.volmit.iris.generator.decorator;
|
||||
|
||||
import com.volmit.iris.object.DecorationPart;
|
||||
import com.volmit.iris.object.IrisBiome;
|
||||
import com.volmit.iris.object.IrisDecorator;
|
||||
import com.volmit.iris.v2.scaffold.cache.Cache;
|
||||
import com.volmit.iris.v2.scaffold.engine.Engine;
|
||||
import com.volmit.iris.v2.scaffold.hunk.Hunk;
|
||||
import com.volmit.iris.scaffold.cache.Cache;
|
||||
import com.volmit.iris.scaffold.engine.Engine;
|
||||
import com.volmit.iris.scaffold.hunk.Hunk;
|
||||
import org.bukkit.block.data.BlockData;
|
||||
|
||||
public class IrisSeaSurfaceDecorator extends IrisEngineDecorator
|
||||
@@ -1,11 +1,11 @@
|
||||
package com.volmit.iris.v2.generator.decorator;
|
||||
package com.volmit.iris.generator.decorator;
|
||||
|
||||
import com.volmit.iris.object.DecorationPart;
|
||||
import com.volmit.iris.object.IrisBiome;
|
||||
import com.volmit.iris.object.IrisDecorator;
|
||||
import com.volmit.iris.v2.scaffold.cache.Cache;
|
||||
import com.volmit.iris.v2.scaffold.engine.Engine;
|
||||
import com.volmit.iris.v2.scaffold.hunk.Hunk;
|
||||
import com.volmit.iris.scaffold.cache.Cache;
|
||||
import com.volmit.iris.scaffold.engine.Engine;
|
||||
import com.volmit.iris.scaffold.hunk.Hunk;
|
||||
import org.bukkit.block.data.BlockData;
|
||||
|
||||
public class IrisShoreLineDecorator extends IrisEngineDecorator
|
||||
@@ -1,12 +1,12 @@
|
||||
package com.volmit.iris.v2.generator.decorator;
|
||||
package com.volmit.iris.generator.decorator;
|
||||
|
||||
import com.volmit.iris.object.DecorationPart;
|
||||
import com.volmit.iris.object.InferredType;
|
||||
import com.volmit.iris.object.IrisBiome;
|
||||
import com.volmit.iris.object.IrisDecorator;
|
||||
import com.volmit.iris.v2.scaffold.cache.Cache;
|
||||
import com.volmit.iris.v2.scaffold.engine.Engine;
|
||||
import com.volmit.iris.v2.scaffold.hunk.Hunk;
|
||||
import com.volmit.iris.scaffold.cache.Cache;
|
||||
import com.volmit.iris.scaffold.engine.Engine;
|
||||
import com.volmit.iris.scaffold.hunk.Hunk;
|
||||
import org.bukkit.block.data.BlockData;
|
||||
|
||||
public class IrisSurfaceDecorator extends IrisEngineDecorator
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.volmit.iris.gen;
|
||||
package com.volmit.iris.generator.legacy;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
@@ -22,18 +22,18 @@ import org.bukkit.event.world.ChunkUnloadEvent;
|
||||
import org.bukkit.event.world.WorldUnloadEvent;
|
||||
|
||||
import com.volmit.iris.Iris;
|
||||
import com.volmit.iris.gen.atomics.AtomicCache;
|
||||
import com.volmit.iris.gen.atomics.AtomicMulticache;
|
||||
import com.volmit.iris.gen.scaffold.GeneratedChunk;
|
||||
import com.volmit.iris.gen.scaffold.IrisContext;
|
||||
import com.volmit.iris.gen.scaffold.IrisMetrics;
|
||||
import com.volmit.iris.gen.scaffold.Provisioned;
|
||||
import com.volmit.iris.gen.scaffold.TerrainChunk;
|
||||
import com.volmit.iris.gen.scaffold.TerrainProvider;
|
||||
import com.volmit.iris.gen.scaffold.TerrainTarget;
|
||||
import com.volmit.iris.v2.scaffold.data.DataProvider;
|
||||
import com.volmit.iris.generator.legacy.atomics.AtomicCache;
|
||||
import com.volmit.iris.generator.legacy.atomics.AtomicMulticache;
|
||||
import com.volmit.iris.generator.legacy.scaffold.GeneratedChunk;
|
||||
import com.volmit.iris.generator.legacy.scaffold.IrisContext;
|
||||
import com.volmit.iris.generator.legacy.scaffold.IrisMetrics;
|
||||
import com.volmit.iris.generator.legacy.scaffold.Provisioned;
|
||||
import com.volmit.iris.generator.legacy.scaffold.TerrainChunk;
|
||||
import com.volmit.iris.generator.legacy.scaffold.TerrainProvider;
|
||||
import com.volmit.iris.generator.legacy.scaffold.TerrainTarget;
|
||||
import com.volmit.iris.scaffold.data.DataProvider;
|
||||
import com.volmit.iris.manager.IrisDataManager;
|
||||
import com.volmit.iris.noise.CNG;
|
||||
import com.volmit.iris.generator.noise.CNG;
|
||||
import com.volmit.iris.object.IrisBiome;
|
||||
import com.volmit.iris.object.IrisDimension;
|
||||
import com.volmit.iris.object.IrisGenerator;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.volmit.iris.gen;
|
||||
package com.volmit.iris.generator.legacy;
|
||||
|
||||
import java.io.File;
|
||||
|
||||
@@ -9,7 +9,7 @@ import org.bukkit.entity.Player;
|
||||
|
||||
import com.volmit.iris.Iris;
|
||||
import com.volmit.iris.IrisSettings;
|
||||
import com.volmit.iris.gen.scaffold.TerrainTarget;
|
||||
import com.volmit.iris.generator.legacy.scaffold.TerrainTarget;
|
||||
import com.volmit.iris.object.InferredType;
|
||||
import com.volmit.iris.object.IrisBiome;
|
||||
import com.volmit.iris.object.IrisDimension;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.volmit.iris.gen;
|
||||
package com.volmit.iris.generator.legacy;
|
||||
|
||||
import java.awt.Color;
|
||||
import java.io.File;
|
||||
@@ -20,14 +20,14 @@ import org.bukkit.util.BlockVector;
|
||||
|
||||
import com.volmit.iris.Iris;
|
||||
import com.volmit.iris.IrisSettings;
|
||||
import com.volmit.iris.gen.atomics.AtomicRegionData;
|
||||
import com.volmit.iris.gen.scaffold.GeneratedChunk;
|
||||
import com.volmit.iris.gen.scaffold.IrisContext;
|
||||
import com.volmit.iris.gen.scaffold.IrisGenConfiguration;
|
||||
import com.volmit.iris.gen.scaffold.TerrainChunk;
|
||||
import com.volmit.iris.gen.scaffold.TerrainTarget;
|
||||
import com.volmit.iris.gui.Renderer;
|
||||
import com.volmit.iris.noise.CNG;
|
||||
import com.volmit.iris.generator.legacy.atomics.AtomicRegionData;
|
||||
import com.volmit.iris.generator.legacy.scaffold.GeneratedChunk;
|
||||
import com.volmit.iris.generator.legacy.scaffold.IrisContext;
|
||||
import com.volmit.iris.generator.legacy.scaffold.IrisGenConfiguration;
|
||||
import com.volmit.iris.generator.legacy.scaffold.TerrainChunk;
|
||||
import com.volmit.iris.generator.legacy.scaffold.TerrainTarget;
|
||||
import com.volmit.iris.manager.gui.Renderer;
|
||||
import com.volmit.iris.generator.noise.CNG;
|
||||
import com.volmit.iris.object.IrisBiome;
|
||||
import com.volmit.iris.object.IrisBlockDrops;
|
||||
import com.volmit.iris.object.IrisDimension;
|
||||
@@ -1,47 +1,27 @@
|
||||
package com.volmit.iris.gen;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.List;
|
||||
package com.volmit.iris.generator.legacy;
|
||||
|
||||
import com.volmit.iris.Iris;
|
||||
import com.volmit.iris.IrisSettings;
|
||||
import com.volmit.iris.generator.legacy.atomics.AtomicSliver;
|
||||
import com.volmit.iris.generator.legacy.atomics.AtomicSliverMap;
|
||||
import com.volmit.iris.generator.legacy.atomics.AtomicWorldData;
|
||||
import com.volmit.iris.generator.legacy.atomics.MasterLock;
|
||||
import com.volmit.iris.generator.legacy.layer.GenLayerText;
|
||||
import com.volmit.iris.generator.legacy.layer.GenLayerUpdate;
|
||||
import com.volmit.iris.generator.legacy.scaffold.TerrainChunk;
|
||||
import com.volmit.iris.generator.legacy.scaffold.TerrainTarget;
|
||||
import com.volmit.iris.object.*;
|
||||
import com.volmit.iris.util.*;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.bukkit.Chunk;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.block.data.BlockData;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.generator.BlockPopulator;
|
||||
|
||||
import com.volmit.iris.Iris;
|
||||
import com.volmit.iris.IrisSettings;
|
||||
import com.volmit.iris.gen.atomics.AtomicSliver;
|
||||
import com.volmit.iris.gen.atomics.AtomicSliverMap;
|
||||
import com.volmit.iris.gen.atomics.AtomicWorldData;
|
||||
import com.volmit.iris.gen.atomics.MasterLock;
|
||||
import com.volmit.iris.gen.layer.GenLayerText;
|
||||
import com.volmit.iris.gen.layer.GenLayerUpdate;
|
||||
import com.volmit.iris.gen.scaffold.TerrainChunk;
|
||||
import com.volmit.iris.gen.scaffold.TerrainTarget;
|
||||
import com.volmit.iris.object.IrisBiome;
|
||||
import com.volmit.iris.object.IrisBiomeMutation;
|
||||
import com.volmit.iris.object.IrisObjectPlacement;
|
||||
import com.volmit.iris.object.IrisRegion;
|
||||
import com.volmit.iris.object.IrisStructurePlacement;
|
||||
import com.volmit.iris.object.IrisTextPlacement;
|
||||
import com.volmit.iris.util.BiomeMap;
|
||||
import com.volmit.iris.util.CarveResult;
|
||||
import com.volmit.iris.util.CaveResult;
|
||||
import com.volmit.iris.util.ChunkPosition;
|
||||
import com.volmit.iris.util.HeightMap;
|
||||
import com.volmit.iris.util.IObjectPlacer;
|
||||
import com.volmit.iris.util.IrisLock;
|
||||
import com.volmit.iris.util.IrisStructureResult;
|
||||
import com.volmit.iris.util.J;
|
||||
import com.volmit.iris.util.KList;
|
||||
import com.volmit.iris.util.KMap;
|
||||
import com.volmit.iris.util.PrecisionStopwatch;
|
||||
import com.volmit.iris.util.RNG;
|
||||
import com.volmit.iris.util.Spiraler;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import java.io.IOException;
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@@ -1,11 +1,11 @@
|
||||
package com.volmit.iris.gen;
|
||||
package com.volmit.iris.generator.legacy;
|
||||
|
||||
import com.volmit.iris.Iris;
|
||||
import com.volmit.iris.gen.atomics.AtomicSliver;
|
||||
import com.volmit.iris.gen.atomics.AtomicSliverMap;
|
||||
import com.volmit.iris.gen.scaffold.GeneratedChunk;
|
||||
import com.volmit.iris.gen.scaffold.TerrainChunk;
|
||||
import com.volmit.iris.gen.scaffold.TerrainTarget;
|
||||
import com.volmit.iris.generator.legacy.atomics.AtomicSliver;
|
||||
import com.volmit.iris.generator.legacy.atomics.AtomicSliverMap;
|
||||
import com.volmit.iris.generator.legacy.scaffold.GeneratedChunk;
|
||||
import com.volmit.iris.generator.legacy.scaffold.TerrainChunk;
|
||||
import com.volmit.iris.generator.legacy.scaffold.TerrainTarget;
|
||||
import com.volmit.iris.util.BiomeMap;
|
||||
import com.volmit.iris.util.GroupedExecutor;
|
||||
import com.volmit.iris.util.HeightMap;
|
||||
@@ -1,13 +1,13 @@
|
||||
package com.volmit.iris.gen;
|
||||
package com.volmit.iris.generator.legacy;
|
||||
|
||||
import org.bukkit.block.data.BlockData;
|
||||
import org.bukkit.generator.ChunkGenerator.ChunkData;
|
||||
|
||||
import com.volmit.iris.Iris;
|
||||
import com.volmit.iris.gen.post.PostMasterPatcher;
|
||||
import com.volmit.iris.gen.scaffold.GeneratedChunk;
|
||||
import com.volmit.iris.gen.scaffold.TerrainChunk;
|
||||
import com.volmit.iris.gen.scaffold.TerrainTarget;
|
||||
import com.volmit.iris.generator.legacy.post.PostMasterPatcher;
|
||||
import com.volmit.iris.generator.legacy.scaffold.GeneratedChunk;
|
||||
import com.volmit.iris.generator.legacy.scaffold.TerrainChunk;
|
||||
import com.volmit.iris.generator.legacy.scaffold.TerrainTarget;
|
||||
import com.volmit.iris.util.CaveResult;
|
||||
import com.volmit.iris.util.IPostBlockAccess;
|
||||
import com.volmit.iris.util.IrisLock;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.volmit.iris.gen;
|
||||
package com.volmit.iris.generator.legacy;
|
||||
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.block.Biome;
|
||||
@@ -6,16 +6,16 @@ import org.bukkit.block.data.Bisected;
|
||||
import org.bukkit.block.data.Bisected.Half;
|
||||
|
||||
import com.volmit.iris.Iris;
|
||||
import com.volmit.iris.gen.atomics.AtomicSliver;
|
||||
import com.volmit.iris.gen.atomics.AtomicSliverMap;
|
||||
import com.volmit.iris.gen.layer.GenLayerBiome;
|
||||
import com.volmit.iris.gen.layer.GenLayerCarve;
|
||||
import com.volmit.iris.gen.layer.GenLayerCave;
|
||||
import com.volmit.iris.gen.layer.GenLayerRavine;
|
||||
import com.volmit.iris.gen.scaffold.GeneratedChunk;
|
||||
import com.volmit.iris.gen.scaffold.TerrainChunk;
|
||||
import com.volmit.iris.gen.scaffold.TerrainTarget;
|
||||
import com.volmit.iris.noise.CNG;
|
||||
import com.volmit.iris.generator.legacy.atomics.AtomicSliver;
|
||||
import com.volmit.iris.generator.legacy.atomics.AtomicSliverMap;
|
||||
import com.volmit.iris.generator.legacy.layer.GenLayerBiome;
|
||||
import com.volmit.iris.generator.legacy.layer.GenLayerCarve;
|
||||
import com.volmit.iris.generator.legacy.layer.GenLayerCave;
|
||||
import com.volmit.iris.generator.legacy.layer.GenLayerRavine;
|
||||
import com.volmit.iris.generator.legacy.scaffold.GeneratedChunk;
|
||||
import com.volmit.iris.generator.legacy.scaffold.TerrainChunk;
|
||||
import com.volmit.iris.generator.legacy.scaffold.TerrainTarget;
|
||||
import com.volmit.iris.generator.noise.CNG;
|
||||
import com.volmit.iris.object.DecorationPart;
|
||||
import com.volmit.iris.object.InferredType;
|
||||
import com.volmit.iris.object.IrisBiome;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.volmit.iris.gen.atomics;
|
||||
package com.volmit.iris.generator.legacy.atomics;
|
||||
|
||||
import com.volmit.iris.object.IrisBiome;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.volmit.iris.gen.atomics;
|
||||
package com.volmit.iris.generator.legacy.atomics;
|
||||
|
||||
import java.util.function.Supplier;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.volmit.iris.gen.atomics;
|
||||
package com.volmit.iris.generator.legacy.atomics;
|
||||
|
||||
import com.google.common.util.concurrent.AtomicDoubleArray;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.volmit.iris.gen.atomics;
|
||||
package com.volmit.iris.generator.legacy.atomics;
|
||||
|
||||
import java.util.concurrent.atomic.AtomicIntegerArray;
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
package com.volmit.iris.gen.atomics;
|
||||
package com.volmit.iris.generator.legacy.atomics;
|
||||
|
||||
import com.github.benmanes.caffeine.cache.Caffeine;
|
||||
import com.github.benmanes.caffeine.cache.LoadingCache;
|
||||
import com.volmit.iris.IrisSettings;
|
||||
import com.volmit.iris.gen.IrisTerrainProvider;
|
||||
import com.volmit.iris.generator.legacy.IrisTerrainProvider;
|
||||
import com.volmit.iris.object.IrisBiome;
|
||||
import com.volmit.iris.object.IrisRegion;
|
||||
import com.volmit.iris.util.ChunkPosition;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.volmit.iris.gen.atomics;
|
||||
package com.volmit.iris.generator.legacy.atomics;
|
||||
|
||||
import java.util.concurrent.atomic.AtomicReferenceArray;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.volmit.iris.gen.atomics;
|
||||
package com.volmit.iris.generator.legacy.atomics;
|
||||
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.io.ByteArrayOutputStream;
|
||||
@@ -9,7 +9,7 @@ import java.util.zip.GZIPInputStream;
|
||||
|
||||
import com.volmit.iris.Iris;
|
||||
import com.volmit.iris.IrisSettings;
|
||||
import com.volmit.iris.gen.scaffold.TerrainTarget;
|
||||
import com.volmit.iris.generator.legacy.scaffold.TerrainTarget;
|
||||
import com.volmit.iris.util.ByteArrayTag;
|
||||
import com.volmit.iris.util.CompoundTag;
|
||||
import com.volmit.iris.util.CustomOutputStream;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.volmit.iris.gen.atomics;
|
||||
package com.volmit.iris.generator.legacy.atomics;
|
||||
|
||||
import com.volmit.iris.object.IrisRegion;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.volmit.iris.gen.atomics;
|
||||
package com.volmit.iris.generator.legacy.atomics;
|
||||
|
||||
import java.io.DataInputStream;
|
||||
import java.io.DataOutputStream;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.volmit.iris.gen.atomics;
|
||||
package com.volmit.iris.generator.legacy.atomics;
|
||||
|
||||
import java.io.DataInputStream;
|
||||
import java.io.DataOutputStream;
|
||||
@@ -9,7 +9,7 @@ import java.io.OutputStream;
|
||||
import org.bukkit.generator.ChunkGenerator.BiomeGrid;
|
||||
import org.bukkit.generator.ChunkGenerator.ChunkData;
|
||||
|
||||
import com.volmit.iris.gen.DimensionalTerrainProvider;
|
||||
import com.volmit.iris.generator.legacy.DimensionalTerrainProvider;
|
||||
import com.volmit.iris.object.IrisStructure;
|
||||
import com.volmit.iris.object.IrisStructureTile;
|
||||
import com.volmit.iris.util.HeightMap;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.volmit.iris.gen.atomics;
|
||||
package com.volmit.iris.generator.legacy.atomics;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
@@ -6,7 +6,7 @@ import java.io.FileOutputStream;
|
||||
import java.io.IOException;
|
||||
|
||||
import com.volmit.iris.Iris;
|
||||
import com.volmit.iris.gen.scaffold.TerrainTarget;
|
||||
import com.volmit.iris.generator.legacy.scaffold.TerrainTarget;
|
||||
import com.volmit.iris.util.ChunkPosition;
|
||||
import com.volmit.iris.util.IrisLock;
|
||||
import com.volmit.iris.util.KList;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.volmit.iris.gen.atomics;
|
||||
package com.volmit.iris.generator.legacy.atomics;
|
||||
|
||||
import com.volmit.iris.util.IrisLock;
|
||||
import com.volmit.iris.util.KMap;
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.volmit.iris.gen.layer;
|
||||
package com.volmit.iris.generator.legacy.layer;
|
||||
|
||||
import com.volmit.iris.Iris;
|
||||
import com.volmit.iris.gen.ContextualTerrainProvider;
|
||||
import com.volmit.iris.noise.CNG;
|
||||
import com.volmit.iris.generator.legacy.ContextualTerrainProvider;
|
||||
import com.volmit.iris.generator.noise.CNG;
|
||||
import com.volmit.iris.object.InferredType;
|
||||
import com.volmit.iris.object.IrisBiome;
|
||||
import com.volmit.iris.object.IrisGeneratorStyle;
|
||||
@@ -1,10 +1,10 @@
|
||||
package com.volmit.iris.gen.layer;
|
||||
package com.volmit.iris.generator.legacy.layer;
|
||||
|
||||
import com.volmit.iris.Iris;
|
||||
import com.volmit.iris.IrisSettings;
|
||||
import com.volmit.iris.gen.DimensionalTerrainProvider;
|
||||
import com.volmit.iris.gen.TopographicTerrainProvider;
|
||||
import com.volmit.iris.noise.CNG;
|
||||
import com.volmit.iris.generator.legacy.DimensionalTerrainProvider;
|
||||
import com.volmit.iris.generator.legacy.TopographicTerrainProvider;
|
||||
import com.volmit.iris.generator.noise.CNG;
|
||||
import com.volmit.iris.object.InferredType;
|
||||
import com.volmit.iris.object.IrisBiome;
|
||||
import com.volmit.iris.object.IrisRegion;
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.volmit.iris.gen.layer;
|
||||
package com.volmit.iris.generator.legacy.layer;
|
||||
|
||||
import com.volmit.iris.gen.TopographicTerrainProvider;
|
||||
import com.volmit.iris.generator.legacy.TopographicTerrainProvider;
|
||||
import com.volmit.iris.object.IrisCarveLayer;
|
||||
import com.volmit.iris.util.CarveResult;
|
||||
import com.volmit.iris.util.GenLayer;
|
||||
@@ -1,16 +1,16 @@
|
||||
package com.volmit.iris.gen.layer;
|
||||
package com.volmit.iris.generator.legacy.layer;
|
||||
|
||||
import java.util.function.Function;
|
||||
|
||||
import com.volmit.iris.util.*;
|
||||
import org.bukkit.Material;
|
||||
|
||||
import com.volmit.iris.gen.TopographicTerrainProvider;
|
||||
import com.volmit.iris.gen.atomics.AtomicSliver;
|
||||
import com.volmit.iris.noise.FastNoiseDouble;
|
||||
import com.volmit.iris.noise.FastNoiseDouble.CellularDistanceFunction;
|
||||
import com.volmit.iris.noise.FastNoiseDouble.CellularReturnType;
|
||||
import com.volmit.iris.noise.FastNoiseDouble.NoiseType;
|
||||
import com.volmit.iris.generator.legacy.TopographicTerrainProvider;
|
||||
import com.volmit.iris.generator.legacy.atomics.AtomicSliver;
|
||||
import com.volmit.iris.generator.noise.FastNoiseDouble;
|
||||
import com.volmit.iris.generator.noise.FastNoiseDouble.CellularDistanceFunction;
|
||||
import com.volmit.iris.generator.noise.FastNoiseDouble.CellularReturnType;
|
||||
import com.volmit.iris.generator.noise.FastNoiseDouble.NoiseType;
|
||||
import com.volmit.iris.object.IrisCaveLayer;
|
||||
import org.bukkit.block.data.BlockData;
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
package com.volmit.iris.gen.layer;
|
||||
package com.volmit.iris.generator.legacy.layer;
|
||||
|
||||
import org.bukkit.Material;
|
||||
|
||||
import com.volmit.iris.gen.TopographicTerrainProvider;
|
||||
import com.volmit.iris.gen.atomics.AtomicSliverMap;
|
||||
import com.volmit.iris.gen.scaffold.TerrainChunk;
|
||||
import com.volmit.iris.noise.CNG;
|
||||
import com.volmit.iris.generator.legacy.TopographicTerrainProvider;
|
||||
import com.volmit.iris.generator.legacy.atomics.AtomicSliverMap;
|
||||
import com.volmit.iris.generator.legacy.scaffold.TerrainChunk;
|
||||
import com.volmit.iris.generator.noise.CNG;
|
||||
import com.volmit.iris.object.NoiseStyle;
|
||||
import com.volmit.iris.util.B;
|
||||
import com.volmit.iris.util.BiomeMap;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.volmit.iris.gen.layer;
|
||||
package com.volmit.iris.generator.legacy.layer;
|
||||
|
||||
import java.awt.Font;
|
||||
import java.awt.Graphics;
|
||||
@@ -6,8 +6,8 @@ import java.awt.Graphics2D;
|
||||
import java.awt.image.BufferedImage;
|
||||
|
||||
import com.volmit.iris.Iris;
|
||||
import com.volmit.iris.gen.TopographicTerrainProvider;
|
||||
import com.volmit.iris.gen.atomics.AtomicCache;
|
||||
import com.volmit.iris.generator.legacy.TopographicTerrainProvider;
|
||||
import com.volmit.iris.generator.legacy.atomics.AtomicCache;
|
||||
import com.volmit.iris.object.IrisMaterialPalette;
|
||||
import com.volmit.iris.object.IrisObject;
|
||||
import com.volmit.iris.util.B;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.volmit.iris.gen.layer;
|
||||
package com.volmit.iris.generator.legacy.layer;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.Random;
|
||||
@@ -14,10 +14,10 @@ import org.bukkit.inventory.InventoryHolder;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
|
||||
import com.volmit.iris.IrisSettings;
|
||||
import com.volmit.iris.gen.IrisTerrainProvider;
|
||||
import com.volmit.iris.gen.ParallaxTerrainProvider;
|
||||
import com.volmit.iris.gen.atomics.AtomicSliverMap;
|
||||
import com.volmit.iris.gen.scaffold.ChunkWrapper;
|
||||
import com.volmit.iris.generator.legacy.IrisTerrainProvider;
|
||||
import com.volmit.iris.generator.legacy.ParallaxTerrainProvider;
|
||||
import com.volmit.iris.generator.legacy.atomics.AtomicSliverMap;
|
||||
import com.volmit.iris.generator.legacy.scaffold.ChunkWrapper;
|
||||
import com.volmit.iris.object.InventorySlotType;
|
||||
import com.volmit.iris.object.IrisBiome;
|
||||
import com.volmit.iris.object.IrisDepositGenerator;
|
||||
@@ -1,10 +1,9 @@
|
||||
package com.volmit.iris.gen.nms;
|
||||
package com.volmit.iris.generator.legacy.nms;
|
||||
|
||||
import com.volmit.iris.Iris;
|
||||
import com.volmit.iris.IrisSettings;
|
||||
import com.volmit.iris.gen.nms.v16_2.NMSBinding16_2;
|
||||
import com.volmit.iris.gen.nms.v16_3.NMSBinding16_3;
|
||||
import com.volmit.iris.gen.nms.v1X.NMSBinding1X;
|
||||
import com.volmit.iris.generator.legacy.nms.v16_2.NMSBinding16_2;
|
||||
import com.volmit.iris.generator.legacy.nms.v1X.NMSBinding1X;
|
||||
import com.volmit.iris.util.KMap;
|
||||
import org.bukkit.Bukkit;
|
||||
|
||||
@@ -12,8 +11,7 @@ public class INMS
|
||||
{
|
||||
//@builder
|
||||
private static final KMap<String, Class<? extends INMSBinding>> bindings = new KMap<String, Class<? extends INMSBinding>>()
|
||||
.qput("v1_16_R2", NMSBinding16_2.class)
|
||||
.qput("v1_16_R3", NMSBinding16_3.class);
|
||||
.qput("v1_16_R2", NMSBinding16_2.class);
|
||||
//@done
|
||||
private static final INMSBinding binding = bind();
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.volmit.iris.gen.nms;
|
||||
package com.volmit.iris.generator.legacy.nms;
|
||||
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.WorldCreator;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.volmit.iris.gen.nms;
|
||||
package com.volmit.iris.generator.legacy.nms;
|
||||
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.WorldCreator;
|
||||
@@ -0,0 +1,16 @@
|
||||
package com.volmit.iris.generator.legacy.nms.v16_2;
|
||||
|
||||
import com.volmit.iris.generator.legacy.atomics.AtomicCache;
|
||||
import com.volmit.iris.generator.legacy.nms.INMSBinding;
|
||||
import com.volmit.iris.generator.legacy.nms.INMSCreator;
|
||||
|
||||
public class NMSBinding16_2 implements INMSBinding
|
||||
{
|
||||
private final AtomicCache<INMSCreator> creator = new AtomicCache<>();
|
||||
|
||||
@Override
|
||||
public INMSCreator getCreator()
|
||||
{
|
||||
return creator.aquire(NMSCreator16_2::new);
|
||||
}
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.volmit.iris.gen.nms.v16_2;
|
||||
package com.volmit.iris.generator.legacy.nms.v16_2;
|
||||
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
@@ -1,12 +1,14 @@
|
||||
package com.volmit.iris.gen.nms.v16_2;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Random;
|
||||
import java.util.function.Supplier;
|
||||
package com.volmit.iris.generator.legacy.nms.v16_2;
|
||||
|
||||
import com.mojang.serialization.Codec;
|
||||
import com.volmit.iris.generator.legacy.provisions.ProvisionBukkit;
|
||||
import com.volmit.iris.generator.legacy.scaffold.GeneratedChunk;
|
||||
import com.volmit.iris.scaffold.engine.IrisAccess;
|
||||
import com.volmit.iris.util.O;
|
||||
import com.volmit.iris.util.V;
|
||||
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
|
||||
import it.unimi.dsi.fastutil.objects.ObjectList;
|
||||
import net.minecraft.server.v1_16_R2.*;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.block.Biome;
|
||||
import org.bukkit.block.data.BlockData;
|
||||
@@ -17,71 +19,14 @@ import org.bukkit.generator.ChunkGenerator.BiomeGrid;
|
||||
import org.bukkit.generator.ChunkGenerator.ChunkData;
|
||||
import org.bukkit.material.MaterialData;
|
||||
|
||||
import com.mojang.serialization.Codec;
|
||||
import com.volmit.iris.gen.IrisTerrainProvider;
|
||||
import com.volmit.iris.gen.provisions.ProvisionBukkit;
|
||||
import com.volmit.iris.gen.scaffold.GeneratedChunk;
|
||||
import com.volmit.iris.gen.scaffold.Provisioned;
|
||||
import com.volmit.iris.gen.scaffold.ProvisionedHolder;
|
||||
import com.volmit.iris.gen.scaffold.TerrainProvider;
|
||||
import com.volmit.iris.util.O;
|
||||
import com.volmit.iris.util.V;
|
||||
|
||||
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
|
||||
import it.unimi.dsi.fastutil.objects.ObjectList;
|
||||
import net.minecraft.server.v1_16_R2.BiomeBase;
|
||||
import net.minecraft.server.v1_16_R2.BiomeManager;
|
||||
import net.minecraft.server.v1_16_R2.BiomeSettingsMobs;
|
||||
import net.minecraft.server.v1_16_R2.Block;
|
||||
import net.minecraft.server.v1_16_R2.BlockColumn;
|
||||
import net.minecraft.server.v1_16_R2.BlockPosition;
|
||||
import net.minecraft.server.v1_16_R2.Blocks;
|
||||
import net.minecraft.server.v1_16_R2.ChunkCoordIntPair;
|
||||
import net.minecraft.server.v1_16_R2.ChunkGenerator;
|
||||
import net.minecraft.server.v1_16_R2.ChunkGeneratorAbstract;
|
||||
import net.minecraft.server.v1_16_R2.CrashReport;
|
||||
import net.minecraft.server.v1_16_R2.CrashReportSystemDetails;
|
||||
import net.minecraft.server.v1_16_R2.DefinedStructureManager;
|
||||
import net.minecraft.server.v1_16_R2.EnumCreatureType;
|
||||
import net.minecraft.server.v1_16_R2.GeneratorAccess;
|
||||
import net.minecraft.server.v1_16_R2.GeneratorAccessSeed;
|
||||
import net.minecraft.server.v1_16_R2.GeneratorSettingBase;
|
||||
import net.minecraft.server.v1_16_R2.HeightMap;
|
||||
import net.minecraft.server.v1_16_R2.IBlockAccess;
|
||||
import net.minecraft.server.v1_16_R2.IBlockData;
|
||||
import net.minecraft.server.v1_16_R2.IChunkAccess;
|
||||
import net.minecraft.server.v1_16_R2.IRegistry;
|
||||
import net.minecraft.server.v1_16_R2.IRegistryCustom;
|
||||
import net.minecraft.server.v1_16_R2.IStructureAccess;
|
||||
import net.minecraft.server.v1_16_R2.NoiseSettings;
|
||||
import net.minecraft.server.v1_16_R2.PacketDebug;
|
||||
import net.minecraft.server.v1_16_R2.ProtoChunk;
|
||||
import net.minecraft.server.v1_16_R2.RegionLimitedWorldAccess;
|
||||
import net.minecraft.server.v1_16_R2.ReportedException;
|
||||
import net.minecraft.server.v1_16_R2.ResourceKey;
|
||||
import net.minecraft.server.v1_16_R2.SectionPosition;
|
||||
import net.minecraft.server.v1_16_R2.SeededRandom;
|
||||
import net.minecraft.server.v1_16_R2.SpawnerCreature;
|
||||
import net.minecraft.server.v1_16_R2.StructureBoundingBox;
|
||||
import net.minecraft.server.v1_16_R2.StructureFeature;
|
||||
import net.minecraft.server.v1_16_R2.StructureFeatures;
|
||||
import net.minecraft.server.v1_16_R2.StructureGenerator;
|
||||
import net.minecraft.server.v1_16_R2.StructureManager;
|
||||
import net.minecraft.server.v1_16_R2.StructurePiece;
|
||||
import net.minecraft.server.v1_16_R2.StructureSettingsFeature;
|
||||
import net.minecraft.server.v1_16_R2.StructureStart;
|
||||
import net.minecraft.server.v1_16_R2.WorldChunkManager;
|
||||
import net.minecraft.server.v1_16_R2.WorldGenFeatureDefinedStructureJigsawJunction;
|
||||
import net.minecraft.server.v1_16_R2.WorldGenFeatureDefinedStructurePoolTemplate;
|
||||
import net.minecraft.server.v1_16_R2.WorldGenFeaturePillagerOutpostPoolPiece;
|
||||
import net.minecraft.server.v1_16_R2.WorldGenStage;
|
||||
import net.minecraft.server.v1_16_R2.WorldServer;
|
||||
import java.util.*;
|
||||
import java.util.function.Supplier;
|
||||
|
||||
@SuppressWarnings("deprecation")
|
||||
public class NMSChunkGenerator16_2_PAPER extends ChunkGenerator implements ProvisionedHolder
|
||||
public class NMSChunkGenerator16_2_PAPER extends ChunkGenerator
|
||||
{
|
||||
private static final IBlockData k = Blocks.AIR.getBlockData();
|
||||
private final Provisioned provisioned;
|
||||
private final IrisAccess provisioned;
|
||||
private final int maxHeight;
|
||||
private final int xzSize;
|
||||
protected final IBlockData f;
|
||||
@@ -91,12 +36,12 @@ public class NMSChunkGenerator16_2_PAPER extends ChunkGenerator implements Provi
|
||||
private final O<WorldServer> ws;
|
||||
private BlockColumn BC;
|
||||
|
||||
public NMSChunkGenerator16_2_PAPER(Provisioned p, O<WorldServer> ws, WorldChunkManager worldchunkmanager, long i, Supplier<GeneratorSettingBase> supplier)
|
||||
public NMSChunkGenerator16_2_PAPER(IrisAccess p, O<WorldServer> ws, WorldChunkManager worldchunkmanager, long i, Supplier<GeneratorSettingBase> supplier)
|
||||
{
|
||||
this(p, ws, worldchunkmanager, worldchunkmanager, i, supplier);
|
||||
}
|
||||
|
||||
private NMSChunkGenerator16_2_PAPER(Provisioned p, O<WorldServer> ws, WorldChunkManager worldchunkmanager, WorldChunkManager worldchunkmanager1, long i, Supplier<GeneratorSettingBase> supplier)
|
||||
private NMSChunkGenerator16_2_PAPER(IrisAccess p, O<WorldServer> ws, WorldChunkManager worldchunkmanager, WorldChunkManager worldchunkmanager1, long i, Supplier<GeneratorSettingBase> supplier)
|
||||
{
|
||||
super(worldchunkmanager, worldchunkmanager1, supplier.get().a(), i);
|
||||
this.provisioned = p;
|
||||
@@ -131,7 +76,7 @@ public class NMSChunkGenerator16_2_PAPER extends ChunkGenerator implements Provi
|
||||
|
||||
public void doCarving(long i, BiomeManager biomemanager, IChunkAccess ichunkaccess, WorldGenStage.Features worldgenstage_features)
|
||||
{
|
||||
if(((IrisTerrainProvider) provisioned.getProvider()).getDimension().isVanillaCaves())
|
||||
if(provisioned.getCompound().getRootDimension().isVanillaCaves())
|
||||
{
|
||||
super.doCarving(i, biomemanager, ichunkaccess, worldgenstage_features);
|
||||
}
|
||||
@@ -195,7 +140,7 @@ public class NMSChunkGenerator16_2_PAPER extends ChunkGenerator implements Provi
|
||||
int i = chunkcoordintpair.x;
|
||||
int j = chunkcoordintpair.z;
|
||||
|
||||
if(((IrisTerrainProvider) provisioned.getProvider()).shouldGenerateVanillaStructures())
|
||||
if(provisioned.getCompound().getRootDimension().isVanillaStructures())
|
||||
{
|
||||
int k = i << 4;
|
||||
int l = j << 4;
|
||||
@@ -438,7 +383,7 @@ public class NMSChunkGenerator16_2_PAPER extends ChunkGenerator implements Provi
|
||||
|
||||
public void addDecorations(RegionLimitedWorldAccess regionlimitedworldaccess, StructureManager structuremanager)
|
||||
{
|
||||
if(((IrisTerrainProvider) provisioned.getProvider()).shouldGenerateVanillaStructures())
|
||||
if(provisioned.getCompound().getRootDimension().isVanillaStructures())
|
||||
{
|
||||
int i = regionlimitedworldaccess.a();
|
||||
int j = regionlimitedworldaccess.b();
|
||||
@@ -461,7 +406,7 @@ public class NMSChunkGenerator16_2_PAPER extends ChunkGenerator implements Provi
|
||||
|
||||
public void a(BiomeBase bbase, StructureManager var0, ChunkGenerator var1, RegionLimitedWorldAccess var2, long var3, SeededRandom var5, BlockPosition var6)
|
||||
{
|
||||
if(!((IrisTerrainProvider) provisioned.getProvider()).shouldGenerateVanillaStructures())
|
||||
if(!provisioned.getCompound().getRootDimension().isVanillaStructures())
|
||||
{
|
||||
return;
|
||||
}
|
||||
@@ -592,7 +537,7 @@ public class NMSChunkGenerator16_2_PAPER extends ChunkGenerator implements Provi
|
||||
@Override
|
||||
public int getSeaLevel()
|
||||
{
|
||||
return ((IrisTerrainProvider) provisioned.getProvider()).getFluidHeight();
|
||||
return provisioned.getCompound().getRootDimension().getFluidHeight();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -713,28 +658,4 @@ public class NMSChunkGenerator16_2_PAPER extends ChunkGenerator implements Provi
|
||||
++i1;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public Provisioned getProvisioned()
|
||||
{
|
||||
return provisioned;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void clearRegeneratedLists()
|
||||
{
|
||||
getProvisioned().clearRegeneratedLists();
|
||||
}
|
||||
|
||||
@Override
|
||||
public TerrainProvider getProvider()
|
||||
{
|
||||
return getProvisioned().getProvider();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void regenerate(int x, int z)
|
||||
{
|
||||
getProvisioned().regenerate(x, z);
|
||||
}
|
||||
}
|
||||
@@ -1,24 +1,23 @@
|
||||
package com.volmit.iris.gen.nms.v16_3;
|
||||
package com.volmit.iris.generator.legacy.nms.v16_2;
|
||||
|
||||
import com.google.common.base.Preconditions;
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.google.common.collect.ImmutableSet;
|
||||
import com.mojang.serialization.DynamicOps;
|
||||
import com.mojang.serialization.Lifecycle;
|
||||
import com.volmit.iris.gen.nms.INMSCreator;
|
||||
import com.volmit.iris.gen.scaffold.IrisWorlds;
|
||||
import com.volmit.iris.gen.scaffold.Provisioned;
|
||||
import com.volmit.iris.generator.legacy.nms.INMSCreator;
|
||||
import com.volmit.iris.scaffold.IrisWorlds;
|
||||
import com.volmit.iris.scaffold.engine.IrisAccess;
|
||||
import com.volmit.iris.util.O;
|
||||
import com.volmit.iris.util.V;
|
||||
import io.papermc.lib.PaperLib;
|
||||
import net.minecraft.server.v1_16_R3.*;
|
||||
import net.minecraft.server.v1_16_R3.IRegistryCustom.Dimension;
|
||||
import net.minecraft.server.v1_16_R2.*;
|
||||
import net.minecraft.server.v1_16_R2.IRegistryCustom.Dimension;
|
||||
import org.apache.commons.lang.Validate;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.World.Environment;
|
||||
import org.bukkit.WorldCreator;
|
||||
import org.bukkit.craftbukkit.v1_16_R3.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
|
||||
import org.bukkit.event.Event;
|
||||
import org.bukkit.event.world.WorldInitEvent;
|
||||
import org.bukkit.event.world.WorldLoadEvent;
|
||||
@@ -29,7 +28,7 @@ import java.lang.reflect.Field;
|
||||
import java.lang.reflect.Modifier;
|
||||
import java.util.*;
|
||||
|
||||
class NMSCreator16_3 implements INMSCreator
|
||||
class NMSCreator16_2 implements INMSCreator
|
||||
{
|
||||
@SuppressWarnings({"unchecked", "rawtypes", "resource"})
|
||||
public World createWorld(WorldCreator creator, boolean loadSpawn)
|
||||
@@ -39,7 +38,7 @@ class NMSCreator16_3 implements INMSCreator
|
||||
return creator.createWorld();
|
||||
}
|
||||
|
||||
Provisioned pro = (Provisioned) creator.generator();
|
||||
IrisAccess pro = (IrisAccess) creator.generator();
|
||||
CraftServer server = ((CraftServer) Bukkit.getServer());
|
||||
Map<String, World> worlds = new V(server).get("worlds");
|
||||
DedicatedServer console = new V(server).get("console");
|
||||
@@ -117,22 +116,17 @@ class NMSCreator16_3 implements INMSCreator
|
||||
worlddata.a(console.getServerModName(), console.getModded().isPresent());
|
||||
if(console.options.has("forceUpgrade"))
|
||||
{
|
||||
net.minecraft.server.v1_16_R3.Main.convertWorld(worldSession, DataConverterRegistry.a(), console.options.has("eraseCache"), () -> true, (ImmutableSet) worlddata.getGeneratorSettings().d().d().stream().map(entry -> ResourceKey.a(IRegistry.K, entry.getKey().a())).collect(ImmutableSet.toImmutableSet()));
|
||||
net.minecraft.server.v1_16_R2.Main.convertWorld(worldSession, DataConverterRegistry.a(), console.options.has("eraseCache"), () -> true, (ImmutableSet) worlddata.getGeneratorSettings().d().d().stream().map(entry -> ResourceKey.a(IRegistry.K, entry.getKey().a())).collect(ImmutableSet.toImmutableSet()));
|
||||
}
|
||||
final long j = BiomeManager.a(creator.seed());
|
||||
final List<MobSpawner> list = (List<MobSpawner>) ImmutableList.of((MobSpawner) new MobSpawnerPhantom(), (MobSpawner) new MobSpawnerPatrol(), (MobSpawner) new MobSpawnerCat(), (MobSpawner) new VillageSiege(), (MobSpawner) new MobSpawnerTrader((IWorldDataServer) worlddata));
|
||||
DimensionManager dimensionmanager;
|
||||
net.minecraft.server.v1_16_R3.ChunkGenerator chunkgenerator;
|
||||
net.minecraft.server.v1_16_R2.ChunkGenerator chunkgenerator;
|
||||
long ll = creator.seed();
|
||||
dimensionmanager = (DimensionManager) getConsoleDimension(console).a().d(DimensionManager.OVERWORLD);
|
||||
O<WorldServer> ws = new O<WorldServer>();
|
||||
chunkgenerator = PaperLib.isPaper() ? new NMSChunkGenerator16_3_PAPER(pro, ws, (WorldChunkManager) new WorldChunkManagerOverworld(ll, false, false, (IRegistry<BiomeBase>) getConsoleDimension(console).b(IRegistry.ay)), ll,
|
||||
|
||||
() -> (GeneratorSettingBase)
|
||||
getConsoleDimension(console)
|
||||
.b(IRegistry.ar)
|
||||
.d(GeneratorSettingBase.c)) : new NMSChunkGenerator16_3_SPIGOT(pro, ws, (WorldChunkManager) new WorldChunkManagerOverworld(ll, false, false, (IRegistry<BiomeBase>) getConsoleDimension(console).b(IRegistry.ay)), ll, () -> (GeneratorSettingBase) getConsoleDimension(console).b(IRegistry.ar).d(GeneratorSettingBase.c));
|
||||
final ResourceKey<net.minecraft.server.v1_16_R3.World> worldKey = (ResourceKey<net.minecraft.server.v1_16_R3.World>) ResourceKey.a(IRegistry.L, new MinecraftKey(name.toLowerCase(Locale.ENGLISH)));
|
||||
chunkgenerator = new NMSChunkGenerator16_2_PAPER(pro, ws, (WorldChunkManager) new WorldChunkManagerOverworld(ll, false, false, (IRegistry<BiomeBase>) getConsoleDimension(console).b(IRegistry.ay)), ll, () -> (GeneratorSettingBase) getConsoleDimension(console).b(IRegistry.ar).d(GeneratorSettingBase.c));
|
||||
final ResourceKey<net.minecraft.server.v1_16_R2.World> worldKey = (ResourceKey<net.minecraft.server.v1_16_R2.World>) ResourceKey.a(IRegistry.L, new MinecraftKey(name.toLowerCase(Locale.ENGLISH)));
|
||||
//@builder
|
||||
final WorldServer internal = new WorldServer((MinecraftServer) console,
|
||||
console.executorService, worldSession,
|
||||
@@ -143,7 +137,7 @@ class NMSCreator16_3 implements INMSCreator
|
||||
chunkgenerator,
|
||||
worlddata.getGeneratorSettings().isDebugWorld(),
|
||||
j,
|
||||
(List) ((creator.environment() == Environment.NORMAL) ? list : ImmutableList.of()),
|
||||
(List) ((creator.environment() == World.Environment.NORMAL) ? list : ImmutableList.of()),
|
||||
true,
|
||||
creator.environment(),
|
||||
server.getGenerator(name));
|
||||
@@ -0,0 +1,16 @@
|
||||
package com.volmit.iris.generator.legacy.nms.v1X;
|
||||
|
||||
import com.volmit.iris.generator.legacy.atomics.AtomicCache;
|
||||
import com.volmit.iris.generator.legacy.nms.INMSBinding;
|
||||
import com.volmit.iris.generator.legacy.nms.INMSCreator;
|
||||
|
||||
public class NMSBinding1X implements INMSBinding
|
||||
{
|
||||
private final AtomicCache<INMSCreator> creator = new AtomicCache<>();
|
||||
|
||||
@Override
|
||||
public INMSCreator getCreator()
|
||||
{
|
||||
return creator.aquire(NMSCreator1X::new);
|
||||
}
|
||||
}
|
||||
@@ -1,9 +1,9 @@
|
||||
package com.volmit.iris.gen.nms.v1X;
|
||||
package com.volmit.iris.generator.legacy.nms.v1X;
|
||||
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.WorldCreator;
|
||||
|
||||
import com.volmit.iris.gen.nms.INMSCreator;
|
||||
import com.volmit.iris.generator.legacy.nms.INMSCreator;
|
||||
|
||||
class NMSCreator1X implements INMSCreator
|
||||
{
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.volmit.iris.gen.post;
|
||||
package com.volmit.iris.generator.legacy.post;
|
||||
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.block.data.BlockData;
|
||||
@@ -7,7 +7,7 @@ import org.bukkit.block.data.type.Slab;
|
||||
import org.bukkit.block.data.type.Slab.Type;
|
||||
import org.bukkit.generator.ChunkGenerator.ChunkData;
|
||||
|
||||
import com.volmit.iris.gen.PostBlockTerrainProvider;
|
||||
import com.volmit.iris.generator.legacy.PostBlockTerrainProvider;
|
||||
import com.volmit.iris.object.InferredType;
|
||||
import com.volmit.iris.object.IrisBiome;
|
||||
import com.volmit.iris.util.B;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.volmit.iris.gen.provisions;
|
||||
package com.volmit.iris.generator.legacy.provisions;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
@@ -15,12 +15,12 @@ import org.bukkit.generator.BlockPopulator;
|
||||
import org.bukkit.generator.ChunkGenerator;
|
||||
|
||||
import com.volmit.iris.Iris;
|
||||
import com.volmit.iris.gen.IrisTerrainProvider;
|
||||
import com.volmit.iris.gen.scaffold.GeneratedChunk;
|
||||
import com.volmit.iris.gen.scaffold.HeightedFakeWorld;
|
||||
import com.volmit.iris.gen.scaffold.Provisioned;
|
||||
import com.volmit.iris.gen.scaffold.TerrainChunk;
|
||||
import com.volmit.iris.gen.scaffold.TerrainProvider;
|
||||
import com.volmit.iris.generator.legacy.IrisTerrainProvider;
|
||||
import com.volmit.iris.generator.legacy.scaffold.GeneratedChunk;
|
||||
import com.volmit.iris.generator.legacy.scaffold.HeightedFakeWorld;
|
||||
import com.volmit.iris.generator.legacy.scaffold.Provisioned;
|
||||
import com.volmit.iris.generator.legacy.scaffold.TerrainChunk;
|
||||
import com.volmit.iris.generator.legacy.scaffold.TerrainProvider;
|
||||
import com.volmit.iris.util.ChunkPosition;
|
||||
import com.volmit.iris.util.KList;
|
||||
import com.volmit.iris.util.KMap;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.volmit.iris.gen.scaffold;
|
||||
package com.volmit.iris.generator.legacy.scaffold;
|
||||
|
||||
import org.bukkit.Chunk;
|
||||
import org.bukkit.Material;
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.volmit.iris.gen.scaffold;
|
||||
package com.volmit.iris.generator.legacy.scaffold;
|
||||
|
||||
import com.volmit.iris.gen.atomics.AtomicSliverMap;
|
||||
import com.volmit.iris.generator.legacy.atomics.AtomicSliverMap;
|
||||
import com.volmit.iris.util.BiomeMap;
|
||||
import com.volmit.iris.util.HeightMap;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.volmit.iris.gen.scaffold;
|
||||
package com.volmit.iris.generator.legacy.scaffold;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.Collection;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.volmit.iris.gen.scaffold;
|
||||
package com.volmit.iris.generator.legacy.scaffold;
|
||||
|
||||
import org.bukkit.block.Biome;
|
||||
import org.bukkit.generator.ChunkGenerator.BiomeGrid;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.volmit.iris.gen.scaffold;
|
||||
package com.volmit.iris.generator.legacy.scaffold;
|
||||
|
||||
import com.volmit.iris.object.IrisBiome;
|
||||
import com.volmit.iris.object.IrisDimension;
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.volmit.iris.gen.scaffold;
|
||||
package com.volmit.iris.generator.legacy.scaffold;
|
||||
|
||||
import com.volmit.iris.gen.IrisTerrainProvider;
|
||||
import com.volmit.iris.generator.legacy.IrisTerrainProvider;
|
||||
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.volmit.iris.gen.scaffold;
|
||||
package com.volmit.iris.generator.legacy.scaffold;
|
||||
|
||||
import com.volmit.iris.Iris;
|
||||
import com.volmit.iris.util.RollingSequence;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.volmit.iris.gen.scaffold;
|
||||
package com.volmit.iris.generator.legacy.scaffold;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Material;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.volmit.iris.gen.scaffold;
|
||||
package com.volmit.iris.generator.legacy.scaffold;
|
||||
|
||||
public interface Provisioned
|
||||
{
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.volmit.iris.gen.scaffold;
|
||||
package com.volmit.iris.generator.legacy.scaffold;
|
||||
|
||||
public interface ProvisionedHolder extends Provisioned
|
||||
{
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.volmit.iris.gen.scaffold;
|
||||
package com.volmit.iris.generator.legacy.scaffold;
|
||||
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.block.Biome;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.volmit.iris.gen.scaffold;
|
||||
package com.volmit.iris.generator.legacy.scaffold;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.volmit.iris.gen.scaffold;
|
||||
package com.volmit.iris.generator.legacy.scaffold;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.List;
|
||||
@@ -1,15 +1,15 @@
|
||||
package com.volmit.iris.v2.generator.modifier;
|
||||
package com.volmit.iris.generator.modifier;
|
||||
|
||||
import com.volmit.iris.noise.FastNoiseDouble;
|
||||
import com.volmit.iris.generator.noise.FastNoiseDouble;
|
||||
import com.volmit.iris.object.IrisBiome;
|
||||
import com.volmit.iris.object.IrisCaveLayer;
|
||||
import com.volmit.iris.util.B;
|
||||
import com.volmit.iris.util.CaveResult;
|
||||
import com.volmit.iris.util.KList;
|
||||
import com.volmit.iris.util.RNG;
|
||||
import com.volmit.iris.v2.scaffold.engine.Engine;
|
||||
import com.volmit.iris.v2.scaffold.engine.EngineAssignedModifier;
|
||||
import com.volmit.iris.v2.scaffold.hunk.Hunk;
|
||||
import com.volmit.iris.scaffold.engine.Engine;
|
||||
import com.volmit.iris.scaffold.engine.EngineAssignedModifier;
|
||||
import com.volmit.iris.scaffold.hunk.Hunk;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.block.data.BlockData;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.volmit.iris.v2.generator.modifier;
|
||||
package com.volmit.iris.generator.modifier;
|
||||
|
||||
import com.volmit.iris.object.IrisBiome;
|
||||
import com.volmit.iris.object.IrisDepositGenerator;
|
||||
@@ -6,9 +6,9 @@ import com.volmit.iris.object.IrisObject;
|
||||
import com.volmit.iris.object.IrisRegion;
|
||||
import com.volmit.iris.util.HeightMap;
|
||||
import com.volmit.iris.util.RNG;
|
||||
import com.volmit.iris.v2.scaffold.engine.Engine;
|
||||
import com.volmit.iris.v2.scaffold.engine.EngineAssignedModifier;
|
||||
import com.volmit.iris.v2.scaffold.hunk.Hunk;
|
||||
import com.volmit.iris.scaffold.engine.Engine;
|
||||
import com.volmit.iris.scaffold.engine.EngineAssignedModifier;
|
||||
import com.volmit.iris.scaffold.hunk.Hunk;
|
||||
import org.bukkit.block.data.BlockData;
|
||||
import org.bukkit.util.BlockVector;
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
package com.volmit.iris.v2.generator.modifier;
|
||||
package com.volmit.iris.generator.modifier;
|
||||
|
||||
import com.volmit.iris.object.*;
|
||||
import com.volmit.iris.util.B;
|
||||
import com.volmit.iris.util.CaveResult;
|
||||
import com.volmit.iris.util.RNG;
|
||||
import com.volmit.iris.v2.scaffold.engine.Engine;
|
||||
import com.volmit.iris.v2.scaffold.engine.EngineAssignedModifier;
|
||||
import com.volmit.iris.v2.scaffold.hunk.Hunk;
|
||||
import com.volmit.iris.scaffold.engine.Engine;
|
||||
import com.volmit.iris.scaffold.engine.EngineAssignedModifier;
|
||||
import com.volmit.iris.scaffold.hunk.Hunk;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.block.data.BlockData;
|
||||
import org.bukkit.block.data.Levelled;
|
||||
@@ -1,11 +1,11 @@
|
||||
package com.volmit.iris.v2.generator.modifier;
|
||||
package com.volmit.iris.generator.modifier;
|
||||
|
||||
import com.volmit.iris.noise.CNG;
|
||||
import com.volmit.iris.generator.noise.CNG;
|
||||
import com.volmit.iris.object.NoiseStyle;
|
||||
import com.volmit.iris.util.*;
|
||||
import com.volmit.iris.v2.scaffold.engine.Engine;
|
||||
import com.volmit.iris.v2.scaffold.engine.EngineAssignedModifier;
|
||||
import com.volmit.iris.v2.scaffold.hunk.Hunk;
|
||||
import com.volmit.iris.scaffold.engine.Engine;
|
||||
import com.volmit.iris.scaffold.engine.EngineAssignedModifier;
|
||||
import com.volmit.iris.scaffold.hunk.Hunk;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.block.data.BlockData;
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
package com.volmit.iris.noise;
|
||||
package com.volmit.iris.generator.noise;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.volmit.iris.Iris;
|
||||
import com.volmit.iris.v2.scaffold.stream.ProceduralStream;
|
||||
import com.volmit.iris.v2.scaffold.stream.sources.CNGStream;
|
||||
import com.volmit.iris.v2.scaffold.stream.arithmetic.FittedStream;
|
||||
import com.volmit.iris.scaffold.stream.ProceduralStream;
|
||||
import com.volmit.iris.scaffold.stream.sources.CNGStream;
|
||||
import com.volmit.iris.scaffold.stream.arithmetic.FittedStream;
|
||||
import com.volmit.iris.util.IRare;
|
||||
import com.volmit.iris.util.IrisInterpolation;
|
||||
import com.volmit.iris.util.KList;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.volmit.iris.noise;
|
||||
package com.volmit.iris.generator.noise;
|
||||
|
||||
import com.volmit.iris.util.RNG;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.volmit.iris.noise;
|
||||
package com.volmit.iris.generator.noise;
|
||||
|
||||
import com.volmit.iris.util.RNG;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.volmit.iris.noise;
|
||||
package com.volmit.iris.generator.noise;
|
||||
|
||||
import com.volmit.iris.util.M;
|
||||
import com.volmit.iris.util.RNG;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.volmit.iris.noise;
|
||||
package com.volmit.iris.generator.noise;
|
||||
|
||||
import com.volmit.iris.util.RNG;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.volmit.iris.noise;
|
||||
package com.volmit.iris.generator.noise;
|
||||
|
||||
import com.volmit.iris.util.RNG;
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
// off every 'zix'.)
|
||||
//
|
||||
|
||||
package com.volmit.iris.noise;
|
||||
package com.volmit.iris.generator.noise;
|
||||
|
||||
import com.volmit.iris.util.Vector2f;
|
||||
import com.volmit.iris.util.Vector3f;
|
||||
@@ -25,7 +25,7 @@
|
||||
// The developer's email is jorzixdan.me2@gzixmail.com (for great email, take
|
||||
// off every 'zix'.)
|
||||
//
|
||||
package com.volmit.iris.noise;
|
||||
package com.volmit.iris.generator.noise;
|
||||
|
||||
import com.volmit.iris.util.Vector2f;
|
||||
import com.volmit.iris.util.Vector3f;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.volmit.iris.noise;
|
||||
package com.volmit.iris.generator.noise;
|
||||
|
||||
public class FlatNoise implements NoiseGenerator
|
||||
{
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.volmit.iris.noise;
|
||||
package com.volmit.iris.generator.noise;
|
||||
|
||||
import com.volmit.iris.noise.FastNoiseDouble.FractalType;
|
||||
import com.volmit.iris.generator.noise.FastNoiseDouble.FractalType;
|
||||
import com.volmit.iris.util.RNG;
|
||||
|
||||
public class FractalBillowPerlinNoise implements NoiseGenerator, OctaveNoise
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.volmit.iris.noise;
|
||||
package com.volmit.iris.generator.noise;
|
||||
|
||||
import com.volmit.iris.noise.FastNoiseDouble.FractalType;
|
||||
import com.volmit.iris.generator.noise.FastNoiseDouble.FractalType;
|
||||
import com.volmit.iris.util.RNG;
|
||||
|
||||
public class FractalBillowSimplexNoise implements NoiseGenerator, OctaveNoise
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.volmit.iris.noise;
|
||||
package com.volmit.iris.generator.noise;
|
||||
|
||||
import com.volmit.iris.noise.FastNoiseDouble.FractalType;
|
||||
import com.volmit.iris.generator.noise.FastNoiseDouble.FractalType;
|
||||
import com.volmit.iris.util.RNG;
|
||||
|
||||
public class FractalCubicNoise implements NoiseGenerator
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.volmit.iris.noise;
|
||||
package com.volmit.iris.generator.noise;
|
||||
|
||||
import com.volmit.iris.noise.FastNoiseDouble.FractalType;
|
||||
import com.volmit.iris.generator.noise.FastNoiseDouble.FractalType;
|
||||
import com.volmit.iris.util.RNG;
|
||||
|
||||
public class FractalFBMSimplexNoise implements NoiseGenerator, OctaveNoise
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.volmit.iris.noise;
|
||||
package com.volmit.iris.generator.noise;
|
||||
|
||||
import com.volmit.iris.noise.FastNoiseDouble.FractalType;
|
||||
import com.volmit.iris.generator.noise.FastNoiseDouble.FractalType;
|
||||
import com.volmit.iris.util.RNG;
|
||||
|
||||
public class FractalRigidMultiSimplexNoise implements NoiseGenerator, OctaveNoise
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.volmit.iris.noise;
|
||||
package com.volmit.iris.generator.noise;
|
||||
|
||||
import com.volmit.iris.util.RNG;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.volmit.iris.noise;
|
||||
package com.volmit.iris.generator.noise;
|
||||
|
||||
@FunctionalInterface
|
||||
public interface NoiseFactory
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.volmit.iris.noise;
|
||||
package com.volmit.iris.generator.noise;
|
||||
|
||||
public interface NoiseGenerator
|
||||
{
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.volmit.iris.noise;
|
||||
package com.volmit.iris.generator.noise;
|
||||
|
||||
public enum NoiseType {
|
||||
WHITE(seed -> new WhiteNoise(seed)),
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.volmit.iris.noise;
|
||||
package com.volmit.iris.generator.noise;
|
||||
|
||||
public interface OctaveNoise
|
||||
{
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user