Skip to content

Commit

Permalink
Fixed pie logic in creative mode.
Browse files Browse the repository at this point in the history
  • Loading branch information
JuniorWolfgamingDE committed Jun 29, 2024
1 parent e1629aa commit 1c1162d
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 4 deletions.
2 changes: 1 addition & 1 deletion assortedcuisine.mcreator
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2399,8 +2399,8 @@
"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
2 changes: 1 addition & 1 deletion elements/PieRightClicked.mod.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"_fv": 57,
"_type": "procedure",
"definition": {
"procedurexml": "<xml xmlns=\"https://developers.google.com/blockly/xml\"><block type=\"event_trigger\" deletable=\"false\" x=\"40\" y=\"40\"><field name=\"trigger\">no_ext_trigger</field><next><block type=\"controls_if\"><value name=\"IF0\"><block type=\"math_binary_ops\"><field name=\"OP\">LT</field><value name=\"A\"><block type=\"entity_foodlevel\"><value name=\"entity\"><block type=\"entity_from_deps\"></block></value></block></value><value name=\"B\"><block type=\"math_number\"><field name=\"NUM\">20</field></block></value></block></value><statement name=\"DO0\"><block type=\"controls_if\"><value name=\"IF0\"><block type=\"math_binary_ops\"><field name=\"OP\">EQ</field><value name=\"A\"><block type=\"block_get_blockstate\"><value name=\"block\"><block type=\"blockstate_from_deps\"></block></value></block></value><value name=\"B\"><block type=\"math_number\"><field name=\"NUM\">6</field></block></value></block></value><statement name=\"DO0\"><block type=\"block_remove\"><value name=\"x\"><block type=\"coord_x\"></block></value><value name=\"y\"><block type=\"coord_y\"></block></value><value name=\"z\"><block type=\"coord_z\"></block></value></block></statement><next><block type=\"block_set_blockstate\"><value name=\"x\"><block type=\"coord_x\"></block></value><value name=\"y\"><block type=\"coord_y\"></block></value><value name=\"z\"><block type=\"coord_z\"></block></value><value name=\"value\"><block type=\"math_dual_ops\"><field name=\"OP\">ADD</field><value name=\"A\"><block type=\"block_get_blockstate\"><value name=\"block\"><block type=\"blockstate_from_deps\"></block></value></block></value><value name=\"B\"><block type=\"math_number\"><field name=\"NUM\">1</field></block></value></block></value><next><block type=\"entity_set_foodlevel\"><value name=\"entity\"><block type=\"entity_from_deps\"></block></value><value name=\"foodlevel\"><block type=\"math_dual_ops\"><field name=\"OP\">ADD</field><value name=\"A\"><block type=\"entity_foodlevel\"><value name=\"entity\"><block type=\"entity_from_deps\"></block></value></block></value><value name=\"B\"><block type=\"math_number\"><field name=\"NUM\">2</field></block></value></block></value></block></next></block></next></block></statement></block></next></block></xml>"
"procedurexml": "<xml xmlns=\"https://developers.google.com/blockly/xml\"><block type=\"event_trigger\" deletable=\"false\" x=\"40\" y=\"40\"><field name=\"trigger\">no_ext_trigger</field><next><block type=\"controls_if\"><mutation elseif=\"1\"></mutation><value name=\"IF0\"><block type=\"entity_iscreative\"><value name=\"entity\"><block type=\"entity_from_deps\"></block></value></block></value><statement name=\"DO0\"><block type=\"controls_if\"><value name=\"IF0\"><block type=\"math_binary_ops\"><field name=\"OP\">EQ</field><value name=\"A\"><block type=\"block_get_blockstate\"><value name=\"block\"><block type=\"blockstate_from_deps\"></block></value></block></value><value name=\"B\"><block type=\"math_number\"><field name=\"NUM\">6</field></block></value></block></value><statement name=\"DO0\"><block type=\"block_remove\"><value name=\"x\"><block type=\"coord_x\"></block></value><value name=\"y\"><block type=\"coord_y\"></block></value><value name=\"z\"><block type=\"coord_z\"></block></value></block></statement><next><block type=\"block_set_blockstate\"><value name=\"x\"><block type=\"coord_x\"></block></value><value name=\"y\"><block type=\"coord_y\"></block></value><value name=\"z\"><block type=\"coord_z\"></block></value><value name=\"value\"><block type=\"math_dual_ops\"><field name=\"OP\">ADD</field><value name=\"A\"><block type=\"block_get_blockstate\"><value name=\"block\"><block type=\"blockstate_from_deps\"></block></value></block></value><value name=\"B\"><block type=\"math_number\"><field name=\"NUM\">1</field></block></value></block></value></block></next></block></statement><value name=\"IF1\"><block type=\"math_binary_ops\"><field name=\"OP\">LT</field><value name=\"A\"><block type=\"entity_foodlevel\"><value name=\"entity\"><block type=\"entity_from_deps\"></block></value></block></value><value name=\"B\"><block type=\"math_number\"><field name=\"NUM\">20</field></block></value></block></value><statement name=\"DO1\"><block type=\"controls_if\"><value name=\"IF0\"><block type=\"math_binary_ops\"><field name=\"OP\">EQ</field><value name=\"A\"><block type=\"block_get_blockstate\"><value name=\"block\"><block type=\"blockstate_from_deps\"></block></value></block></value><value name=\"B\"><block type=\"math_number\"><field name=\"NUM\">6</field></block></value></block></value><statement name=\"DO0\"><block type=\"block_remove\"><value name=\"x\"><block type=\"coord_x\"></block></value><value name=\"y\"><block type=\"coord_y\"></block></value><value name=\"z\"><block type=\"coord_z\"></block></value></block></statement><next><block type=\"block_set_blockstate\"><value name=\"x\"><block type=\"coord_x\"></block></value><value name=\"y\"><block type=\"coord_y\"></block></value><value name=\"z\"><block type=\"coord_z\"></block></value><value name=\"value\"><block type=\"math_dual_ops\"><field name=\"OP\">ADD</field><value name=\"A\"><block type=\"block_get_blockstate\"><value name=\"block\"><block type=\"blockstate_from_deps\"></block></value></block></value><value name=\"B\"><block type=\"math_number\"><field name=\"NUM\">1</field></block></value></block></value><next><block type=\"entity_set_foodlevel\"><value name=\"entity\"><block type=\"entity_from_deps\"></block></value><value name=\"foodlevel\"><block type=\"math_dual_ops\"><field name=\"OP\">ADD</field><value name=\"A\"><block type=\"entity_foodlevel\"><value name=\"entity\"><block type=\"entity_from_deps\"></block></value></block></value><value name=\"B\"><block type=\"math_number\"><field name=\"NUM\">2</field></block></value></block></value></block></next></block></next></block></statement></block></next></block></xml>"
}
}
13 changes: 12 additions & 1 deletion src/main/java/net/juniorwmg/assortedcuisine/procedures/PieRightClickedProcedure.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public class PieRightClickedProcedure {
public static void execute(LevelAccessor world, double x, double y, double z, BlockState blockstate, Entity entity) {
if (entity == null)
return;
if ((entity instanceof Player _plr ? _plr.getFoodData().getFoodLevel() : 0) < 20) {
if (entity instanceof Player _plr ? _plr.getAbilities().instabuild : false) {
if ((blockstate.getBlock().getStateDefinition().getProperty("blockstate") instanceof IntegerProperty _getip2 ? blockstate.getValue(_getip2) : -1) == 6) {
world.setBlock(BlockPos.containing(x, y, z), Blocks.AIR.defaultBlockState(), 3);
}
Expand All @@ -23,6 +23,17 @@ public static void execute(LevelAccessor world, double x, double y, double z, Bl
if (_bs.getBlock().getStateDefinition().getProperty("blockstate") instanceof IntegerProperty _integerProp && _integerProp.getPossibleValues().contains(_value))
world.setBlock(_pos, _bs.setValue(_integerProp, _value), 3);
}
} else if ((entity instanceof Player _plr ? _plr.getFoodData().getFoodLevel() : 0) < 20) {
if ((blockstate.getBlock().getStateDefinition().getProperty("blockstate") instanceof IntegerProperty _getip9 ? blockstate.getValue(_getip9) : -1) == 6) {
world.setBlock(BlockPos.containing(x, y, z), Blocks.AIR.defaultBlockState(), 3);
}
{
int _value = (int) ((blockstate.getBlock().getStateDefinition().getProperty("blockstate") instanceof IntegerProperty _getip12 ? blockstate.getValue(_getip12) : -1) + 1);
BlockPos _pos = BlockPos.containing(x, y, z);
BlockState _bs = world.getBlockState(_pos);
if (_bs.getBlock().getStateDefinition().getProperty("blockstate") instanceof IntegerProperty _integerProp && _integerProp.getPossibleValues().contains(_value))
world.setBlock(_pos, _bs.setValue(_integerProp, _value), 3);
}
if (entity instanceof Player _player)
_player.getFoodData().setFoodLevel((int) ((entity instanceof Player _plr ? _plr.getFoodData().getFoodLevel() : 0) + 2));
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/assortedcuisine/lang/en_us.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"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 1c1162d

Please sign in to comment.