Merge branch 'oraxen:master' into dev/update

ArmaRealms · Dec 24, 2024 · 90279ac · 90279ac
2 parents c959b8c + a17d634
commit 90279ac
Show file tree

Hide file tree

Showing 17 changed files with 55 additions and 54 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
     //id("com.github.johnrengelman.shadow") version "8.1.1"
     id("xyz.jpenilla.run-paper") version "2.3.1"
     id("net.minecrell.plugin-yml.bukkit") version "0.6.0" // Generates plugin.yml
-    id("io.papermc.paperweight.userdev") version "1.7.4" apply false
+    id("io.papermc.paperweight.userdev") version "2.0.0-beta.8" apply false
     id("io.github.goooler.shadow") version "8.1.8"
     alias(libs.plugins.mia.publication)
 }
@@ -50,7 +50,7 @@ allprojects {
     repositories {
         mavenCentral()
 
-        maven("https://papermc.io/repo/repository/maven-public/") // Paper
+        maven("https://repo.papermc.io/repository/maven-public/") // Paper
         maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/") // Spigot
         maven("https://oss.sonatype.org/content/repositories/snapshots") // Because Spigot depends on Bungeecord ChatComponent-API
         maven("https://repo.dmulloy2.net/repository/public/") // ProtocolLib

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -14,7 +14,7 @@ tasks {
 }
 
 repositories {
-    maven("https://papermc.io/repo/repository/maven-public/") // Paper
+    maven("https://repo.papermc.io/repository/maven-public/") // Paper
 }
 
 dependencies {

diff --git a/core/src/main/java/io/th0rgal/oraxen/pack/generation/PredicatesGenerator.java b/core/src/main/java/io/th0rgal/oraxen/pack/generation/PredicatesGenerator.java
@@ -302,31 +302,32 @@ public String getVanillaModelName(final Material material) {
     }
 
     public String getVanillaTextureName(final Material material, final boolean model) {
-        String name = material.toString();
-        if (name.equals("GRASS") || name.equals("SHORT_GRASS"))
-            return "block/grass";
-        if (material == Material.TALL_GRASS)
-            return "block/tall_grass_bottom";
-        if (material == Material.SUNFLOWER ||
-                material == Material.LILAC ||
-                material == Material.ROSE_BUSH ||
-                material == Material.PEONY)
-            return "block/" + name.toLowerCase() + "_bottom";
-        if (name.contains("_STEM"))
-            return "block/pumpkin_stem";
-        if (name.equals("SUGAR_CANE"))
-            return "block/sugar_cane";
-        if (material == Material.BAMBOO)
-            return "block/bamboo_stalk";
-        if (material == Material.CHORUS_PLANT)
-            return "block/chorus_plant";
-        if (material == Material.CHORUS_FLOWER)
-            return "block/chorus_flower";
-        if (material == Material.WATER)
-            return "block/water_still";
-        if (material == Material.LAVA)
-            return "block/lava_still";
-        return "block/" + name.toLowerCase();
+        String materialName = material.toString().toLowerCase(Locale.ROOT);
+        if (!model) {
+            if (material == Material.COMPASS)
+                return "item/compass_16";
+            if (VersionUtil.atOrAbove("1.19") && material == Material.RECOVERY_COMPASS)
+                return "item/recovery_compass_16";
+            if (material == Material.DEBUG_STICK)
+                return "item/stick";
+            if (material == Material.ENCHANTED_GOLDEN_APPLE)
+                return "item/golden_apple";
+            if (material == Material.SUNFLOWER)
+                return "block/sunflower_front";
+            if (Tag.TALL_FLOWERS.isTagged(material) && !material.name().equals("PITCHER_PLANT"))
+                return "block/" + materialName + "_top";
+            if (material == Material.LARGE_FERN || material == Material.TALL_GRASS)
+                return "block/" + materialName + "_top";
+            if (material.name().contains("GLASS_PANE"))
+                return "block/" + materialName.replace("_pane", "");
+            if (material == Material.TWISTING_VINES || material == Material.WEEPING_VINES)
+                return "block/" + materialName + "_plant";
+            if (material == Material.IRON_BARS || (material.isBlock() && !has2DBlockIcon(material)))
+                return "block/" + materialName;
+            if (material == Material.CROSSBOW)
+                return "item/crossbow_standby";
+        }
+        return "item/" + materialName;
     }
 
     private String getParent(final Material material) {

diff --git a/gradle.properties b/gradle.properties
@@ -1,2 +1,2 @@
-pluginVersion=1.186.0
+pluginVersion=1.186.1
 idofrontVersion=0.21.12
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/v1_18_R1/build.gradle.kts b/v1_18_R1/build.gradle.kts
@@ -1,11 +1,11 @@
 plugins {
     id("java")
-    id("io.papermc.paperweight.userdev") version "1.7.4"
+    id("io.papermc.paperweight.userdev") version "2.0.0-beta.8"
     id("io.github.goooler.shadow") version "8.1.8"
 }
 
 repositories {
-    maven("https://papermc.io/repo/repository/maven-public/") // Paper
+    maven("https://repo.papermc.io/repository/maven-public/") // Paper
 }
 
 dependencies {

diff --git a/v1_18_R2/build.gradle.kts b/v1_18_R2/build.gradle.kts
@@ -1,11 +1,11 @@
 plugins {
     id("java")
-    id("io.papermc.paperweight.userdev") version "1.7.4"
+    id("io.papermc.paperweight.userdev") version "2.0.0-beta.8"
     id("io.github.goooler.shadow") version "8.1.8"
 }
 
 repositories {
-    maven("https://papermc.io/repo/repository/maven-public/") // Paper
+    maven("https://repo.papermc.io/repository/maven-public/") // Paper
 }
 
 dependencies {

diff --git a/v1_19_R1/build.gradle.kts b/v1_19_R1/build.gradle.kts
@@ -1,11 +1,11 @@
 plugins {
     id("java")
-    id("io.papermc.paperweight.userdev") version "1.7.4"
+    id("io.papermc.paperweight.userdev") version "2.0.0-beta.8"
     id("io.github.goooler.shadow") version "8.1.8"
 }
 
 repositories {
-    maven("https://papermc.io/repo/repository/maven-public/") // Paper
+    maven("https://repo.papermc.io/repository/maven-public/") // Paper
 }
 
 dependencies {

diff --git a/v1_19_R2/build.gradle.kts b/v1_19_R2/build.gradle.kts
@@ -1,11 +1,11 @@
 plugins {
     id("java")
-    id("io.papermc.paperweight.userdev") version "1.7.4"
+    id("io.papermc.paperweight.userdev") version "2.0.0-beta.8"
     id("io.github.goooler.shadow") version "8.1.8"
 }
 
 repositories {
-    maven("https://papermc.io/repo/repository/maven-public/") // Paper
+    maven("https://repo.papermc.io/repository/maven-public/") // Paper
 }
 
 dependencies {

diff --git a/v1_19_R3/build.gradle.kts b/v1_19_R3/build.gradle.kts
@@ -1,11 +1,11 @@
 plugins {
     id("java")
-    id("io.papermc.paperweight.userdev") version "1.7.4"
+    id("io.papermc.paperweight.userdev") version "2.0.0-beta.8"
     id("io.github.goooler.shadow") version "8.1.8"
 }
 
 repositories {
-    maven("https://papermc.io/repo/repository/maven-public/") // Paper
+    maven("https://repo.papermc.io/repository/maven-public/") // Paper
 }
 
 dependencies {

diff --git a/v1_20_R1/build.gradle.kts b/v1_20_R1/build.gradle.kts
@@ -1,11 +1,11 @@
 plugins {
     id("java")
-    id("io.papermc.paperweight.userdev") version "1.7.4"
+    id("io.papermc.paperweight.userdev") version "2.0.0-beta.8"
     id("io.github.goooler.shadow") version "8.1.8"
 }
 
 repositories {
-    maven("https://papermc.io/repo/repository/maven-public/") // Paper
+    maven("https://repo.papermc.io/repository/maven-public/") // Paper
 }
 
 dependencies {

diff --git a/v1_20_R2/build.gradle.kts b/v1_20_R2/build.gradle.kts
@@ -1,11 +1,11 @@
 plugins {
     id("java")
-    id("io.papermc.paperweight.userdev") version "1.7.4"
+    id("io.papermc.paperweight.userdev") version "2.0.0-beta.8"
     id("io.github.goooler.shadow") version "8.1.8"
 }
 
 repositories {
-    maven("https://papermc.io/repo/repository/maven-public/") // Paper
+    maven("https://repo.papermc.io/repository/maven-public/") // Paper
 }
 
 dependencies {

diff --git a/v1_20_R3/build.gradle.kts b/v1_20_R3/build.gradle.kts
@@ -1,11 +1,11 @@
 plugins {
     id("java")
-    id("io.papermc.paperweight.userdev") version "1.7.4"
+    id("io.papermc.paperweight.userdev") version "2.0.0-beta.8"
     id("io.github.goooler.shadow") version "8.1.8"
 }
 
 repositories {
-    maven("https://papermc.io/repo/repository/maven-public/") // Paper
+    maven("https://repo.papermc.io/repository/maven-public/") // Paper
 }
 
 dependencies {

diff --git a/v1_20_R4/build.gradle.kts b/v1_20_R4/build.gradle.kts
@@ -1,11 +1,11 @@
 plugins {
     id("java")
-    id("io.papermc.paperweight.userdev") version "1.7.4"
+    id("io.papermc.paperweight.userdev") version "2.0.0-beta.8"
     id("io.github.goooler.shadow") version "8.1.8"
 }
 
 repositories {
-    maven("https://papermc.io/repo/repository/maven-public/") // Paper
+    maven("https://repo.papermc.io/repository/maven-public/") // Paper
 }
 
 dependencies {

diff --git a/v1_21_R1/build.gradle.kts b/v1_21_R1/build.gradle.kts
@@ -1,11 +1,11 @@
 plugins {
     id("java")
-    id("io.papermc.paperweight.userdev") version "1.7.4"
+    id("io.papermc.paperweight.userdev") version "2.0.0-beta.8"
     id("io.github.goooler.shadow") version "8.1.8"
 }
 
 repositories {
-    maven("https://papermc.io/repo/repository/maven-public/") // Paper
+    maven("https://repo.papermc.io/repository/maven-public/") // Paper
 }
 
 dependencies {

diff --git a/v1_21_R2/build.gradle.kts b/v1_21_R2/build.gradle.kts
@@ -1,11 +1,11 @@
 plugins {
     id("java")
-    id("io.papermc.paperweight.userdev") version "1.7.4"
+    id("io.papermc.paperweight.userdev") version "2.0.0-beta.8"
     id("io.github.goooler.shadow") version "8.1.8"
 }
 
 repositories {
-    maven("https://papermc.io/repo/repository/maven-public/") // Paper
+    maven("https://repo.papermc.io/repository/maven-public/") // Paper
 }
 
 dependencies {

diff --git a/v1_21_R3/build.gradle.kts b/v1_21_R3/build.gradle.kts
@@ -1,11 +1,11 @@
 plugins {
     id("java")
-    id("io.papermc.paperweight.userdev") version "1.7.4"
+    id("io.papermc.paperweight.userdev") version "2.0.0-beta.8"
     id("io.github.goooler.shadow") version "8.1.8"
 }
 
 repositories {
-    maven("https://papermc.io/repo/repository/maven-public/")
+    maven("https://repo.papermc.io/repository/maven-public/")
 }
 
 dependencies {