Skip to content

Commit

Permalink
feat: ✨ Updated barrels so that their textures would be more naturall…
Browse files Browse the repository at this point in the history 
…y rotated and allow for material textures at the back of the barrel to match exactly the rotation of the block it was applied from and seamlessly blend with it
  • Loading branch information
@P3pp3rF1y
P3pp3rF1y committed Dec 5, 2024
1 parent dc5e35f commit a178070
Show file tree
Hide file tree
Showing 123 changed files with 1,105 additions and 1,129 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ org.gradle.daemon=false

mod_id=sophisticatedstorage
mod_group_id=sophisticatedstorage
mod_version=0.11.1
mod_version=0.11.2
sonar_project_key=sophisticatedstorage:SophisticatedStorage
github_package_url=https://maven.pkg.github.com/P3pp3rF1y/SophisticatedStorage

Expand Down
32 changes: 14 additions & 18 deletions src/main/resources/assets/sophisticatedstorage/blockstates/barrel.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,58 +2,54 @@
"variants": {
"facing=down,flat_top=false": {
"x": 180,
"y": 180,
"model": "sophisticatedstorage:block/barrel"
},
"facing=east,flat_top=false": {
"x": 270,
"y": 270,
"x": 90,
"y": 90,
"model": "sophisticatedstorage:block/barrel"
},
"facing=north,flat_top=false": {
"x": 270,
"y": 180,
"x": 90,
"model": "sophisticatedstorage:block/barrel"
},
"facing=south,flat_top=false": {
"x": 270,
"x": 90,
"y": 180,
"model": "sophisticatedstorage:block/barrel"
},
"facing=up,flat_top=false": {
"y": 180,
"model": "sophisticatedstorage:block/barrel"
},
"facing=west,flat_top=false": {
"x": 270,
"y": 90,
"x": 90,
"y": 270,
"model": "sophisticatedstorage:block/barrel"
},
"facing=down,flat_top=true": {
"x": 180,
"y": 180,
"model": "sophisticatedstorage:block/flat/barrel"
},
"facing=east,flat_top=true": {
"x": 270,
"y": 270,
"x": 90,
"y": 90,
"model": "sophisticatedstorage:block/flat/barrel"
},
"facing=north,flat_top=true": {
"x": 270,
"y": 180,
"x": 90,
"model": "sophisticatedstorage:block/flat/barrel"
},
"facing=south,flat_top=true": {
"x": 270,
"x": 90,
"y": 180,
"model": "sophisticatedstorage:block/flat/barrel"
},
"facing=up,flat_top=true": {
"y": 180,
"model": "sophisticatedstorage:block/flat/barrel"
},
"facing=west,flat_top=true": {
"x": 270,
"y": 90,
"x": 90,
"y": 270,
"model": "sophisticatedstorage:block/flat/barrel"
}
}
Expand Down
110 changes: 53 additions & 57 deletions src/main/resources/assets/sophisticatedstorage/blockstates/copper_barrel.json
View file
Original file line number Diff line number Diff line change
@@ -1,60 +1,56 @@
{
"variants": {
"facing=down,flat_top=false": {
"x": 180,
"y": 180,
"model": "sophisticatedstorage:block/copper_barrel"
},
"facing=east,flat_top=false": {
"x": 270,
"y": 270,
"model": "sophisticatedstorage:block/copper_barrel"
},
"facing=north,flat_top=false": {
"x": 270,
"y": 180,
"model": "sophisticatedstorage:block/copper_barrel"
},
"facing=south,flat_top=false": {
"x": 270,
"model": "sophisticatedstorage:block/copper_barrel"
},
"facing=up,flat_top=false": {
"y": 180,
"model": "sophisticatedstorage:block/copper_barrel"
},
"facing=west,flat_top=false": {
"x": 270,
"y": 90,
"model": "sophisticatedstorage:block/copper_barrel"
},
"facing=down,flat_top=true": {
"x": 180,
"y": 180,
"model": "sophisticatedstorage:block/flat/copper_barrel"
},
"facing=east,flat_top=true": {
"x": 270,
"y": 270,
"model": "sophisticatedstorage:block/flat/copper_barrel"
},
"facing=north,flat_top=true": {
"x": 270,
"y": 180,
"model": "sophisticatedstorage:block/flat/copper_barrel"
},
"facing=south,flat_top=true": {
"x": 270,
"model": "sophisticatedstorage:block/flat/copper_barrel"
},
"facing=up,flat_top=true": {
"y": 180,
"model": "sophisticatedstorage:block/flat/copper_barrel"
},
"facing=west,flat_top=true": {
"x": 270,
"y": 90,
"model": "sophisticatedstorage:block/flat/copper_barrel"
"variants": {
"facing=down,flat_top=false": {
"x": 180,
"model": "sophisticatedstorage:block/copper_barrel"
},
"facing=east,flat_top=false": {
"x": 90,
"y": 90,
"model": "sophisticatedstorage:block/copper_barrel"
},
"facing=north,flat_top=false": {
"x": 90,
"model": "sophisticatedstorage:block/copper_barrel"
},
"facing=south,flat_top=false": {
"x": 90,
"y": 180,
"model": "sophisticatedstorage:block/copper_barrel"
},
"facing=up,flat_top=false": {
"model": "sophisticatedstorage:block/copper_barrel"
},
"facing=west,flat_top=false": {
"x": 90,
"y": 270,
"model": "sophisticatedstorage:block/copper_barrel"
},
"facing=down,flat_top=true": {
"x": 180,
"model": "sophisticatedstorage:block/flat/copper_barrel"
},
"facing=east,flat_top=true": {
"x": 90,
"y": 90,
"model": "sophisticatedstorage:block/flat/copper_barrel"
},
"facing=north,flat_top=true": {
"x": 90,
"model": "sophisticatedstorage:block/flat/copper_barrel"
},
"facing=south,flat_top=true": {
"x": 90,
"y": 180,
"model": "sophisticatedstorage:block/flat/copper_barrel"
},
"facing=up,flat_top=true": {
"model": "sophisticatedstorage:block/flat/copper_barrel"
},
"facing=west,flat_top=true": {
"x": 90,
"y": 270,
"model": "sophisticatedstorage:block/flat/copper_barrel"
}
}
}
}
32 changes: 14 additions & 18 deletions src/main/resources/assets/sophisticatedstorage/blockstates/diamond_barrel.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,58 +2,54 @@
"variants": {
"facing=down,flat_top=false": {
"x": 180,
"y": 180,
"model": "sophisticatedstorage:block/diamond_barrel"
},
"facing=east,flat_top=false": {
"x": 270,
"y": 270,
"x": 90,
"y": 90,
"model": "sophisticatedstorage:block/diamond_barrel"
},
"facing=north,flat_top=false": {
"x": 270,
"y": 180,
"x": 90,
"model": "sophisticatedstorage:block/diamond_barrel"
},
"facing=south,flat_top=false": {
"x": 270,
"x": 90,
"y": 180,
"model": "sophisticatedstorage:block/diamond_barrel"
},
"facing=up,flat_top=false": {
"y": 180,
"model": "sophisticatedstorage:block/diamond_barrel"
},
"facing=west,flat_top=false": {
"x": 270,
"y": 90,
"x": 90,
"y": 270,
"model": "sophisticatedstorage:block/diamond_barrel"
},
"facing=down,flat_top=true": {
"x": 180,
"y": 180,
"model": "sophisticatedstorage:block/flat/diamond_barrel"
},
"facing=east,flat_top=true": {
"x": 270,
"y": 270,
"x": 90,
"y": 90,
"model": "sophisticatedstorage:block/flat/diamond_barrel"
},
"facing=north,flat_top=true": {
"x": 270,
"y": 180,
"x": 90,
"model": "sophisticatedstorage:block/flat/diamond_barrel"
},
"facing=south,flat_top=true": {
"x": 270,
"x": 90,
"y": 180,
"model": "sophisticatedstorage:block/flat/diamond_barrel"
},
"facing=up,flat_top=true": {
"y": 180,
"model": "sophisticatedstorage:block/flat/diamond_barrel"
},
"facing=west,flat_top=true": {
"x": 270,
"y": 90,
"x": 90,
"y": 270,
"model": "sophisticatedstorage:block/flat/diamond_barrel"
}
}
Expand Down
32 changes: 14 additions & 18 deletions src/main/resources/assets/sophisticatedstorage/blockstates/gold_barrel.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,58 +2,54 @@
"variants": {
"facing=down,flat_top=false": {
"x": 180,
"y": 180,
"model": "sophisticatedstorage:block/gold_barrel"
},
"facing=east,flat_top=false": {
"x": 270,
"y": 270,
"x": 90,
"y": 90,
"model": "sophisticatedstorage:block/gold_barrel"
},
"facing=north,flat_top=false": {
"x": 270,
"y": 180,
"x": 90,
"model": "sophisticatedstorage:block/gold_barrel"
},
"facing=south,flat_top=false": {
"x": 270,
"x": 90,
"y": 180,
"model": "sophisticatedstorage:block/gold_barrel"
},
"facing=up,flat_top=false": {
"y": 180,
"model": "sophisticatedstorage:block/gold_barrel"
},
"facing=west,flat_top=false": {
"x": 270,
"y": 90,
"x": 90,
"y": 270,
"model": "sophisticatedstorage:block/gold_barrel"
},
"facing=down,flat_top=true": {
"x": 180,
"y": 180,
"model": "sophisticatedstorage:block/flat/gold_barrel"
},
"facing=east,flat_top=true": {
"x": 270,
"y": 270,
"x": 90,
"y": 90,
"model": "sophisticatedstorage:block/flat/gold_barrel"
},
"facing=north,flat_top=true": {
"x": 270,
"y": 180,
"x": 90,
"model": "sophisticatedstorage:block/flat/gold_barrel"
},
"facing=south,flat_top=true": {
"x": 270,
"x": 90,
"y": 180,
"model": "sophisticatedstorage:block/flat/gold_barrel"
},
"facing=up,flat_top=true": {
"y": 180,
"model": "sophisticatedstorage:block/flat/gold_barrel"
},
"facing=west,flat_top=true": {
"x": 270,
"y": 90,
"x": 90,
"y": 270,
"model": "sophisticatedstorage:block/flat/gold_barrel"
}
}
Expand Down
Loading

0 comments on commit a178070

Please sign in to comment.