Skip to content

Commit f96b673

Browse files
committed
Actually fix texture issues
1 parent eabfa7c commit f96b673

10 files changed

Lines changed: 19 additions & 21 deletions

build.gradle

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ task publishToModrinth {
7171
}
7272

7373
def getLastVersion() {
74-
def versions = Arrays.stream((project.mod_version + "").split("\\.")).map({s -> Integer.parseInt(s)}).collect(Collectors.toList())
74+
def versions = Arrays.stream((project.mod_version + "").split("\\.")).map({ s -> Integer.parseInt(s) }).collect(Collectors.toList())
7575
if (versions.get(2) != 0) {
7676
return versions.get(0) + "." + versions.get(1) + "." + (versions.get(2) - 1)
7777
}
@@ -88,7 +88,7 @@ task generateChangelog {
8888

8989
def lastTag = getLastVersion()
9090
def currentTag = project.mod_version
91-
def commits = "git log --max-count=100 --pretty=format:\"- %s\" $lastTag..$currentTag".execute()
91+
def commits = "git log --max-count=100 --pretty=format:%s $lastTag..$currentTag".execute()
9292
println "Last version: $lastTag"
9393
println "Current version: $currentTag"
9494

@@ -102,14 +102,12 @@ task generateChangelog {
102102
}
103103
println "Reading line: $processedLine"
104104

105-
if (processedLine.startsWith("- ")) {
106-
println "Adding changelog line:"
107-
println " $processedLine"
108-
if (changes.length() == 0) {
109-
changes << processedLine
110-
} else {
111-
changes << "\n$processedLine"
112-
}
105+
println "Adding changelog line:"
106+
println " $processedLine"
107+
if (changes.length() == 0) {
108+
changes << processedLine
109+
} else {
110+
changes << "\n$processedLine"
113111
}
114112
}
115113
commits.err.eachLine { line -> println line }
@@ -159,8 +157,8 @@ void sendDiscordWebhook() {
159157
def discordChangelog = createDiscordChangelog(release_url)
160158

161159
def result = DiscordBuilder.createForm {
162-
avatar_url = "https://raw.githubusercontent.com/OroArmor/Netherite-Plus-Mod/fcc51b4f3bad7004dcf7a8d00ffccfe4e34bf612/common/src/main/resources/assets/netherite_plus/icon.png"
163-
username = project.project_name
160+
avatar_url = "https://raw.githubusercontent.com/OroArmor/Netherite-Plus-Mod/fcc51b4f3bad7004dcf7a8d00ffccfe4e34bf612/common/src/main/resources/assets/netherite_plus/icon.png"
161+
username = project.project_name
164162
embed {
165163
author {
166164
name = project.project_name

common/src/main/resources/assets/netherite_plus/models/item/netherite_crossbow_arrow.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"parent": "netherite_plus:item/crossbow",
2+
"parent": "netherite_plus:item/netherite_crossbow",
33
"textures": {
44
"layer0": "netherite_plus:item/netherite_crossbow_arrow"
55
}

common/src/main/resources/assets/netherite_plus/models/item/netherite_crossbow_firework.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"parent": "netherite_plus:item/crossbow",
2+
"parent": "netherite_plus:item/netherite_crossbow",
33
"textures": {
44
"layer0": "netherite_plus:item/netherite_crossbow_firework"
55
}

common/src/main/resources/assets/netherite_plus/models/item/netherite_crossbow_pulling_0.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"parent": "netherite_plus:item/crossbow",
2+
"parent": "netherite_plus:item/netherite_crossbow",
33
"textures": {
44
"layer0": "netherite_plus:item/netherite_crossbow_pulling_0"
55
}

common/src/main/resources/assets/netherite_plus/models/item/netherite_crossbow_pulling_1.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"parent": "netherite_plus:item/crossbow",
2+
"parent": "netherite_plus:item/netherite_crossbow",
33
"textures": {
44
"layer0": "netherite_plus:item/netherite_crossbow_pulling_1"
55
}

common/src/main/resources/assets/netherite_plus/models/item/netherite_crossbow_pulling_2.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"parent": "netherite_plus:item/crossbow",
2+
"parent": "netherite_plus:item/netherite_crossbow",
33
"textures": {
44
"layer0": "netherite_plus:item/netherite_crossbow_pulling_2"
55
}

common/src/main/resources/assets/netherite_plus/models/item/netherite_fishing_rod.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"parent": "item/generated",
2+
"parent": "item/handheld_rod",
33
"textures": {
44
"layer0": "netherite_plus:item/netherite_fishing_rod"
55
},

common/src/main/resources/assets/netherite_plus/models/item/netherite_fishing_rod_cast.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"parent": "item/fishing_rod",
2+
"parent": "netherite_plus:item/netherite_fishing_rod",
33
"textures": {
44
"layer0": "netherite_plus:item/netherite_fishing_rod_cast"
55
}

common/src/main/resources/assets/netherite_plus/models/item/netherite_trident_in_hand.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"parent": "builtin/entity",
33
"gui_light": "front",
44
"textures": {
5-
"particle": "item/trident"
5+
"particle": "netherite_plus:item/netherite_trident"
66
},
77
"display": {
88
"thirdperson_righthand": {

common/src/main/resources/assets/netherite_plus/models/item/netherite_trident_throwing.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"parent": "builtin/entity",
33
"gui_light": "front",
44
"textures": {
5-
"particle": "item/trident"
5+
"particle": "netherite_plus:item/netherite_trident"
66
},
77
"display": {
88
"thirdperson_righthand": {

0 commit comments

Comments
 (0)