Skip to content
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

Jump to bottom

Add food properties #1791

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Add food properties #1791

Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3a07bb6
Added item_nutrition and item_saturation
Ghoulboy78 Aug 4, 2023
791a808
Added food_properties()
Ghoulboy78 Aug 4, 2023
73fbb4f
Added effects map
Ghoulboy78 Aug 4, 2023
9f4ec63
Update Auxiliary.java
Ghoulboy78 Aug 7, 2023
1982f20
Swtiching to CarpetContext
Ghoulboy78 Aug 19, 2023
f25092c
Whoops...
Ghoulboy78 Aug 19, 2023
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
60 changes: 60 additions & 0 deletions src/main/java/carpet/script/api/Auxiliary.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package carpet.script.api;

import carpet.CarpetServer;
import carpet.script.external.Vanilla;
import carpet.script.utils.FeatureGenerator;
import carpet.script.argument.FileArgument;
Expand Down Expand Up @@ -66,10 +67,13 @@
import net.minecraft.sounds.SoundSource;
import net.minecraft.stats.Stat;
import net.minecraft.stats.StatType;
import net.minecraft.world.effect.MobEffectInstance;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.decoration.ArmorStand;
import net.minecraft.world.food.FoodProperties;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.ChunkPos;
import net.minecraft.world.level.Level;
Expand Down Expand Up @@ -1240,6 +1244,62 @@ else if (fdesc.type == FileArgument.Type.JSON)
cc.host.issueDeprecation("enable_hidden_dimensions in 1.18.2 and 1.19+");
return Value.NULL;
});

expression.addUnaryFunction("item_nutrition", v-> NumericValue.of(NBTSerializableValue.parseItem(v.getString(), CarpetServer.minecraft_server.registryAccess()).getItem().getFoodProperties().getNutrition()));
expression.addUnaryFunction("item_saturation", v-> NumericValue.of(NBTSerializableValue.parseItem(v.getString(), CarpetServer.minecraft_server.registryAccess()).getItem().getFoodProperties().getSaturationModifier()));

expression.addContextFunction("food_properties", -1, (c, t, lv)->{
if(lv.size()==0) throw new InternalExpressionException("'food_properties' requires at least an item name");
if(lv.size()>2) throw new InternalExpressionException("'food_properties' takes at most an item name and a property");

Item item = NBTSerializableValue.parseItem(lv.get(0).getString(), CarpetServer.minecraft_server.registryAccess()).getItem();
Ghoulboy78 marked this conversation as resolved.
Show resolved Hide resolved
if(item.isEdible()){
FoodProperties foodProperties = item.getFoodProperties();
if(lv.size()==1){ //Return map of all food properties
Map<Value, Value> propertyMap = new HashMap<>();
propertyMap.put(StringValue.of("nutrition"), NumericValue.of(foodProperties.getNutrition()));
propertyMap.put(StringValue.of("saturation"), NumericValue.of(foodProperties.getSaturationModifier()));
propertyMap.put(StringValue.of("is_meat"), BooleanValue.of(foodProperties.isMeat()));
propertyMap.put(StringValue.of("can_always_eat"), BooleanValue.of(foodProperties.canAlwaysEat()));
propertyMap.put(StringValue.of("fast_food"), BooleanValue.of(foodProperties.isFastFood()));

Map<Value, Value> effectsMap = new HashMap<>();
var effectsList = foodProperties.getEffects();
for (var effect : effectsList) {
MobEffectInstance mei = effect.getFirst();
effectsMap.put(StringValue.of("name"), StringValue.of(mei.getEffect().getDisplayName().getString()));
effectsMap.put(StringValue.of("duration"), NumericValue.of(mei.getDuration()));
effectsMap.put(StringValue.of("amplifier"), NumericValue.of(mei.getAmplifier()));
effectsMap.put(StringValue.of("probability"), NumericValue.of(effect.getSecond()));
}
propertyMap.put(StringValue.of("effects"), MapValue.wrap(effectsMap));

return MapValue.wrap(propertyMap);
} else { //Return specific food property
String property = lv.get(1).getString();
switch (property) {
case "nutrition": return NumericValue.of(foodProperties.getNutrition());
case "saturation": return NumericValue.of(foodProperties.getSaturationModifier());
case "is_meat": return BooleanValue.of(foodProperties.isMeat());
case "can_always_eat": return BooleanValue.of(foodProperties.canAlwaysEat());
case "fast_food": return BooleanValue.of(foodProperties.isFastFood());
case "effects":
Map<Value, Value> effectsMap = new HashMap<>();
var effectsList = foodProperties.getEffects();
for (var effect : effectsList) {
MobEffectInstance mei = effect.getFirst();
effectsMap.put(StringValue.of("name"), StringValue.of(mei.getEffect().getDisplayName().getString()));
effectsMap.put(StringValue.of("duration"), NumericValue.of(mei.getDuration()));
effectsMap.put(StringValue.of("amplifier"), NumericValue.of(mei.getAmplifier()));
effectsMap.put(StringValue.of("probability"), NumericValue.of(effect.getSecond()));
}
return MapValue.wrap(effectsMap);

default: throw new InternalExpressionException("Invalid food property '" + property + "'");
}
}
} else return Value.NULL;
});
}

private static void zipValueToJson(Path path, Value output) throws IOException
Expand Down