Skip to content

Commit

Permalink
Complete migration to 1.18.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Geolykt committed Apr 7, 2022
1 parent 7dd9da9 commit 091cb18
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 21 deletions.
21 changes: 12 additions & 9 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<url>https://geolykt.de/maven/</url>
</repository>
<repository>
<id>jitpack.io</id> <!-- For towny and other plugins -->
<id>jitpack.io</id> <!-- For a few plugins -->
<url>https://jitpack.io</url>
</repository>
<repository> <!-- For WG -->
Expand All @@ -37,12 +37,16 @@
<id>coreprotect-repo</id> <!-- For CP -->
<url>https://maven.playpro.com</url>
</repository>
<repository> <!-- For towny -->
<id>glaremasters repo</id>
<url>https://repo.glaremasters.me/repository/towny/</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.18.1-R0.1-SNAPSHOT</version>
<version>1.18.2-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/org.jetbrains/annotations -->
Expand All @@ -64,9 +68,9 @@

<!-- World protection plugins to integrate with -->
<dependency>
<groupId>com.github.TownyAdvanced</groupId>
<artifactId>Towny</artifactId>
<version>0.97.5.0</version>
<groupId>com.palmergames.bukkit.towny</groupId>
<artifactId>towny</artifactId>
<version>0.98.1.0</version>
<scope>provided</scope>
<exclusions>
<exclusion>
Expand All @@ -76,6 +80,7 @@
</exclusion>
</exclusions>
</dependency>

<!-- Welcome to insanity where we have to use 4 dependencies for 1 class.
Now, I could've just allowed for transitive depends but that significantly extends build time
as well as potentially polluting what we have available. (so I do not accidentally use a library used
Expand Down Expand Up @@ -184,8 +189,6 @@
<dependency>
<groupId>uk.antiperson.stackmob</groupId>
<artifactId>StackMob</artifactId>
<!-- I have chosen to boycott updating this plugin due to their usage of illegal NMS repos in latter versions.
Any PRs attempting to update that plugin will be closed. -->
<version>5.4.2</version>
<scope>provided</scope>
<exclusions>
Expand All @@ -198,7 +201,7 @@
<dependency>
<groupId>dev.rosewood</groupId>
<artifactId>rosestacker</artifactId>
<version>1.4.2</version>
<version>1.4.5</version>
<scope>provided</scope>
<exclusions>
<exclusion>
Expand Down Expand Up @@ -264,7 +267,7 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.9.0</version>
<configuration>
<target>16</target>
<target>16</target> <!-- Java 16 is the best version, change my mind -->
<source>16</source>
</configuration>
</plugin>
Expand Down
17 changes: 5 additions & 12 deletions resources/magicCompat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,25 +44,18 @@ dryBiomes:
- "DESERT"
- "FROZEN_OCEAN"
- "FROZEN_RIVER"
- "SNOWY_TUNDRA"
- "SNOWY_MOUNTAINS"
- "DESERT_HILLS"
- "SNOWY_BEACH"
- "SNOWY_PLAINS"
- "SNOWY_SLOPES"
- "SNOWY_TAIGA"
- "SNOWY_TAIGA_HILLS"
- "WINDSWEPT_SAVANNA"
- "ERODED_BADLANDS"
- "SAVANNA"
- "SAVANNA_PLATEAU"
- "BADLANDS"
- "WOODED_BADLANDS_PLATEAU"
- "BADLANDS_PLATEAU"
- "DESERT_LAKES"
- "WOODED_BADLANDS"
- "ICE_SPIKES"
- "SNOWY_TAIGA_MOUNTAINS"
- "SHATTERED_SAVANNA"
- "SHATTERED_SAVANNA_PLATEAU"
- "ERODED_BADLANDS"
- "MODIFIED_WOODED_BADLANDS_PLATEAU"
- "MODIFIED_BADLANDS_PLATEAU"
unbreakable:
# Blocks designated to be not breakable, used for the laser enchantment along other things
- "AIR"
Expand Down

0 comments on commit 091cb18

Please sign in to comment.