Skip to content

Commit

Permalink
Merge pull request #553 from P3pp3rF1y/1.21.x-dev
Browse files Browse the repository at this point in the history 
feat: ✨ Updated barrels so that their textures would be more naturall…
  • Loading branch information
@P3pp3rF1y
P3pp3rF1y authored Dec 5, 2024
2 parents ba484a0 + 88a8b0d commit a856392
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 @@ -13,7 +13,7 @@ loader_version_range=[4,)
mod_id=sophisticatedstorage
mod_name=Sophisticated Storage
mod_license=GNU General Public License v3.0
mod_version=0.11.3
mod_version=0.11.4
mod_group_id=sophisticatedstorage
mod_authors=P3pp3rF1y, Ridanisaurus
mod_description=Fancy and functional storage containers.
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 a856392

Please sign in to comment.