Merge branch 'GregTechCEu:1.20.1' into 1.20.1

Author: code-onigiri

settings.gradle

@@ -18,7 +18,7 @@ dependencyResolutionManagement {
 
         // Mod Dependencies Versions
         // Common
-        def jeiVersion = "15.2.0.27"
+        def jeiVersion = "15.8.0.11"
         def reiVersion = "12.1.725"
         def emiVersion = "1.0.30"
         def ae2Version = "15.0.18"
@@ -44,7 +44,7 @@ dependencyResolutionManagement {
         def vineFlowerVersion = "1.+"
         def macheteVersion = "1.+"
         def configurationVersion = "2.2.0"
-        def ldLibVersion = "1.0.25.p"
+        def ldLibVersion = "1.0.26"
         def mixinextrasVersion = "0.2.0"
         def shimmerVersion = "0.2.4"
 

src/generated/resources/assets/gtceu/lang/en_ud.json

@@ -3794,6 +3794,8 @@
   "gtceu.tooltip.fluid_pipe_hold_shift": "oɟuI ʇuǝɯuıɐʇuoƆ pınןℲ ʍoɥs oʇ ⟘ℲIHS pןoHㄥ§",
   "gtceu.tooltip.hold_ctrl": "oɟuı ǝɹoɯ ɹoɟ Ꞁᴚ⟘Ɔ pןoHㄥ§",
   "gtceu.tooltip.hold_shift": "oɟuı ǝɹoɯ ɹoɟ ⟘ℲIHS pןoHㄥ§",
+  "gtceu.tooltip.potion.each": "buıuǝddɐɥ ɟo ǝɔuɐɥɔ ɹ§%s%%ɐ§ ɐ ɥʇıʍ sʞɔıʇ ɹ§%sɔ§ ɹoɟ ɹ§%s %sǝ§   ",
+  "gtceu.tooltip.potion.header": ":sʇɔǝɟɟǝ suıɐʇuoƆ9§",
   "gtceu.tooltip.tool_fluid_hold_shift": "oɟuI ןoo⟘ puɐ ʇuǝɯuıɐʇuoƆ pınןℲ ʍoɥs oʇ ⟘ℲIHS pןoHㄥ§",
   "gtceu.top.allow_output_input": "ʇnduI ʍoןןⱯ",
   "gtceu.top.auto_output": "ʇndʇnO oʇnⱯ",

src/generated/resources/assets/gtceu/lang/en_us.json

@@ -3794,6 +3794,8 @@
   "gtceu.tooltip.fluid_pipe_hold_shift": "§7Hold SHIFT to show Fluid Containment Info",
   "gtceu.tooltip.hold_ctrl": "§7Hold CTRL for more info",
   "gtceu.tooltip.hold_shift": "§7Hold SHIFT for more info",
+  "gtceu.tooltip.potion.each": "   §e%s %s§r for §c%s§r ticks with a §a%s%%§r chance of happening",
+  "gtceu.tooltip.potion.header": "§6Contains effects:",
   "gtceu.tooltip.tool_fluid_hold_shift": "§7Hold SHIFT to show Fluid Containment and Tool Info",
   "gtceu.top.allow_output_input": "Allow Input",
   "gtceu.top.auto_output": "Auto Output",

src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/HazardProperty.java

@@ -5,9 +5,9 @@
 import com.gregtechceu.gtceu.api.data.chemical.material.stack.UnificationEntry;
 import com.gregtechceu.gtceu.api.data.medicalcondition.MedicalCondition;
 import com.gregtechceu.gtceu.api.data.tag.TagPrefix;
+import com.gregtechceu.gtceu.api.item.GTBucketItem;
 import com.gregtechceu.gtceu.api.item.TagPrefixItem;
 import com.gregtechceu.gtceu.api.item.armor.ArmorComponentItem;
-import com.gregtechceu.gtceu.api.item.forge.GTBucketItem;
 import com.gregtechceu.gtceu.config.ConfigHolder;
 import com.gregtechceu.gtceu.data.recipe.CustomTags;
 

src/main/java/com/gregtechceu/gtceu/api/item/ComponentItem.java

@@ -14,6 +14,7 @@
 import net.minecraft.MethodsReturnNonnullByDefault;
 import net.minecraft.core.NonNullList;
 import net.minecraft.network.chat.Component;
+import net.minecraft.sounds.SoundEvent;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.InteractionResultHolder;
@@ -23,10 +24,12 @@
 import net.minecraft.world.entity.ai.attributes.Attribute;
 import net.minecraft.world.entity.ai.attributes.AttributeModifier;
 import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.food.FoodProperties;
 import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.TooltipFlag;
+import net.minecraft.world.item.UseAnim;
 import net.minecraft.world.item.context.UseOnContext;
 import net.minecraft.world.item.crafting.RecipeType;
 import net.minecraft.world.item.enchantment.Enchantment;
@@ -212,6 +215,16 @@ public ItemStack finishUsingItem(ItemStack stack, Level level, LivingEntity livi
         return stack;
     }
 
+    @Override
+    public UseAnim getUseAnimation(ItemStack stack) {
+        for (IItemComponent component : components) {
+            if (component instanceof IInteractionItem interactionItem) {
+                return interactionItem.getUseAnimation(stack);
+            }
+        }
+        return super.getUseAnimation(stack);
+    }
+
     @Override
     public InteractionResult onItemUseFirst(ItemStack itemStack, UseOnContext context) {
         for (IItemComponent component : components) {
@@ -345,12 +358,52 @@ public int getBurnTime(ItemStack itemStack, @Nullable RecipeType<?> recipeType)
         return burnTime;
     }
 
+    @Override
+    public @Nullable FoodProperties getFoodProperties(ItemStack stack, @Nullable LivingEntity entity) {
+        for (IItemComponent component : components) {
+            if (component instanceof IEdibleItem foodBehavior) {
+                return foodBehavior.getFoodProperties(stack, entity);
+            }
+        }
+        return super.getFoodProperties(stack, entity);
+    }
+
+    @Override
+    public boolean isEdible() {
+        for (IItemComponent component : components) {
+            if (component instanceof IEdibleItem foodBehavior) {
+                return foodBehavior.isEdible();
+            }
+        }
+        return super.isEdible();
+    }
+
+    @Override
+    public SoundEvent getEatingSound() {
+        for (IItemComponent component : components) {
+            if (component instanceof IEdibleItem foodBehavior) {
+                return foodBehavior.getEatingSound();
+            }
+        }
+        return super.getEatingSound();
+    }
+
+    @Override
+    public SoundEvent getDrinkingSound() {
+        for (IItemComponent component : components) {
+            if (component instanceof IEdibleItem foodBehavior) {
+                return foodBehavior.getDrinkingSound();
+            }
+        }
+        return super.getDrinkingSound();
+    }
+
     public void burnTime(int burnTime) {
         this.burnTime = burnTime;
     }
 
     /**
-     * Attempts to get an fully charged variant of this electric item
+     * Attempts to get a fully charged variant of this electric item
      *
      * @param chargeAmount amount of charge
      * @return charged electric item stack

…u/gtceu/api/item/forge/GTBucketItem.java …techceu/gtceu/api/item/GTBucketItem.javasrc/main/java/com/gregtechceu/gtceu/api/item/forge/GTBucketItem.java renamed to src/main/java/com/gregtechceu/gtceu/api/item/GTBucketItem.java src/main/java/com/gregtechceu/gtceu/api/item/forge/GTBucketItem.java renamed to src/main/java/com/gregtechceu/gtceu/api/item/GTBucketItem.java

@@ -1,4 +1,4 @@
-package com.gregtechceu.gtceu.api.item.forge;
+package com.gregtechceu.gtceu.api.item;
 
 import com.gregtechceu.gtceu.api.data.chemical.material.Material;
 import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey;

src/main/java/com/gregtechceu/gtceu/api/item/component/FilteredFluidContainer.java

@@ -40,9 +40,8 @@ public static FilteredFluidContainer create(int capacity, boolean allowPartialFi
     @Override
     public @NotNull <T> LazyOptional<T> getCapability(ItemStack itemStack, @NotNull Capability<T> cap) {
         if (cap == ForgeCapabilities.FLUID_HANDLER_ITEM) {
-            return ForgeCapabilities.FLUID_HANDLER_ITEM.orEmpty(cap, LazyOptional.of(() -> {
-                return new FilteredFluidHandlerItemStack(itemStack, capacity, filter);
-            }));
+            return ForgeCapabilities.FLUID_HANDLER_ITEM.orEmpty(cap,
+                    LazyOptional.of(() -> new FilteredFluidHandlerItemStack(itemStack, capacity, filter)));
         }
         return LazyOptional.empty();
     }

src/main/java/com/gregtechceu/gtceu/api/item/component/FoodStats.java

@@ -0,0 +1,85 @@
+package com.gregtechceu.gtceu.api.item.component;
+
+import com.gregtechceu.gtceu.utils.GTUtil;
+
+import net.minecraft.network.chat.Component;
+import net.minecraft.sounds.SoundEvent;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.food.FoodProperties;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.TooltipFlag;
+import net.minecraft.world.item.UseAnim;
+import net.minecraft.world.level.Level;
+
+import org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+import java.util.function.Supplier;
+
+/**
+ * Simple {@link IEdibleItem} implementation.
+ *
+ * @author GateGuardian
+ * @date : 2024/7/22
+ */
+public class FoodStats implements IEdibleItem, IInteractionItem, IAddInformation {
+
+    protected final FoodProperties properties;
+
+    protected final boolean isDrink;
+
+    @Nullable
+    protected final Supplier<ItemStack> containerItem;
+
+    public FoodStats(FoodProperties properties, boolean isDrink, @Nullable Supplier<ItemStack> containerItem) {
+        this.properties = properties;
+        this.isDrink = isDrink;
+        this.containerItem = containerItem;
+    }
+
+    @Override
+    public FoodProperties getFoodProperties(ItemStack stack, @Nullable LivingEntity entity) {
+        return properties;
+    }
+
+    @Override
+    public boolean isEdible() {
+        return true;
+    }
+
+    @Override
+    public SoundEvent getEatingSound() {
+        return isDrink ? getDrinkingSound() : IEdibleItem.super.getEatingSound();
+    }
+
+    @Override
+    public UseAnim getUseAnimation(ItemStack stack) {
+        return isDrink ? UseAnim.DRINK : UseAnim.EAT;
+    }
+
+    @Override
+    public void appendHoverText(ItemStack stack, @Nullable Level level, List<Component> tooltipComponents,
+                                TooltipFlag isAdvanced) {
+        GTUtil.addPotionTooltip(properties.getEffects(), tooltipComponents);
+    }
+
+    @Override
+    public ItemStack finishUsingItem(ItemStack food, Level level, LivingEntity livingEntity) {
+        Player player = livingEntity instanceof Player ? (Player) livingEntity : null;
+        var stack = livingEntity.eat(level, food);
+        if (containerItem != null && (player == null || !player.getAbilities().instabuild)) {
+            var container = containerItem.get();
+            if (stack.isEmpty()) {
+                return container;
+            }
+
+            if (player != null) {
+                if (!player.getInventory().add(container)) {
+                    player.drop(container, true);
+                }
+            }
+        }
+        return stack;
+    }
+}

src/main/java/com/gregtechceu/gtceu/api/item/component/IEdibleItem.java

@@ -0,0 +1,24 @@
+package com.gregtechceu.gtceu.api.item.component;
+
+import net.minecraft.sounds.SoundEvent;
+import net.minecraft.sounds.SoundEvents;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.food.FoodProperties;
+import net.minecraft.world.item.ItemStack;
+
+import org.jetbrains.annotations.Nullable;
+
+public interface IEdibleItem {
+
+    FoodProperties getFoodProperties(ItemStack stack, @Nullable LivingEntity entity);
+
+    boolean isEdible();
+
+    default SoundEvent getEatingSound() {
+        return SoundEvents.GENERIC_EAT;
+    }
+
+    default SoundEvent getDrinkingSound() {
+        return SoundEvents.GENERIC_DRINK;
+    }
+}

src/main/java/com/gregtechceu/gtceu/api/item/component/IInteractionItem.java

@@ -7,6 +7,7 @@
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.UseAnim;
 import net.minecraft.world.item.context.UseOnContext;
 import net.minecraft.world.level.Level;
 
@@ -17,6 +18,10 @@
  */
 public interface IInteractionItem extends IItemComponent {
 
+    default InteractionResult onItemUseFirst(ItemStack itemStack, UseOnContext context) {
+        return InteractionResult.PASS;
+    }
+
     default InteractionResult useOn(UseOnContext context) {
         return InteractionResult.PASS;
     }
@@ -39,8 +44,8 @@ default ItemStack finishUsingItem(ItemStack stack, Level level, LivingEntity liv
         return stack.isEdible() ? livingEntity.eat(level, stack) : stack;
     }
 
-    default InteractionResult onItemUseFirst(ItemStack itemStack, UseOnContext context) {
-        return InteractionResult.PASS;
+    default UseAnim getUseAnimation(ItemStack stack) {
+        return stack.getItem().isEdible() ? UseAnim.EAT : UseAnim.NONE;
     }
 
     default boolean hurtEnemy(ItemStack stack, LivingEntity target, LivingEntity attacker) {