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

Ye

Browse Source
This commit is contained in:
Daniel Mills 2020-01-07 08:26:39 -05:00
parent 7e9cea94f3
commit d1925201ef
22 changed files with 167 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/ninja/bytecode/iris/CommandIris.java
View File

@ -45,7 +45,7 @@ public class CommandIris implements CommandExecutor
{
IrisGenerator g = (IrisGenerator) w.getGenerator();
IrisBiome b = null;
for(IrisBiome i : IrisBiome.getBiomes())
for(IrisBiome i : g.getLoadedBiomes())
{
if(args[1].toLowerCase().equals(i.getName().toLowerCase().replaceAll("\\Q \\E", "_")))
{

3
src/main/java/ninja/bytecode/iris/Iris.java
View File

@ -9,8 +9,10 @@ import org.bukkit.Bukkit;
import org.bukkit.Chunk;
import org.bukkit.GameMode;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.World;
import org.bukkit.WorldCreator;
import org.bukkit.block.Biome;
import org.bukkit.entity.Player;
import org.bukkit.event.HandlerList;
import org.bukkit.event.Listener;
@ -188,6 +190,7 @@ public class Iris extends JavaPlugin implements Listener
public static InputStream loadResource(String string)
{
L.v("Loading Resource: " + "Iris.jar/" + string);
return Iris.class.getResourceAsStream("/" + string);
}
}

2
src/main/java/ninja/bytecode/iris/Settings.java
View File

@ -19,7 +19,7 @@ public class Settings
{
public double horizontalZoom = 1; // 0.525
public double heightFracture = 155;
public double landScale = 0.125;
public double landScale = 0.205;
public double landChance = 0.529;
public double roughness = 1.333;
public double heightMultiplier = 0.806;

5
src/main/java/ninja/bytecode/iris/generator/IrisGenerator.java
View File

@ -83,6 +83,11 @@ public class IrisGenerator extends ParallelChunkGenerator
this(Iris.dimensions.get("overworld"));
}
public GList<IrisBiome> getLoadedBiomes()
{
return IrisBiome.getAllBiomes().copy().add(dim.getBiomes());
}
public IrisGenerator(IrisDimension dim)
{
this.dim = dim;

42
src/main/java/ninja/bytecode/iris/spec/IrisBiome.java
View File

@ -54,48 +54,6 @@ public class IrisBiome
.surface(MB.of(Material.SAND), MB.of(Material.CLAY), MB.of(Material.GRAVEL))
.simplexSurface();
// public static final IrisBiome FOREST = new IrisBiome("Forest", Biome.FOREST)
// .scatter(MB.of(Material.LONG_GRASS, 1), 0.23)
// .scatter(MB.of(Material.LONG_GRASS, 2), 0.13);
// public static final IrisBiome FOREST_HILLS = new IrisBiome("Forest Hills", Biome.FOREST_HILLS)
// .scatter(MB.of(Material.LONG_GRASS, 1), 0.23)
// .scatter(MB.of(Material.LONG_GRASS, 2), 0.13);
// public static final IrisBiome FOREST_MOUNTAINS = new IrisBiome("Forest Mountains", Biome.MUTATED_EXTREME_HILLS_WITH_TREES)
// .scatter(MB.of(Material.LONG_GRASS, 1), 0.13)
// .scatter(MB.of(Material.LONG_GRASS, 2), 0.13);
// public static final IrisBiome HAUNTED_FOREST = new IrisBiome("Haunted Forest", Biome.MUTATED_SWAMPLAND)
// .scatter(MB.of(Material.LONG_GRASS, 1), 0.13)
// .scatter(MB.of(Material.LONG_GRASS, 2), 0.13)
// .surface(MB.of(Material.GRASS), MB.of(Material.GRASS), MB.of(Material.GRASS), MB.of(Material.GRASS), MB.of(Material.SOUL_SAND), MB.of(Material.DIRT), MB.of(Material.DIRT, 1), MB.of(Material.DIRT, 2))
// .scatterSurface();
// public static final IrisBiome BIRCH_FOREST = new IrisBiome("Birch Forest", Biome.BIRCH_FOREST)
// .scatter(MB.of(Material.LONG_GRASS, 1), 0.23)
// .scatter(MB.of(Material.LONG_GRASS, 2), 0.13);
// public static final IrisBiome BIRCH_FOREST_HILLS = new IrisBiome("Birch Forest Hills", Biome.BIRCH_FOREST_HILLS)
// .scatter(MB.of(Material.LONG_GRASS, 1), 0.23)
// .scatter(MB.of(Material.LONG_GRASS, 2), 0.13);
// public static final IrisBiome ROOFED_FOREST = new IrisBiome("Roofed Forest", Biome.ROOFED_FOREST)
// .scatter(MB.of(Material.LONG_GRASS, 1), 0.23)
// .scatter(MB.of(Material.LONG_GRASS, 2), 0.13);
// public static final IrisBiome TAIGA = new IrisBiome("Taiga", Biome.TAIGA)
// .scatter(MB.of(Material.LONG_GRASS, 2), 0.07);
// public static final IrisBiome EXTREME_HILLS = new IrisBiome("Extreme Hills", Biome.EXTREME_HILLS)
// .scatter(MB.of(Material.LONG_GRASS, 2), 0.04)
// .height(0.28);
// public static final IrisBiome EXTREME_HILLS_TREES = new IrisBiome("Extreme Hills +", Biome.EXTREME_HILLS_WITH_TREES)
// .scatter(MB.of(Material.LONG_GRASS, 2), 0.09);
// public static final IrisBiome TAIGA_COLD = new IrisBiome("Taiga Cold", Biome.TAIGA_COLD)
// .scatter(MB.of(Material.LONG_GRASS, 2), 0.04);
// public static final IrisBiome TAIGA_COLD_HILLS = new IrisBiome("Taiga Cold Hills", Biome.TAIGA_COLD_HILLS);
// public static final IrisBiome ICE_FLATS = new IrisBiome("Ice Flats", Biome.ICE_FLATS);
// public static final IrisBiome ICE_MOUNTAINS = new IrisBiome("Ice Mountains", Biome.ICE_MOUNTAINS);
// public static final IrisBiome REDWOOD_TAIGA = new IrisBiome("Redwood Taiga", Biome.REDWOOD_TAIGA)
// .surface(MB.of(Material.DIRT, 2), MB.of(Material.DIRT, 1))
// .simplexSurface();
// public static final IrisBiome REDWOOD_TAIGA_HILLS = new IrisBiome("Redwood Taiga Hills", Biome.REDWOOD_TAIGA_HILLS)
// .surface(MB.of(Material.DIRT, 2), MB.of(Material.DIRT, 1))
// .simplexSurface();
//@done
private static final GMap<Biome, IrisBiome> map = build();
private String name;

8
src/main/resources/pack/biomes/forest.json Normal file
View File

@ -0,0 +1,8 @@
{
"name": "Forest",
"derivative": "FOREST",
"scatter":[
"LONG_GRASS:1=0.23",
"LONG_GRASS:2=0.13"
]
}

8
src/main/resources/pack/biomes/forest_birch.json Normal file
View File

@ -0,0 +1,8 @@
{
"name": "Birch Forest",
"derivative": "BIRCH_FOREST",
"scatter":[
"LONG_GRASS:1=0.23",
"LONG_GRASS:2=0.13"
]
}

8
src/main/resources/pack/biomes/forest_birch_hills.json Normal file
View File

@ -0,0 +1,8 @@
{
"name": "Birch Forest Hills",
"derivative": "BIRCH_FOREST_HILLS",
"scatter":[
"LONG_GRASS:1=0.23",
"LONG_GRASS:2=0.13"
]
}

8
src/main/resources/pack/biomes/forest_dark.json Normal file
View File

@ -0,0 +1,8 @@
{
"name": "Dark Forest",
"derivative": "ROOFED_FOREST",
"scatter":[
"LONG_GRASS:1=0.23",
"LONG_GRASS:2=0.13"
]
}

23
src/main/resources/pack/biomes/forest_haunted.json Normal file
View File

@ -0,0 +1,23 @@
{
"name": "Haunted Forest",
"derivative": "MUTATED_SWAMPLAND",
"surface": [
"GRASS",
"GRASS",
"GRASS",
"GRASS",
"SOUL_SAND",
"DIRT",
"DIRT:1",
"DIRT:2"
],
"dirt": [
"DIRT",
"DIRT:1",
"SOUL_SAND"
],
"scatter":[
"LONG_GRASS:1=0.13"
],
"surfaceType": "simplex"
}

8
src/main/resources/pack/biomes/forest_hills.json Normal file
View File

@ -0,0 +1,8 @@
{
"name": "Forest Hills",
"derivative": "FOREST_HILLS",
"scatter":[
"LONG_GRASS:1=0.23",
"LONG_GRASS:2=0.13"
]
}

8
src/main/resources/pack/biomes/forest_mountains.json Normal file
View File

@ -0,0 +1,8 @@
{
"name": "Forest Mountains",
"derivative": "MUTATED_EXTREME_HILLS_WITH_TREES",
"scatter":[
"LONG_GRASS:1=0.13",
"LONG_GRASS:2=0.13"
]
}

4
src/main/resources/pack/biomes/ice_mountains.json Normal file
View File

@ -0,0 +1,4 @@
{
"name": "Ice Mountains",
"derivative": "ICE_MOUNTAINS"
}

4
src/main/resources/pack/biomes/ice_plains.json Normal file
View File

@ -0,0 +1,4 @@
{
"name": "Ice Plains",
"derivative": "ICE_FLATS"
}

7
src/main/resources/pack/biomes/mountains.json Normal file
View File

@ -0,0 +1,7 @@
{
"name": "Mountains",
"derivative": "EXTREME_HILLS",
"scatter":[
"LONG_GRASS:2=0.04"
]
}

7
src/main/resources/pack/biomes/mushroom_island.json Normal file
View File

@ -0,0 +1,7 @@
{
"name": "Mushroom Island",
"derivative": "MUSHROOM_ISLAND",
"surface": [
"MYCEL"
]
}

13
src/main/resources/pack/biomes/redwood_forest.json Normal file
View File

@ -0,0 +1,13 @@
{
"name": "Redwood Forest",
"derivative": "REDWOOD_TAIGA",
"surface": [
"DIRT",
"DIRT:1",
"DIRT:2"
],
"surfaceType": "simplex",
"scatter": [
"LONG_GRASS:2=0.07"
]
}

13
src/main/resources/pack/biomes/redwood_forest_hills.json Normal file
View File

@ -0,0 +1,13 @@
{
"name": "Redwood Forest",
"derivative": "REDWOOD_TAIGA",
"surface": [
"DIRT",
"DIRT:1",
"DIRT:2"
],
"surfaceType": "simplex",
"scatter": [
"LONG_GRASS:2=0.07"
]
}

7
src/main/resources/pack/biomes/taiga.json Normal file
View File

@ -0,0 +1,7 @@
{
"name": "Taiga",
"derivative": "TAIGA",
"scatter":[
"LONG_GRASS:2=0.07"
]
}

7
src/main/resources/pack/biomes/taiga_cold.json Normal file
View File

@ -0,0 +1,7 @@
{
"name": "Cold Taiga",
"derivative": "TAIGA_COLD",
"scatter":[
"LONG_GRASS:2=0.04"
]
}

7
src/main/resources/pack/biomes/taiga_cold_hills.json Normal file
View File

@ -0,0 +1,7 @@
{
"name": "Cold Taiga",
"derivative": "TAIGA_COLD",
"scatter":[
"LONG_GRASS:2=0.04"
]
}

18
src/main/resources/pack/dimensions/overworld.json
View File

@ -11,6 +11,22 @@
"jungle",
"jungle_hills",
"swamp",
"plains"
"plains",
"forest",
"forest_hills",
"forest_mountains",
"forest_haunted",
"forest_birch",
"forest_birch_hills",
"forest_dark",
"taiga",
"taiga_cold",
"taiga_cold_hills",
"mountains",
"ice_plains",
"ice_mountains",
"redwood_forest",
"redwood_forest_hills",
"mushroom_island"
]
}