mirror of
https://github.com/VolmitSoftware/Iris.git
synced 2025-07-04 00:46:08 +00:00
other updates!
This commit is contained in:
parent
e3d2dfa99e
commit
12a6d022cf
@ -24,7 +24,7 @@ plugins {
|
|||||||
id "de.undercouch.download" version "5.0.1"
|
id "de.undercouch.download" version "5.0.1"
|
||||||
}
|
}
|
||||||
|
|
||||||
version '2.6.1-1.19.4'
|
version '2.6.2-1.19.4'
|
||||||
def nmsVersion = "1.19.4" //[NMS]
|
def nmsVersion = "1.19.4" //[NMS]
|
||||||
def apiVersion = '1.19'
|
def apiVersion = '1.19'
|
||||||
def specialSourceVersion = '1.11.0' //[NMS]
|
def specialSourceVersion = '1.11.0' //[NMS]
|
||||||
@ -134,7 +134,7 @@ dependencies {
|
|||||||
|
|
||||||
// Third Party Integrations
|
// Third Party Integrations
|
||||||
implementation 'com.github.oraxen:oraxen:1.152.5'
|
implementation 'com.github.oraxen:oraxen:1.152.5'
|
||||||
implementation 'com.github.LoneDev6:api-itemsadder:3.2.5'
|
implementation 'com.github.LoneDev6:api-itemsadder:3.4.1-r4'
|
||||||
implementation 'me.clip:placeholderapi:2.11.3'
|
implementation 'me.clip:placeholderapi:2.11.3'
|
||||||
//implementation files('libs/CustomItems.jar')
|
//implementation files('libs/CustomItems.jar')
|
||||||
|
|
||||||
|
@ -62,7 +62,10 @@ import com.volmit.iris.util.scheduling.ShurikenQueue;
|
|||||||
import io.papermc.lib.PaperLib;
|
import io.papermc.lib.PaperLib;
|
||||||
import net.kyori.adventure.platform.bukkit.BukkitAudiences;
|
import net.kyori.adventure.platform.bukkit.BukkitAudiences;
|
||||||
import net.kyori.adventure.text.serializer.ComponentSerializer;
|
import net.kyori.adventure.text.serializer.ComponentSerializer;
|
||||||
import org.bukkit.*;
|
import org.bukkit.Bukkit;
|
||||||
|
import org.bukkit.GameMode;
|
||||||
|
import org.bukkit.Location;
|
||||||
|
import org.bukkit.WorldCreator;
|
||||||
import org.bukkit.block.data.BlockData;
|
import org.bukkit.block.data.BlockData;
|
||||||
import org.bukkit.command.Command;
|
import org.bukkit.command.Command;
|
||||||
import org.bukkit.command.CommandSender;
|
import org.bukkit.command.CommandSender;
|
||||||
|
@ -24,7 +24,6 @@ import com.volmit.iris.core.service.StudioSVC;
|
|||||||
import com.volmit.iris.core.tools.IrisToolbelt;
|
import com.volmit.iris.core.tools.IrisToolbelt;
|
||||||
import com.volmit.iris.engine.framework.Engine;
|
import com.volmit.iris.engine.framework.Engine;
|
||||||
import com.volmit.iris.engine.object.IrisDimension;
|
import com.volmit.iris.engine.object.IrisDimension;
|
||||||
import com.volmit.iris.engine.object.IrisEntity;
|
|
||||||
import com.volmit.iris.engine.platform.PlatformChunkGenerator;
|
import com.volmit.iris.engine.platform.PlatformChunkGenerator;
|
||||||
import com.volmit.iris.util.collection.KList;
|
import com.volmit.iris.util.collection.KList;
|
||||||
import com.volmit.iris.util.decree.DecreeContext;
|
import com.volmit.iris.util.decree.DecreeContext;
|
||||||
@ -41,9 +40,7 @@ import com.volmit.iris.util.scheduling.J;
|
|||||||
import com.volmit.iris.util.scheduling.jobs.QueueJob;
|
import com.volmit.iris.util.scheduling.jobs.QueueJob;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.Chunk;
|
import org.bukkit.Chunk;
|
||||||
import org.bukkit.Location;
|
|
||||||
import org.bukkit.World;
|
import org.bukkit.World;
|
||||||
import org.bukkit.util.Vector;
|
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
@ -51,8 +51,7 @@ public class IrisRenderer {
|
|||||||
colorFunction = (x, z) -> renderer.getComplex().getCaveBiomeStream().get(x, z).getColor(renderer, currentType).getRGB();
|
colorFunction = (x, z) -> renderer.getComplex().getCaveBiomeStream().get(x, z).getColor(renderer, currentType).getRGB();
|
||||||
case HEIGHT ->
|
case HEIGHT ->
|
||||||
colorFunction = (x, z) -> Color.getHSBColor(renderer.getComplex().getHeightStream().get(x, z).floatValue(), 100, 100).getRGB();
|
colorFunction = (x, z) -> Color.getHSBColor(renderer.getComplex().getHeightStream().get(x, z).floatValue(), 100, 100).getRGB();
|
||||||
case CONTINENT ->
|
case CONTINENT -> colorFunction = (x, z) -> {
|
||||||
colorFunction = (x, z) -> {
|
|
||||||
IrisBiome b = renderer.getBiome((int) Math.round(x), renderer.getMaxHeight() - 1, (int) Math.round(z));
|
IrisBiome b = renderer.getBiome((int) Math.round(x), renderer.getMaxHeight() - 1, (int) Math.round(z));
|
||||||
IrisBiomeGeneratorLink g = b.getGenerators().get(0);
|
IrisBiomeGeneratorLink g = b.getGenerators().get(0);
|
||||||
Color c;
|
Color c;
|
||||||
|
@ -7,7 +7,6 @@ import dev.lone.itemsadder.api.CustomStack;
|
|||||||
import org.bukkit.block.data.BlockData;
|
import org.bukkit.block.data.BlockData;
|
||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.MissingResourceException;
|
import java.util.MissingResourceException;
|
||||||
|
|
||||||
public class ItemAdderDataProvider extends ExternalDataProvider {
|
public class ItemAdderDataProvider extends ExternalDataProvider {
|
||||||
|
@ -87,7 +87,8 @@ public class OraxenDataProvider extends ExternalDataProvider {
|
|||||||
Identifier key = new Identifier("oraxen", name);
|
Identifier key = new Identifier("oraxen", name);
|
||||||
if (getBlockData(key) != null)
|
if (getBlockData(key) != null)
|
||||||
names.add(key);
|
names.add(key);
|
||||||
} catch (MissingResourceException ignored) { }
|
} catch (MissingResourceException ignored) {
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return names.toArray(new Identifier[0]);
|
return names.toArray(new Identifier[0]);
|
||||||
@ -101,7 +102,8 @@ public class OraxenDataProvider extends ExternalDataProvider {
|
|||||||
Identifier key = new Identifier("oraxen", name);
|
Identifier key = new Identifier("oraxen", name);
|
||||||
if (getItemStack(key) != null)
|
if (getItemStack(key) != null)
|
||||||
names.add(key);
|
names.add(key);
|
||||||
} catch (MissingResourceException ignored) { }
|
} catch (MissingResourceException ignored) {
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return names.toArray(new Identifier[0]);
|
return names.toArray(new Identifier[0]);
|
||||||
|
@ -47,15 +47,6 @@ public class CustomBiomeSource extends BiomeSource {
|
|||||||
this.customBiomes = fillCustomBiomes(biomeCustomRegistry, engine);
|
this.customBiomes = fillCustomBiomes(biomeCustomRegistry, engine);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
protected Stream<Holder<Biome>> collectPossibleBiomes() {
|
|
||||||
return getAllBiomes(
|
|
||||||
((RegistryAccess) getFor(RegistryAccess.Frozen.class, ((CraftServer) Bukkit.getServer()).getHandle().getServer()))
|
|
||||||
.registry(Registries.BIOME).orElse(null),
|
|
||||||
((CraftWorld) engine.getWorld().realWorld()).getHandle().registryAccess().registry(Registries.BIOME).orElse(null),
|
|
||||||
engine).stream();
|
|
||||||
}
|
|
||||||
|
|
||||||
private static List<Holder<Biome>> getAllBiomes(Registry<Biome> customRegistry, Registry<Biome> registry, Engine engine) {
|
private static List<Holder<Biome>> getAllBiomes(Registry<Biome> customRegistry, Registry<Biome> registry, Engine engine) {
|
||||||
List<Holder<Biome>> b = new ArrayList<>();
|
List<Holder<Biome>> b = new ArrayList<>();
|
||||||
|
|
||||||
@ -119,6 +110,15 @@ public class CustomBiomeSource extends BiomeSource {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected Stream<Holder<Biome>> collectPossibleBiomes() {
|
||||||
|
return getAllBiomes(
|
||||||
|
((RegistryAccess) getFor(RegistryAccess.Frozen.class, ((CraftServer) Bukkit.getServer()).getHandle().getServer()))
|
||||||
|
.registry(Registries.BIOME).orElse(null),
|
||||||
|
((CraftWorld) engine.getWorld().realWorld()).getHandle().registryAccess().registry(Registries.BIOME).orElse(null),
|
||||||
|
engine).stream();
|
||||||
|
}
|
||||||
|
|
||||||
private KMap<String, Holder<Biome>> fillCustomBiomes(Registry<Biome> customRegistry, Engine engine) {
|
private KMap<String, Holder<Biome>> fillCustomBiomes(Registry<Biome> customRegistry, Engine engine) {
|
||||||
KMap<String, Holder<Biome>> m = new KMap<>();
|
KMap<String, Holder<Biome>> m = new KMap<>();
|
||||||
|
|
||||||
|
@ -19,10 +19,12 @@
|
|||||||
package com.volmit.iris.core.service;
|
package com.volmit.iris.core.service;
|
||||||
|
|
||||||
import com.volmit.iris.Iris;
|
import com.volmit.iris.Iris;
|
||||||
import com.volmit.iris.core.link.*;
|
import com.volmit.iris.core.link.ExternalDataProvider;
|
||||||
|
import com.volmit.iris.core.link.Identifier;
|
||||||
|
import com.volmit.iris.core.link.ItemAdderDataProvider;
|
||||||
|
import com.volmit.iris.core.link.OraxenDataProvider;
|
||||||
import com.volmit.iris.util.collection.KList;
|
import com.volmit.iris.util.collection.KList;
|
||||||
import com.volmit.iris.util.plugin.IrisService;
|
import com.volmit.iris.util.plugin.IrisService;
|
||||||
import io.th0rgal.oraxen.api.OraxenBlocks;
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.block.data.BlockData;
|
import org.bukkit.block.data.BlockData;
|
||||||
@ -62,7 +64,8 @@ public class ExternalDataSVC implements IrisService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onDisable() { }
|
public void onDisable() {
|
||||||
|
}
|
||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void onPluginEnable(PluginEnableEvent e) {
|
public void onPluginEnable(PluginEnableEvent e) {
|
||||||
|
@ -50,7 +50,6 @@ import com.volmit.iris.util.scheduling.PrecisionStopwatch;
|
|||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import net.minecraft.core.BlockPos;
|
import net.minecraft.core.BlockPos;
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
import org.bukkit.World;
|
|
||||||
import org.bukkit.block.Biome;
|
import org.bukkit.block.Biome;
|
||||||
import org.bukkit.block.data.BlockData;
|
import org.bukkit.block.data.BlockData;
|
||||||
import org.bukkit.command.CommandSender;
|
import org.bukkit.command.CommandSender;
|
||||||
|
@ -555,6 +555,7 @@ public class IrisDimension extends IrisRegistrant {
|
|||||||
obj.put("logical_height", logicalHeight);
|
obj.put("logical_height", logicalHeight);
|
||||||
return obj.toString(4);
|
return obj.toString(4);
|
||||||
}
|
}
|
||||||
|
|
||||||
private String generateDatapackJsonNether() {
|
private String generateDatapackJsonNether() {
|
||||||
JSONObject obj = new JSONObject(DP_NETHER_DEFAULT);
|
JSONObject obj = new JSONObject(DP_NETHER_DEFAULT);
|
||||||
obj.put("min_y", dimensionHeightNether.getMin());
|
obj.put("min_y", dimensionHeightNether.getMin());
|
||||||
@ -562,6 +563,7 @@ public class IrisDimension extends IrisRegistrant {
|
|||||||
obj.put("logical_height", logicalHeightNether);
|
obj.put("logical_height", logicalHeightNether);
|
||||||
return obj.toString(4);
|
return obj.toString(4);
|
||||||
}
|
}
|
||||||
|
|
||||||
private String generateDatapackJsonEnd() {
|
private String generateDatapackJsonEnd() {
|
||||||
JSONObject obj = new JSONObject(DP_END_DEFAULT);
|
JSONObject obj = new JSONObject(DP_END_DEFAULT);
|
||||||
obj.put("min_y", dimensionHeightEnd.getMin());
|
obj.put("min_y", dimensionHeightEnd.getMin());
|
||||||
|
@ -30,7 +30,10 @@ import com.volmit.iris.util.data.B;
|
|||||||
import com.volmit.iris.util.format.Form;
|
import com.volmit.iris.util.format.Form;
|
||||||
import com.volmit.iris.util.interpolation.IrisInterpolation;
|
import com.volmit.iris.util.interpolation.IrisInterpolation;
|
||||||
import com.volmit.iris.util.json.JSONObject;
|
import com.volmit.iris.util.json.JSONObject;
|
||||||
import com.volmit.iris.util.math.*;
|
import com.volmit.iris.util.math.AxisAlignedBB;
|
||||||
|
import com.volmit.iris.util.math.BlockPosition;
|
||||||
|
import com.volmit.iris.util.math.Position2;
|
||||||
|
import com.volmit.iris.util.math.RNG;
|
||||||
import com.volmit.iris.util.matter.MatterMarker;
|
import com.volmit.iris.util.matter.MatterMarker;
|
||||||
import com.volmit.iris.util.parallel.BurstExecutor;
|
import com.volmit.iris.util.parallel.BurstExecutor;
|
||||||
import com.volmit.iris.util.parallel.MultiBurst;
|
import com.volmit.iris.util.parallel.MultiBurst;
|
||||||
|
@ -18,8 +18,6 @@
|
|||||||
|
|
||||||
package com.volmit.iris.util.decree.context;
|
package com.volmit.iris.util.decree.context;
|
||||||
|
|
||||||
import com.volmit.iris.core.tools.IrisToolbelt;
|
|
||||||
import com.volmit.iris.engine.object.IrisBiome;
|
|
||||||
import com.volmit.iris.util.decree.DecreeContextHandler;
|
import com.volmit.iris.util.decree.DecreeContextHandler;
|
||||||
import com.volmit.iris.util.plugin.VolmitSender;
|
import com.volmit.iris.util.plugin.VolmitSender;
|
||||||
import org.bukkit.util.Vector;
|
import org.bukkit.util.Vector;
|
||||||
|
@ -35,9 +35,9 @@ public class UniqueRenderer {
|
|||||||
private final int height;
|
private final int height;
|
||||||
private final KMap<String, String> writing = new KMap<>();
|
private final KMap<String, String> writing = new KMap<>();
|
||||||
private final ExecutorService executor = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors() * 2);
|
private final ExecutorService executor = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors() * 2);
|
||||||
int cores = Runtime.getRuntime().availableProcessors();
|
|
||||||
private final KList<NoiseStyle> sortedStyles = new KList<NoiseStyle>();
|
private final KList<NoiseStyle> sortedStyles = new KList<NoiseStyle>();
|
||||||
private final KList<InterpolationMethod> sortedInterpolators = new KList<InterpolationMethod>();
|
private final KList<InterpolationMethod> sortedInterpolators = new KList<InterpolationMethod>();
|
||||||
|
int cores = Runtime.getRuntime().availableProcessors();
|
||||||
|
|
||||||
public UniqueRenderer(String seed, int width, int height) {
|
public UniqueRenderer(String seed, int width, int height) {
|
||||||
renderer = this;
|
renderer = this;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user