Skip to content

Enable Github Issues #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LcyDev wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Enable Github Issues #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c480991
Mavenize project
galacticwarrior9 Dec 31, 2021
52728f5
Maybe fix trees growing in water (https://github.com/averixus/florist…
galacticwarrior9 Dec 31, 2021
51010db
Replace deprecated Towny methods
galacticwarrior9 Dec 31, 2021
9ed632d
Don't iterate through an array of all loaded chunks when growing
galacticwarrior9 May 25, 2022
2a46dce
Tree growth fix
galacticwarrior9 May 25, 2022
22f7942
Only grow in Wilderness
galacticwarrior9 May 25, 2022
b0381f3
Add configurable max MSPT for growth
galacticwarrior9 May 25, 2022
9b22164
Provisional update to 1.18
galacticwarrior9 May 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions plugin.yml
View file
Open in desktop

This file was deleted.

77 changes: 77 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>land.jay.floristics</groupId>
<artifactId>Floristics</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.9.0</version>
<executions>
<execution>
<id>compile</id>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
</execution>
<execution>
<id>testCompile</id>
<phase>test-compile</phase>
<goals>
<goal>testCompile</goal>
</goals>
</execution>
</executions>
<configuration>
<source>17</source>
<target>17</target>
</configuration>
</plugin>
</plugins>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
</build>


<repositories>
<repository>
<id>papermc</id>
<url>https://papermc.io/repo/repository/maven-public/</url>
</repository>
<repository>
<id>jitpack.io</id>
<url>https://jitpack.io</url>
</repository>
</repositories>

<dependencies>
<dependency>
<groupId>io.papermc.paper</groupId>
<artifactId>paper-api</artifactId>
<version>1.18.2-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.github.TownyAdvanced</groupId>
<artifactId>Towny</artifactId>
<version>0.98.2.0</version>
<scope>provided</scope>
</dependency>
</dependencies>



</project>
107 changes: 0 additions & 107 deletions src/land/jay/floristics/compat/GriefPreventionWrapper.java
View file
Open in desktop

This file was deleted.

32 changes: 0 additions & 32 deletions src/land/jay/floristics/compat/RedProtectWrapper.java
View file
Open in desktop

This file was deleted.

39 changes: 0 additions & 39 deletions src/land/jay/floristics/compat/WorldGuardWrapper.java
View file
Open in desktop

This file was deleted.

54 changes: 26 additions & 28 deletions src/land/jay/floristics/BiomeGrower.java → ...java/land/jay/floristics/BiomeGrower.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public enum BiomeGrower {
this.add(new MushroomGrower(Material.RED_MUSHROOM, 0.01, 0.12, true));
this.add(new SugarcaneGrower(0.4, 0.25));
}},
MOUNTAINS {{
MOUNTAIN {{
this.add(new BushGrower(Material.GRASS, false, 0.15, SurfaceType.DIRT, 0.13));
this.add(new BushGrower(Material.DANDELION, false, 0.02, SurfaceType.DIRT, 0.01));
this.add(new BushGrower(Material.POPPY, false, 0.02, SurfaceType.DIRT, 0.01));
Expand Down Expand Up @@ -373,66 +373,64 @@ public static void handleGrowth(World world, int x, int z) {

/** @return The appropriate BiomeGrower for the given Biome. */
private static BiomeGrower get(Biome biome) {

switch (biome) {
case PLAINS:

case PLAINS: case MEADOW:
return PLAINS;
case SUNFLOWER_PLAINS:
return SUNFLOWER_PLAINS;
case OCEAN: case DEEP_OCEAN: case COLD_OCEAN: case DEEP_COLD_OCEAN: case LUKEWARM_OCEAN: case DEEP_LUKEWARM_OCEAN:
return COOL_OCEAN;
case WARM_OCEAN: case DEEP_WARM_OCEAN:
case WARM_OCEAN:
return WARM_OCEAN;
case DESERT: case DESERT_HILLS: case DESERT_LAKES:
case DESERT:
return DESERT;
case MOUNTAINS: case MOUNTAIN_EDGE: case GRAVELLY_MOUNTAINS: case MODIFIED_GRAVELLY_MOUNTAINS:
return MOUNTAINS;
case WOODED_MOUNTAINS:
return WOODED_MOUNTAINS;
case FOREST: case WOODED_HILLS:
case STONY_PEAKS:
return MOUNTAIN;
case FOREST:
return FOREST;
case TAIGA: case TAIGA_HILLS: case TAIGA_MOUNTAINS:
case TAIGA:
return TAIGA;
case SNOWY_TAIGA: case SNOWY_TAIGA_HILLS: case SNOWY_TAIGA_MOUNTAINS:
case SNOWY_TAIGA: case GROVE:
return SNOWY_TAIGA;
case GIANT_TREE_TAIGA: case GIANT_TREE_TAIGA_HILLS: case GIANT_SPRUCE_TAIGA: case GIANT_SPRUCE_TAIGA_HILLS:
case OLD_GROWTH_PINE_TAIGA: case OLD_GROWTH_SPRUCE_TAIGA:
return MEGA_TAIGA;
case SWAMP: case SWAMP_HILLS:
case SWAMP:
return SWAMP;
case SNOWY_TUNDRA: case SNOWY_MOUNTAINS:
case SNOWY_PLAINS: case SNOWY_SLOPES: case JAGGED_PEAKS: case FROZEN_PEAKS:
return TUNDRA;
case MUSHROOM_FIELDS: case MUSHROOM_FIELD_SHORE:
case MUSHROOM_FIELDS:
return MUSHROOM;
case JUNGLE: case JUNGLE_HILLS: case MODIFIED_JUNGLE:
case JUNGLE:
return JUNGLE;
case JUNGLE_EDGE: case MODIFIED_JUNGLE_EDGE:
case SPARSE_JUNGLE:
return JUNGLE_EDGE;
case BAMBOO_JUNGLE: case BAMBOO_JUNGLE_HILLS:
case BAMBOO_JUNGLE:
return BAMBOO_JUNGLE;
case SAVANNA: case SAVANNA_PLATEAU: case SHATTERED_SAVANNA: case SHATTERED_SAVANNA_PLATEAU:
case SAVANNA: case SAVANNA_PLATEAU: case WINDSWEPT_SAVANNA:
return SAVANNA;
case BADLANDS: case BADLANDS_PLATEAU: case MODIFIED_BADLANDS_PLATEAU: case ERODED_BADLANDS:
case BADLANDS: case ERODED_BADLANDS:
return BADLANDS;
case WOODED_BADLANDS_PLATEAU: case MODIFIED_WOODED_BADLANDS_PLATEAU:
case WOODED_BADLANDS:
return WOODED_BADLANDS;
case DARK_FOREST: case DARK_FOREST_HILLS:
case DARK_FOREST:
return DARK_FOREST;
case FLOWER_FOREST:
return FLOWER_FOREST;
case BIRCH_FOREST: case BIRCH_FOREST_HILLS:
case BIRCH_FOREST:
return BIRCH_FOREST;
case TALL_BIRCH_FOREST: case TALL_BIRCH_HILLS:
case OLD_GROWTH_BIRCH_FOREST:
return TALL_BIRCH;
case RIVER:
return RIVER;
case END_HIGHLANDS:
return END;
case BEACH:
return BEACH;
case NETHER:
case BASALT_DELTAS: case NETHER_WASTES: case WARPED_FOREST: case CRIMSON_FOREST: case SOUL_SAND_VALLEY:
return NETHER;
case FROZEN_OCEAN: case DEEP_FROZEN_OCEAN: case THE_END: case FROZEN_RIVER: case STONE_SHORE: case SNOWY_BEACH: case SMALL_END_ISLANDS: case END_MIDLANDS: case END_BARRENS: case THE_VOID: case ICE_SPIKES:
case FROZEN_OCEAN: case DEEP_FROZEN_OCEAN: case THE_END: case FROZEN_RIVER: case STONY_SHORE: case SNOWY_BEACH: case SMALL_END_ISLANDS: case END_MIDLANDS: case END_BARRENS: case THE_VOID: case ICE_SPIKES:
default:
return BARREN;
}
Expand Down
Loading