mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-18 10:12:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

exclude custom biome from id mapping

Browse Source
This commit is contained in:
Pascal 2021-05-07 15:54:54 +02:00
parent 28e809f92f
commit 4b1bccd4b5
5 changed files with 92 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pom.xml
View File

@ -9,8 +9,8 @@
<properties> <properties>
<skip.copy>false</skip.copy> <skip.copy>false</skip.copy>
<secretary.build>package</secretary.build> <secretary.build>package</secretary.build>
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.target>11</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties> </properties>
<build> <build>
@ -48,9 +48,9 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration> <configuration>
<compilerVersion>1.8</compilerVersion> <compilerVersion>11</compilerVersion>
<source>1.8</source> <source>11</source>
<target>1.8</target> <target>11</target>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
@ -58,7 +58,7 @@
<repositories> <repositories>
<repository> <repository>
<id>volmit</id> <id>volmit</id>
<url>http://repo.volmit.com/repository/volmit/</url> <url>https://repo.volmit.com/repository/volmit/</url>
</repository> </repository>
</repositories> </repositories>
<dependencies> <dependencies>
@ -71,7 +71,7 @@
<dependency> <dependency>
<groupId>org.spigotmc</groupId> <groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId> <artifactId>spigot-api</artifactId>
<version>1.16.1-R0.1-SNAPSHOT</version> <version>1.16.5-R0.1-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!-- Paper API --> <!-- Paper API -->

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() { private static Map<Biome, Integer> computeBiomeIDs() {
Map<Biome, Integer> biomeIds = new KMap<>(); 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; 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.Consumer;
import org.bukkit.util.RayTraceResult; import org.bukkit.util.RayTraceResult;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.File; import java.io.File;
import java.util.*; import java.util.*;
@ -325,6 +327,10 @@ public class FakeWorld implements World
return null; return null;
} }
@NotNull @Override public Item dropItem(@NotNull Location location, @NotNull ItemStack itemStack, @Nullable Consumer<Item> consumer) {
return null;
}
@Override @Override
public Item dropItemNaturally(Location location, ItemStack item) public Item dropItemNaturally(Location location, ItemStack item)
{ {
@ -332,6 +338,10 @@ public class FakeWorld implements World
return null; return null;
} }
@NotNull @Override public Item dropItemNaturally(@NotNull Location location, @NotNull ItemStack itemStack, @Nullable Consumer<Item> consumer) {
return null;
}
@Override @Override
public Arrow spawnArrow(Location location, Vector direction, float speed, float spread) public Arrow spawnArrow(Location location, Vector direction, float speed, float spread)
{ {
@ -535,6 +545,10 @@ public class FakeWorld implements World
return false; return false;
} }
@Override public boolean setSpawnLocation(int i, int i1, int i2, float v) {
return false;
}
@Override @Override
public boolean setSpawnLocation(int x, int y, int z) 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 @Override
public boolean hasStorm() 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 @Override
public boolean createExplosion(double x, double y, double z, float power) public boolean createExplosion(double x, double y, double z, float power)
{ {
@ -863,6 +893,10 @@ public class FakeWorld implements World
return 0; return 0;
} }
@Override public int getMinHeight() {
return 0;
}
@Override @Override
public int getMaxHeight() 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.Consumer;
import org.bukkit.util.RayTraceResult; import org.bukkit.util.RayTraceResult;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
public class HeightedFakeWorld implements World public class HeightedFakeWorld implements World
@ -348,6 +350,10 @@ public class HeightedFakeWorld implements World
return null; return null;
} }
@NotNull @Override public Item dropItem(@NotNull Location location, @NotNull ItemStack itemStack, @Nullable Consumer<Item> consumer) {
return null;
}
@Override @Override
public Item dropItemNaturally(Location location, ItemStack item) public Item dropItemNaturally(Location location, ItemStack item)
{ {
@ -355,6 +361,10 @@ public class HeightedFakeWorld implements World
return null; return null;
} }
@NotNull @Override public Item dropItemNaturally(@NotNull Location location, @NotNull ItemStack itemStack, @Nullable Consumer<Item> consumer) {
return null;
}
@Override @Override
public Arrow spawnArrow(Location location, Vector direction, float speed, float spread) public Arrow spawnArrow(Location location, Vector direction, float speed, float spread)
{ {
@ -558,6 +568,10 @@ public class HeightedFakeWorld implements World
return false; return false;
} }
@Override public boolean setSpawnLocation(int i, int i1, int i2, float v) {
return false;
}
@Override @Override
public boolean setSpawnLocation(int x, int y, int z) 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 @Override
public boolean hasStorm() 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 @Override
public boolean createExplosion(double x, double y, double z, float power) public boolean createExplosion(double x, double y, double z, float power)
{ {
@ -886,6 +916,10 @@ public class HeightedFakeWorld implements World
return 0; return 0;
} }
@Override public int getMinHeight() {
return 0;
}
@Override @Override
public int getMaxHeight() public int getMaxHeight()
{ {

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

@ -1,6 +1,7 @@
package com.volmit.iris.util; package com.volmit.iris.util;
import java.util.Set; import java.util.Set;
import java.util.UUID;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
@ -12,6 +13,8 @@ import org.bukkit.plugin.Plugin;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; 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 * 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)); 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 @Override
public Server getServer() public Server getServer()
{ {