Skip to content

Commit

Permalink
Adjusted Cheese Maker bounding boxes to new models
Browse files Browse the repository at this point in the history
  • Loading branch information
JuniorWolfgamingDE committed Jun 29, 2024
1 parent 70f5248 commit 6e752f4
Show file tree
Hide file tree
Showing 5 changed files with 159 additions and 7 deletions.
4 changes: 2 additions & 2 deletions assortedcuisine.mcreator
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2177,16 +2177,16 @@
"language_map": {
"en_us": {
"gamerule.butterDebugTickMessage.description": "Sends a chat message when an active butter churn or cheese maker ticks.",
"item.assortedcuisine.sparkling_water_bottle": "Bottle of Sparkling Water",
"item.assortedcuisine.pumpkin_slice": "Pumpkin Slice",
"item.assortedcuisine.sparkling_water_bottle": "Bottle of Sparkling Water",
"item.assortedcuisine.cheese_burger": "Cheese Burger",
"item_group.assortedcuisine.assorted_cuisine": "Assorted Cuisine",
"item.assortedcuisine.root_soda": "Root Beer",
"item.assortedcuisine.whisk": "Whisk",
"item.assortedcuisine.slurm_soda": "Slurm",
"item.assortedcuisine.bread_slice": "Bread Slice",
"item.assortedcuisine.hot_chocolate_milk": "Hot Chocolate Milk",
"item.assortedcuisine.cocoa_soda": "Cocoa Drink",
"item.assortedcuisine.hot_chocolate_milk": "Hot Chocolate Milk",
"item.assortedcuisine.golden_apple_soda": "Golden Apple Soda",
"item.assortedcuisine.mr_cheese_item": "MrCheeseItem",
"subtitles.mrcheese": "My name Mr. Cheese!",
Expand Down
36 changes: 36 additions & 0 deletions elements/CheeseMaker.mod.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,45 @@
"my": 0.0,
"mz": 0.0,
"Mx": 16.0,
"My": 8.0,
"Mz": 16.0,
"subtract": false
},
{
"mx": 0.0,
"my": 8.0,
"mz": 0.0,
"Mx": 16.0,
"My": 16.0,
"Mz": 1.0,
"subtract": false
},
{
"mx": 0.0,
"my": 8.0,
"mz": 15.0,
"Mx": 16.0,
"My": 16.0,
"Mz": 16.0,
"subtract": false
},
{
"mx": 0.0,
"my": 8.0,
"mz": 1.0,
"Mx": 1.0,
"My": 16.0,
"Mz": 15.0,
"subtract": false
},
{
"mx": 15.0,
"my": 8.0,
"mz": 1.0,
"Mx": 16.0,
"My": 16.0,
"Mz": 15.0,
"subtract": false
}
],
"name": "Cheese Maker",
Expand Down
114 changes: 112 additions & 2 deletions elements/CheeseMakerBlockstates.mod.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,62 @@
"renderType": 2,
"customModelName": "cheese_maker_filled:default",
"luminance": 0,
"boundingBoxes": []
"boundingBoxes": [
{
"mx": 0.0,
"my": 0.0,
"mz": 0.0,
"Mx": 16.0,
"My": 8.0,
"Mz": 16.0,
"subtract": false
},
{
"mx": 0.0,
"my": 8.0,
"mz": 0.0,
"Mx": 16.0,
"My": 16.0,
"Mz": 1.0,
"subtract": false
},
{
"mx": 0.0,
"my": 8.0,
"mz": 15.0,
"Mx": 16.0,
"My": 16.0,
"Mz": 16.0,
"subtract": false
},
{
"mx": 0.0,
"my": 8.0,
"mz": 1.0,
"Mx": 1.0,
"My": 16.0,
"Mz": 15.0,
"subtract": false
},
{
"mx": 15.0,
"my": 8.0,
"mz": 1.0,
"Mx": 16.0,
"My": 16.0,
"Mz": 15.0,
"subtract": false
},
{
"mx": 1.0,
"my": 7.0,
"mz": 1.0,
"Mx": 15.0,
"My": 15.0,
"Mz": 15.0,
"subtract": false
}
]
},
{
"texture": "cheesemakertop",
Expand All @@ -28,7 +83,62 @@
"renderType": 2,
"customModelName": "cheese_maker_filled:finished",
"luminance": 0,
"boundingBoxes": []
"boundingBoxes": [
{
"mx": 0.0,
"my": 0.0,
"mz": 0.0,
"Mx": 16.0,
"My": 8.0,
"Mz": 16.0,
"subtract": false
},
{
"mx": 0.0,
"my": 8.0,
"mz": 0.0,
"Mx": 16.0,
"My": 16.0,
"Mz": 1.0,
"subtract": false
},
{
"mx": 0.0,
"my": 8.0,
"mz": 15.0,
"Mx": 16.0,
"My": 16.0,
"Mz": 16.0,
"subtract": false
},
{
"mx": 0.0,
"my": 8.0,
"mz": 1.0,
"Mx": 1.0,
"My": 16.0,
"Mz": 15.0,
"subtract": false
},
{
"mx": 15.0,
"my": 8.0,
"mz": 1.0,
"Mx": 16.0,
"My": 16.0,
"Mz": 15.0,
"subtract": false
},
{
"mx": 1.0,
"my": 7.0,
"mz": 1.0,
"Mx": 15.0,
"My": 15.0,
"Mz": 15.0,
"subtract": false
}
]
}
]
}
Expand Down
8 changes: 7 additions & 1 deletion src/main/java/net/juniorwmg/assortedcuisine/block/CheeseMakerBlock.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,13 @@ public VoxelShape getVisualShape(BlockState state, BlockGetter world, BlockPos p

@Override
public VoxelShape getShape(BlockState state, BlockGetter world, BlockPos pos, CollisionContext context) {
return box(0, 0, 0, 16, 16, 16);
if (state.getValue(BLOCKSTATE) == 1) {
return Shapes.or(box(0, 0, 0, 16, 8, 16), box(0, 8, 0, 16, 16, 1), box(0, 8, 15, 16, 16, 16), box(0, 8, 1, 1, 16, 15), box(15, 8, 1, 16, 16, 15), box(1, 7, 1, 15, 15, 15));
}
if (state.getValue(BLOCKSTATE) == 2) {
return Shapes.or(box(0, 0, 0, 16, 8, 16), box(0, 8, 0, 16, 16, 1), box(0, 8, 15, 16, 16, 16), box(0, 8, 1, 1, 16, 15), box(15, 8, 1, 16, 16, 15), box(1, 7, 1, 15, 15, 15));
}
return Shapes.or(box(0, 0, 0, 16, 8, 16), box(0, 8, 0, 16, 16, 1), box(0, 8, 15, 16, 16, 16), box(0, 8, 1, 1, 16, 15), box(15, 8, 1, 16, 16, 15));
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/assets/assortedcuisine/lang/en_us.json
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"gamerule.butterDebugTickMessage.description": "Sends a chat message when an active butter churn or cheese maker ticks.",
"item.assortedcuisine.sparkling_water_bottle": "Bottle of Sparkling Water",
"item.assortedcuisine.pumpkin_slice": "Pumpkin Slice",
"item.assortedcuisine.sparkling_water_bottle": "Bottle of Sparkling Water",
"item.assortedcuisine.cheese_burger": "Cheese Burger",
"item_group.assortedcuisine.assorted_cuisine": "Assorted Cuisine",
"item.assortedcuisine.root_soda": "Root Beer",
"item.assortedcuisine.whisk": "Whisk",
"item.assortedcuisine.slurm_soda": "Slurm",
"item.assortedcuisine.bread_slice": "Bread Slice",
"item.assortedcuisine.hot_chocolate_milk": "Hot Chocolate Milk",
"item.assortedcuisine.cocoa_soda": "Cocoa Drink",
"item.assortedcuisine.hot_chocolate_milk": "Hot Chocolate Milk",
"item.assortedcuisine.golden_apple_soda": "Golden Apple Soda",
"item.assortedcuisine.mr_cheese_item": "MrCheeseItem",
"subtitles.mrcheese": "My name Mr. Cheese!",
Expand Down

0 comments on commit 6e752f4

Please sign in to comment.