Repo-Mirror/Iris-World-Engine
9
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-12-27 11:09:06 +00:00
Code Issues Releases Activity

Merge pull request #349 from pazkaI/master

Browse Source 
Pregen fix: exclude custom biome from id mapping
This commit is contained in:
Dan
2021-05-25 12:52:59 -04:00
committed by GitHub
parent 10b8ba1ec8 01ba90689f
commit a8b75c9b13
5 changed files with 87 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/volmit/iris/pregen/DirectWorldWriter.java
View File

@@ -240,9 +240,11 @@ public class DirectWorldWriter {
private static Map<Biome, Integer> computeBiomeIDs() {
Map<Biome, Integer> biomeIds = new KMap<>();
for(Biome i : Biome.values())
for(Biome biome : Biome.values())
{
biomeIds.put(i, INMS.get().getBiomeId(i));
if (biome != Biome.CUSTOM) {
biomeIds.put(biome, INMS.get().getBiomeId(biome));
}
}
return biomeIds;

34
src/main/java/com/volmit/iris/util/FakeWorld.java
View File

@@ -17,6 +17,8 @@ import org.bukkit.util.BoundingBox;
import org.bukkit.util.Consumer;
import org.bukkit.util.RayTraceResult;
import org.bukkit.util.Vector;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.File;
import java.util.*;
@@ -325,6 +327,10 @@ public class FakeWorld implements World
return null;
}
@NotNull @Override public Item dropItem(@NotNull Location location, @NotNull ItemStack itemStack, @Nullable Consumer<Item> consumer) {
return null;
}
@Override
public Item dropItemNaturally(Location location, ItemStack item)
{
@@ -332,6 +338,10 @@ public class FakeWorld implements World
return null;
}
@NotNull @Override public Item dropItemNaturally(@NotNull Location location, @NotNull ItemStack itemStack, @Nullable Consumer<Item> consumer) {
return null;
}
@Override
public Arrow spawnArrow(Location location, Vector direction, float speed, float spread)
{
@@ -535,6 +545,10 @@ public class FakeWorld implements World
return false;
}
@Override public boolean setSpawnLocation(int i, int i1, int i2, float v) {
return false;
}
@Override
public boolean setSpawnLocation(int x, int y, int z)
{
@@ -568,6 +582,10 @@ public class FakeWorld implements World
}
@Override public long getGameTime() {
return 0;
}
@Override
public boolean hasStorm()
{
@@ -620,6 +638,18 @@ public class FakeWorld implements World
}
@Override public boolean isClearWeather() {
return false;
}
@Override public void setClearWeatherDuration(int i) {
}
@Override public int getClearWeatherDuration() {
return 0;
}
@Override
public boolean createExplosion(double x, double y, double z, float power)
{
@@ -863,6 +893,10 @@ public class FakeWorld implements World
return 0;
}
@Override public int getMinHeight() {
return 0;
}
@Override
public int getMaxHeight()
{

34
src/main/java/com/volmit/iris/util/HeightedFakeWorld.java
View File

@@ -50,6 +50,8 @@ import org.bukkit.util.BoundingBox;
import org.bukkit.util.Consumer;
import org.bukkit.util.RayTraceResult;
import org.bukkit.util.Vector;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@SuppressWarnings("deprecation")
public class HeightedFakeWorld implements World
@@ -348,6 +350,10 @@ public class HeightedFakeWorld implements World
return null;
}
@NotNull @Override public Item dropItem(@NotNull Location location, @NotNull ItemStack itemStack, @Nullable Consumer<Item> consumer) {
return null;
}
@Override
public Item dropItemNaturally(Location location, ItemStack item)
{
@@ -355,6 +361,10 @@ public class HeightedFakeWorld implements World
return null;
}
@NotNull @Override public Item dropItemNaturally(@NotNull Location location, @NotNull ItemStack itemStack, @Nullable Consumer<Item> consumer) {
return null;
}
@Override
public Arrow spawnArrow(Location location, Vector direction, float speed, float spread)
{
@@ -558,6 +568,10 @@ public class HeightedFakeWorld implements World
return false;
}
@Override public boolean setSpawnLocation(int i, int i1, int i2, float v) {
return false;
}
@Override
public boolean setSpawnLocation(int x, int y, int z)
{
@@ -591,6 +605,10 @@ public class HeightedFakeWorld implements World
}
@Override public long getGameTime() {
return 0;
}
@Override
public boolean hasStorm()
{
@@ -643,6 +661,18 @@ public class HeightedFakeWorld implements World
}
@Override public boolean isClearWeather() {
return false;
}
@Override public void setClearWeatherDuration(int i) {
}
@Override public int getClearWeatherDuration() {
return 0;
}
@Override
public boolean createExplosion(double x, double y, double z, float power)
{
@@ -886,6 +916,10 @@ public class HeightedFakeWorld implements World
return 0;
}
@Override public int getMinHeight() {
return 0;
}
@Override
public int getMaxHeight()
{

13
src/main/java/com/volmit/iris/util/MortarSender.java
View File

@@ -1,6 +1,7 @@
package com.volmit.iris.util;
import java.util.Set;
import java.util.UUID;
import org.bukkit.Server;
import org.bukkit.command.CommandSender;
@@ -12,6 +13,8 @@ import org.bukkit.plugin.Plugin;
import lombok.Getter;
import lombok.Setter;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
/**
* Represents a volume sender. A command sender with extra crap in it
@@ -193,6 +196,16 @@ public class MortarSender implements CommandSender
s.sendMessage(C.translateAlternateColorCodes('&', getTag() + str));
}
@Override
public void sendMessage(@Nullable UUID uuid, @NotNull String message) {
sendMessage(message);
}
@Override
public void sendMessage(@Nullable UUID uuid, @NotNull String[] messages) {
sendMessage(messages);
}
@Override
public Server getServer()
{