Skip to content

Update for Minecraft 26.1 texture paths and BlueMap 5.21+ API #7

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
wwarpigg wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update for Minecraft 26.1 texture paths and BlueMap 5.21+ API #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ repositories {
}

dependencies {
compileOnly ( "de.bluecolored:bluemap-core:5.13" )
compileOnly ( "org.projectlombok:lombok:1.18.32" )
annotationProcessor ( "org.projectlombok:lombok:1.18.32" )
compileOnly ( "de.bluecolored:bluemap-core:5.22" )
compileOnly ( "org.projectlombok:lombok:1.18.42" )
annotationProcessor ( "org.projectlombok:lombok:1.18.42" )
}

java {
toolchain.languageVersion = JavaLanguageVersion.of(21)
toolchain.languageVersion = JavaLanguageVersion.of(25)
withSourcesJar()
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/de/bluecolored/bluemap/entities/renderer/CustomResourceModelRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import de.bluecolored.bluemap.core.resources.pack.resourcepack.model.Model;
import de.bluecolored.bluemap.core.resources.pack.resourcepack.texture.Texture;
import de.bluecolored.bluemap.core.util.Direction;
import de.bluecolored.bluemap.core.util.Key;
import de.bluecolored.bluemap.core.util.math.Color;
import de.bluecolored.bluemap.core.util.math.MatrixM4f;
import de.bluecolored.bluemap.core.util.math.VectorM2f;
Expand All @@ -57,7 +58,7 @@
public class CustomResourceModelRenderer implements EntityRenderer {
private static final float SCALE = 1f / 16f;

@Getter private final Function<ResourcePath<Model>, Model> modelProvider;
@Getter private final Function<Key, Model> modelProvider;
@Getter private final TextureGallery textureGallery;
@Getter private final RenderSettings renderSettings;

Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/minecraft/models/entity/armadillo/armadillo_adult.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"credit": "Made by Miraculixx",
"texture_size": [64, 64],
"textures": {
"0": "entity/armadillo"
"0": "entity/armadillo/armadillo"
},
"elements": [
{
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/minecraft/models/entity/armadillo/armadillo_adult_scared.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"credit": "Made by Miraculixx",
"texture_size": [64, 64],
"textures": {
"0": "entity/armadillo"
"0": "entity/armadillo/armadillo"
},
"elements": [
{
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/minecraft/models/entity/armadillo/armadillo_baby.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"credit": "Made by Miraculixx",
"texture_size": [64, 64],
"textures": {
"0": "entity/armadillo"
"0": "entity/armadillo/armadillo"
},
"elements": [
{
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/minecraft/models/entity/armadillo/armadillo_baby_scared.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"credit": "Made by Miraculixx",
"texture_size": [64, 64],
"textures": {
"0": "entity/armadillo"
"0": "entity/armadillo/armadillo"
},
"elements": [
{
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/minecraft/models/entity/bat.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"credit": "Made by Miraculixx",
"texture_size": [32, 32],
"textures": {
"0": "entity/bat"
"0": "entity/bat/bat"
},
"elements": [
{
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/minecraft/models/entity/cat/color/cat_adult_all_black.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "entity/cat/cat",
"textures": {
"0": "entity/cat/all_black"
"0": "entity/cat/cat_all_black"
}
}
2 changes: 1 addition & 1 deletion src/main/resources/assets/minecraft/models/entity/cat/color/cat_adult_black.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "entity/cat/cat",
"textures": {
"0": "entity/cat/black"
"0": "entity/cat/cat_black"
}
}
2 changes: 1 addition & 1 deletion src/main/resources/assets/minecraft/models/entity/cat/color/cat_adult_british_shorthair.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "entity/cat/cat",
"textures": {
"0": "entity/cat/british_shorthair"
"0": "entity/cat/cat_british_shorthair"
}
}
2 changes: 1 addition & 1 deletion src/main/resources/assets/minecraft/models/entity/cat/color/cat_adult_calico.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "entity/cat/cat",
"textures": {
"0": "entity/cat/calico"
"0": "entity/cat/cat_calico"
}
}
2 changes: 1 addition & 1 deletion src/main/resources/assets/minecraft/models/entity/cat/color/cat_adult_jellie.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "entity/cat/cat",
"textures": {
"0": "entity/cat/jellie"
"0": "entity/cat/cat_jellie"
}
}
2 changes: 1 addition & 1 deletion src/main/resources/assets/minecraft/models/entity/cat/color/cat_adult_persian.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "entity/cat/cat",
"textures": {
"0": "entity/cat/persian"
"0": "entity/cat/cat_persian"
}
}
2 changes: 1 addition & 1 deletion src/main/resources/assets/minecraft/models/entity/cat/color/cat_adult_ragdoll.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "entity/cat/cat",
"textures": {
"0": "entity/cat/ragdoll"
"0": "entity/cat/cat_ragdoll"
}
}
2 changes: 1 addition & 1 deletion src/main/resources/assets/minecraft/models/entity/cat/color/cat_adult_red.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "entity/cat/cat",
"textures": {
"0": "entity/cat/red"
"0": "entity/cat/cat_red"
}
}
2 changes: 1 addition & 1 deletion src/main/resources/assets/minecraft/models/entity/cat/color/cat_adult_siamese.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "entity/cat/cat",
"textures": {
"0": "entity/cat/siamese"
"0": "entity/cat/cat_siamese"
}
}
2 changes: 1 addition & 1 deletion src/main/resources/assets/minecraft/models/entity/cat/color/cat_adult_tabby.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "entity/cat/cat",
"textures": {
"0": "entity/cat/tabby"
"0": "entity/cat/cat_tabby"
}
}
2 changes: 1 addition & 1 deletion src/main/resources/assets/minecraft/models/entity/cat/color/cat_adult_white.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "entity/cat/cat",
"textures": {
"0": "entity/cat/white"
"0": "entity/cat/cat_white"
}
}
2 changes: 1 addition & 1 deletion src/main/resources/assets/minecraft/models/entity/cat/color/cat_baby_all_black.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "entity/cat/cat_baby",
"textures": {
"0": "entity/cat/all_black"
"0": "entity/cat/cat_all_black"
}
}
2 changes: 1 addition & 1 deletion src/main/resources/assets/minecraft/models/entity/cat/color/cat_baby_black.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "entity/cat/cat_baby",
"textures": {
"0": "entity/cat/black"
"0": "entity/cat/cat_black"
}
}
2 changes: 1 addition & 1 deletion src/main/resources/assets/minecraft/models/entity/cat/color/cat_baby_british_shorthair.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "entity/cat/cat_baby",
"textures": {
"0": "entity/cat/british_shorthair"
"0": "entity/cat/cat_british_shorthair"
}
}
2 changes: 1 addition & 1 deletion src/main/resources/assets/minecraft/models/entity/cat/color/cat_baby_calico.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "entity/cat/cat_baby",
"textures": {
"0": "entity/cat/calico"
"0": "entity/cat/cat_calico"
}
}
2 changes: 1 addition & 1 deletion src/main/resources/assets/minecraft/models/entity/cat/color/cat_baby_jellie.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "entity/cat/cat_baby",
"textures": {
"0": "entity/cat/jellie"
"0": "entity/cat/cat_jellie"
}
}
2 changes: 1 addition & 1 deletion src/main/resources/assets/minecraft/models/entity/cat/color/cat_baby_persian.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "entity/cat/cat_baby",
"textures": {
"0": "entity/cat/persian"
"0": "entity/cat/cat_persian"
}
}
2 changes: 1 addition & 1 deletion src/main/resources/assets/minecraft/models/entity/cat/color/cat_baby_ragdoll.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "entity/cat/cat_baby",
"textures": {
"0": "entity/cat/ragdoll"
"0": "entity/cat/cat_ragdoll"
}
}
2 changes: 1 addition & 1 deletion src/main/resources/assets/minecraft/models/entity/cat/color/cat_baby_red.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "entity/cat/cat_baby",
"textures": {
"0": "entity/cat/red"
"0": "entity/cat/cat_red"
}
}
2 changes: 1 addition & 1 deletion src/main/resources/assets/minecraft/models/entity/cat/color/cat_baby_siamese.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "entity/cat/cat_baby",
"textures": {
"0": "entity/cat/siamese"
"0": "entity/cat/cat_siamese"
}
}
2 changes: 1 addition & 1 deletion src/main/resources/assets/minecraft/models/entity/cat/color/cat_baby_tabby.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "entity/cat/cat_baby",
"textures": {
"0": "entity/cat/tabby"
"0": "entity/cat/cat_tabby"
}
}
2 changes: 1 addition & 1 deletion src/main/resources/assets/minecraft/models/entity/cat/color/cat_baby_white.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "entity/cat/cat_baby",
"textures": {
"0": "entity/cat/white"
"0": "entity/cat/cat_white"
}
}
2 changes: 1 addition & 1 deletion src/main/resources/assets/minecraft/models/entity/chicken/adult.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"credit": "Model by Miraculixx",
"texture_size": [64, 32],
"textures": {
"0": "entity/chicken/temperate_chicken"
"0": "entity/chicken/chicken_temperate"
},
"elements": [
{
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/minecraft/models/entity/chicken/adult_cold.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "minecraft:entity/chicken/adult",
"textures": {
"0": "entity/chicken/cold_chicken"
"0": "entity/chicken/chicken_cold"
}
}
2 changes: 1 addition & 1 deletion src/main/resources/assets/minecraft/models/entity/chicken/adult_temperate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "minecraft:entity/chicken/adult",
"textures": {
"0": "entity/chicken/temperate_chicken"
"0": "entity/chicken/chicken_temperate"
}
}
2 changes: 1 addition & 1 deletion src/main/resources/assets/minecraft/models/entity/chicken/adult_warm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "minecraft:entity/chicken/adult",
"textures": {
"0": "entity/chicken/warm_chicken"
"0": "entity/chicken/chicken_warm"
}
}
2 changes: 1 addition & 1 deletion src/main/resources/assets/minecraft/models/entity/chicken/baby.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"credit": "Model by Miraculixx",
"texture_size": [64, 32],
"textures": {
"0": "entity/chicken/temperate_chicken"
"0": "entity/chicken/chicken_temperate"
},
"elements": [
{
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/minecraft/models/entity/chicken/baby_cold.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "minecraft:entity/chicken/baby",
"textures": {
"0": "entity/chicken/cold_chicken"
"0": "entity/chicken/chicken_cold"
}
}
2 changes: 1 addition & 1 deletion src/main/resources/assets/minecraft/models/entity/chicken/baby_temperate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "minecraft:entity/chicken/baby",
"textures": {
"0": "entity/chicken/temperate_chicken"
"0": "entity/chicken/chicken_temperate"
}
}
2 changes: 1 addition & 1 deletion src/main/resources/assets/minecraft/models/entity/chicken/baby_warm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "minecraft:entity/chicken/baby",
"textures": {
"0": "entity/chicken/warm_chicken"
"0": "entity/chicken/chicken_warm"
}
}
4 changes: 2 additions & 2 deletions ...ources/assets/minecraft/models/entity/copper_golem/exposed_copper_golem_statue_alive.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parent": "entity/copper_golem/copper_golem_statue_alive",
"textures": {
"golem": "entity/copper_golem/exposed_copper_golem",
"1": "entity/copper_golem/exposed_copper_golem_eyes"
"golem": "entity/copper_golem/copper_golem_exposed",
"1": "entity/copper_golem/copper_golem_eyes_exposed"
}
}
4 changes: 2 additions & 2 deletions ...urces/assets/minecraft/models/entity/copper_golem/oxidized_copper_golem_statue_alive.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parent": "entity/copper_golem/copper_golem_statue_alive",
"textures": {
"golem": "entity/copper_golem/oxidized_copper_golem",
"1": "entity/copper_golem/oxidized_copper_golem_eyes"
"golem": "entity/copper_golem/copper_golem_oxidized",
"1": "entity/copper_golem/copper_golem_eyes_oxidized"
}
}
4 changes: 2 additions & 2 deletions ...rces/assets/minecraft/models/entity/copper_golem/weathered_copper_golem_statue_alive.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parent": "entity/copper_golem/copper_golem_statue_alive",
"textures": {
"golem": "entity/copper_golem/weathered_copper_golem",
"1": "entity/copper_golem/weathered_copper_golem_eyes"
"golem": "entity/copper_golem/copper_golem_weathered",
"1": "entity/copper_golem/copper_golem_eyes_weathered"
}
}
2 changes: 1 addition & 1 deletion src/main/resources/assets/minecraft/models/entity/cow/adult_cold.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "minecraft:entity/cow/adult",
"textures": {
"0": "entity/cow/cold_cow"
"0": "entity/cow/cow_cold"
}
}
Loading