Skip to content
This repository has been archived by the owner on Aug 19, 2024. It is now read-only.

Commit

Permalink
tooltips
Browse files Browse the repository at this point in the history
  • Loading branch information
LeoLezury committed Jul 24, 2024
1 parent 87f31a7 commit c297116
Show file tree
Hide file tree
Showing 22 changed files with 165 additions and 25 deletions.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.21 2024-07-24T12:02:01.4363713 Languages: zh_cn for mod: farm_away
df05966a24a2f476e4ea468d44fa7d576cd4af02 assets/farm_away/lang/zh_cn.json
// 1.21 2024-07-24T13:13:35.3711124 Languages: zh_cn for mod: farm_away
a8a00fe5d5b72ed4d5f4449abac1f88562b5da7e assets/farm_away/lang/zh_cn.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// 1.21 2024-07-24T13:00:24.8402901 Recipes
a37b0ee385c41c60ec85e055c40c7fa46606a7e3 data/farm_away/advancement/recipes/tools/enhanced_hoe.json
77e3d982ba1963c13cce2a0d23ce99d444bbf49e data/farm_away/recipe/enhanced_hoe.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// 1.21 2024-07-24T11:03:54.6493388 Item Models: farm_away
// 1.21 2024-07-24T13:22:54.5959048 Item Models: farm_away
2ad32db58c0fa499a74244b0a93d24376c839f8f assets/farm_away/models/item/andesite_farmland.json
b2a7e655df68a186d639dec88988ceae42600755 assets/farm_away/models/item/blues_carrot.json
eedd987f394f89efed262824833a3b809aa1d980 assets/farm_away/models/item/diorite_farmland.json
dd2330312c0b5631c30a18741f3413c1a362a5e1 assets/farm_away/models/item/end_stone_farmland.json
da01b5bcff3b7ac5cebf2d7e17bce4c23fd2f2f9 assets/farm_away/models/item/enhanced_hoe_inventory.json
ff64ca088305c12a2a7cacfec4279a1b2ba079d3 assets/farm_away/models/item/enhanced_hoe_inventory.json
962f4382ead1ce3592eb273b3837b69f12c9d55f assets/farm_away/models/item/explosion_potato.json
41cd33706841b1061293e3d32e6b7a5619c738f1 assets/farm_away/models/item/granite_farmland.json
d63e5e0aeeceb2cdace1e603cb3102866c9fb903 assets/farm_away/models/item/netherrack_farmland.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.21 2024-07-24T12:02:01.4363713 Languages: en_us for mod: farm_away
a7140d92e47cbe1f638c31643c1a878a7daf763a assets/farm_away/lang/en_us.json
// 1.21 2024-07-24T13:13:35.3711124 Languages: en_us for mod: farm_away
f5b21b49abb639a25565c9be2660ad6a8b77524c assets/farm_away/lang/en_us.json
3 changes: 3 additions & 0 deletions src/generated/resources/assets/farm_away/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,11 @@
"effect.farm_away.blues": "Blues",
"entity.farm_away.explosion_potato": "Explosion Potato",
"item.farm_away.blues_carrot": "Blues Carrot",
"item.farm_away.blues_carrot.tooltip": "When Eaten: Damage taken may be canceled or doubled",
"item.farm_away.enhanced_hoe": "Enhanced Hoe",
"item.farm_away.enhanced_hoe.tooltip": "Able to Till:",
"item.farm_away.explosion_potato": "Explosion Potato",
"item.farm_away.explosion_potato.tooltip": "When Crouching: Can be thrown",
"item.farm_away.strong_carrot": "Strong Carrot",
"itemGroup.farm_away.main": "Farm Away"
}
3 changes: 3 additions & 0 deletions src/generated/resources/assets/farm_away/lang/zh_cn.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,11 @@
"effect.farm_away.blues": "",
"entity.farm_away.explosion_potato": "爆炎土豆",
"item.farm_away.blues_carrot": "蓝胡萝卜",
"item.farm_away.blues_carrot.tooltip": "食用后:受到伤害可能取消或翻倍",
"item.farm_away.enhanced_hoe": "强化锄",
"item.farm_away.enhanced_hoe.tooltip": "可开垦:",
"item.farm_away.explosion_potato": "爆炎土豆",
"item.farm_away.explosion_potato.tooltip": "潜行时:可投掷",
"item.farm_away.strong_carrot": "强力胡萝卜",
"itemGroup.farm_away.main": "田园巫术"
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "minecraft:item/generated",
"parent": "minecraft:item/handheld",
"textures": {
"layer0": "farm_away:item/enhanced_hoe_inventory"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_nether_star": {
"conditions": {
"items": [
{
"items": "minecraft:nether_star"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_netherite_hoe": {
"conditions": {
"items": [
{
"items": "minecraft:netherite_hoe"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "farm_away:enhanced_hoe"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_netherite_hoe",
"has_nether_star"
]
],
"rewards": {
"recipes": [
"farm_away:enhanced_hoe"
]
}
}
16 changes: 16 additions & 0 deletions src/generated/resources/data/farm_away/recipe/enhanced_hoe.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"type": "minecraft:crafting_shapeless",
"category": "equipment",
"ingredients": [
{
"item": "minecraft:netherite_hoe"
},
{
"item": "minecraft:nether_star"
}
],
"result": {
"count": 1,
"id": "farm_away:enhanced_hoe"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ private static void onModifyBakingResult(ModelEvent.ModifyBakingResult event) {
@Override
public BakedModel applyTransform(ItemDisplayContext cameraTransformType, PoseStack poseStack, boolean applyLeftHandTransform) {
if (ITEMS_WITH_SPECIAL_MODELS.get(location).containsKey(cameraTransformType)) {
return BAKED_MODELS.get(ITEMS_WITH_SPECIAL_MODELS.get(location).get(cameraTransformType));
return BAKED_MODELS.get(ITEMS_WITH_SPECIAL_MODELS.get(location).get(cameraTransformType)).applyTransform(cameraTransformType, poseStack, applyLeftHandTransform);
}
return super.applyTransform(cameraTransformType, poseStack, applyLeftHandTransform);
}
Expand All @@ -66,7 +66,7 @@ public BakedModel applyTransform(ItemDisplayContext cameraTransformType, PoseSta
@Override
public BakedModel applyTransform(ItemDisplayContext cameraTransformType, PoseStack poseStack, boolean applyLeftHandTransform) {
if (ITEMS_WITH_SPECIAL_MODELS.get(location).containsKey(cameraTransformType)) {
return BAKED_MODELS.get(ITEMS_WITH_SPECIAL_MODELS.get(location).get(cameraTransformType));
return BAKED_MODELS.get(ITEMS_WITH_SPECIAL_MODELS.get(location).get(cameraTransformType)).applyTransform(cameraTransformType, poseStack, applyLeftHandTransform);
}
return super.applyTransform(cameraTransformType, poseStack, applyLeftHandTransform);
}
Expand Down
11 changes: 0 additions & 11 deletions src/main/java/ho/artisan/farmaway/common/effect/BluesEffect.java

This file was deleted.

22 changes: 22 additions & 0 deletions src/main/java/ho/artisan/farmaway/common/item/BluesCarrotItem.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package ho.artisan.farmaway.common.item;

import net.minecraft.ChatFormatting;
import net.minecraft.network.chat.Component;
import net.minecraft.world.item.ItemNameBlockItem;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.TooltipFlag;
import net.minecraft.world.level.block.Block;

import java.util.List;

public class BluesCarrotItem extends ItemNameBlockItem {
public BluesCarrotItem(Block block, Properties properties) {
super(block, properties);
}

@Override
public void appendHoverText(ItemStack stack, TooltipContext context, List<Component> tooltipComponents, TooltipFlag tooltipFlag) {
super.appendHoverText(stack, context, tooltipComponents, tooltipFlag);
tooltipComponents.add(Component.translatable(getDescriptionId() + ".tooltip").withStyle(ChatFormatting.DARK_PURPLE));
}
}
14 changes: 14 additions & 0 deletions src/main/java/ho/artisan/farmaway/common/item/EnhancedHoeItem.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,26 @@
import com.google.common.collect.Maps;
import com.mojang.datafixers.util.Pair;
import ho.artisan.farmaway.common.registry.FABlocks;
import net.minecraft.ChatFormatting;
import net.minecraft.core.BlockPos;
import net.minecraft.network.chat.Component;
import net.minecraft.sounds.SoundEvents;
import net.minecraft.sounds.SoundSource;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.HoeItem;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Tier;
import net.minecraft.world.item.TooltipFlag;
import net.minecraft.world.item.context.UseOnContext;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.gameevent.GameEvent;

import java.util.List;
import java.util.Map;
import java.util.function.Consumer;
import java.util.function.Predicate;
Expand Down Expand Up @@ -76,6 +81,15 @@ public InteractionResult useOn(UseOnContext context) {
}
}

@Override
public void appendHoverText(ItemStack stack, TooltipContext context, List<Component> tooltipComponents, TooltipFlag tooltipFlag) {
super.appendHoverText(stack, context, tooltipComponents, tooltipFlag);
tooltipComponents.add(Component.translatable(getDescriptionId() + ".tooltip").withStyle(ChatFormatting.YELLOW));
for (Block block : TILLING_ACTIONS.keySet()) {
tooltipComponents.add(Component.translatable(block.getDescriptionId()).withStyle(ChatFormatting.DARK_GREEN));
}
}

public static Consumer<UseOnContext> successful(BlockState blockState) {
return useOnContext -> {
Level level = useOnContext.getLevel();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@

import ho.artisan.farmaway.common.entity.ExplosionPotatoEntity;
import ho.artisan.farmaway.common.registry.FABlocks;
import net.minecraft.ChatFormatting;
import net.minecraft.core.Direction;
import net.minecraft.core.Position;
import net.minecraft.network.chat.Component;
import net.minecraft.sounds.SoundEvents;
import net.minecraft.sounds.SoundSource;
import net.minecraft.stats.Stats;
Expand All @@ -14,8 +16,11 @@
import net.minecraft.world.item.ItemNameBlockItem;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.ProjectileItem;
import net.minecraft.world.item.TooltipFlag;
import net.minecraft.world.level.Level;

import java.util.List;

public class ExplosionPotatoItem extends ItemNameBlockItem implements ProjectileItem {
public ExplosionPotatoItem(Properties properties) {
super(FABlocks.EXPLOSION_POTATOES.get(), properties);
Expand Down Expand Up @@ -44,4 +49,10 @@ public Projectile asProjectile(Level level, Position position, ItemStack itemSta
potato.setItem(this.getDefaultInstance());
return potato;
}

@Override
public void appendHoverText(ItemStack stack, TooltipContext context, List<Component> tooltipComponents, TooltipFlag tooltipFlag) {
super.appendHoverText(stack, context, tooltipComponents, tooltipFlag);
tooltipComponents.add(Component.translatable(getDescriptionId() + ".tooltip").withStyle(ChatFormatting.YELLOW));
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package ho.artisan.farmaway.common.registry;

import ho.artisan.farmaway.FarmAway;
import ho.artisan.farmaway.common.item.BluesCarrotItem;
import ho.artisan.farmaway.common.item.EnhancedHoeItem;
import ho.artisan.farmaway.common.item.ExplosionPotatoItem;
import ho.artisan.farmaway.common.item.StrongCarrotItem;
Expand All @@ -27,7 +28,7 @@ public class FAItems {
public static final DeferredItem<BlockItem> ANDESITE_FARMLAND = registerBlock(FABlocks.ANDESITE_FARMLAND);
public static final DeferredItem<BlockItem> DIORITE_FARMLAND = registerBlock(FABlocks.DIORITE_FARMLAND);
public static final DeferredItem<ExplosionPotatoItem> EXPLOSION_POTATO = ITEMS.register("explosion_potato", () -> new ExplosionPotatoItem(new Item.Properties().food(new FoodProperties.Builder().nutrition(10).saturationModifier(0).build())));
public static final DeferredItem<ItemNameBlockItem> BLUES_CARROT = ITEMS.register("blues_carrot", () -> new ItemNameBlockItem(FABlocks.BLUES_CARROTS.get(), new Item.Properties().food(new FoodProperties.Builder().alwaysEdible().nutrition(6).saturationModifier(0).effect(() -> new MobEffectInstance(FAMobEffects.BLUES, 2000), 1).build())));
public static final DeferredItem<BluesCarrotItem> BLUES_CARROT = ITEMS.register("blues_carrot", () -> new BluesCarrotItem(FABlocks.BLUES_CARROTS.get(), new Item.Properties().food(new FoodProperties.Builder().alwaysEdible().nutrition(6).saturationModifier(0).effect(() -> new MobEffectInstance(FAMobEffects.BLUES, 2000), 1).build())));
public static final DeferredItem<StrongCarrotItem> STRONG_CARROT = ITEMS.register("strong_carrot", () -> new StrongCarrotItem(FABlocks.STRONG_CARROTS.get(), new Item.Properties().attributes(SwordItem.createAttributes(Tiers.GOLD, 1.0F, 5.68F)).durability(300).food(new FoodProperties.Builder().nutrition(2).saturationModifier(2).build())));

public static DeferredItem<BlockItem> registerBlock(DeferredBlock<? extends Block> block) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ public static void onGatherData(GatherDataEvent event) {
generator.addProvider(event.includeServer(), blockTags);
generator.addProvider(event.includeServer(), new FAItemTagsProvider(output, lookupProvider, blockTags.contentsGetter(), helper));

generator.addProvider(event.includeServer(), new FARecipeProvider(output, lookupProvider));
generator.addProvider(event.includeServer(), new FALootProvider(output, lookupProvider));
}
}
28 changes: 28 additions & 0 deletions src/main/java/ho/artisan/farmaway/datagen/FARecipeProvider.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package ho.artisan.farmaway.datagen;

import ho.artisan.farmaway.common.registry.FAItems;
import net.minecraft.core.HolderLookup;
import net.minecraft.data.PackOutput;
import net.minecraft.data.recipes.RecipeCategory;
import net.minecraft.data.recipes.RecipeOutput;
import net.minecraft.data.recipes.RecipeProvider;
import net.minecraft.data.recipes.ShapelessRecipeBuilder;
import net.minecraft.world.item.Items;

import java.util.concurrent.CompletableFuture;

public class FARecipeProvider extends RecipeProvider {
public FARecipeProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> registries) {
super(output, registries);
}

@Override
protected void buildRecipes(RecipeOutput recipeOutput) {
ShapelessRecipeBuilder.shapeless(RecipeCategory.TOOLS, FAItems.ENHANCED_HOE.get())
.requires(Items.NETHERITE_HOE)
.requires(Items.NETHER_STAR)
.unlockedBy("has_netherite_hoe", has(Items.NETHERITE_HOE))
.unlockedBy("has_nether_star", has(Items.NETHER_STAR))
.save(recipeOutput);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ public FAChineseLanguageProvider(PackOutput output) {
protected void addTranslations() {
add(FarmAway.descriptionId("itemGroup", "main"), "田园巫术");
add(FAItems.ENHANCED_HOE.get(), "强化锄");
add(FAItems.ENHANCED_HOE.get().getDescriptionId() + ".tooltip", "可开垦:");
add(FABlocks.STONE_FARMLAND.get(), "石耕地");
add(FABlocks.NETHERRACK_FARMLAND.get(), "下界岩耕地");
add(FABlocks.END_STONE_FARMLAND.get(), "末地石耕地");
Expand All @@ -31,7 +32,9 @@ protected void addTranslations() {
add(FABlocks.STRONG_CARROTS.get(), "强力胡萝卜");

add(FAItems.EXPLOSION_POTATO.get(), "爆炎土豆");
add(FAItems.EXPLOSION_POTATO.get().getDescriptionId() + ".tooltip", "潜行时:可投掷");
add(FAItems.BLUES_CARROT.get(), "蓝胡萝卜");
add(FAItems.BLUES_CARROT.get().getDescriptionId() + ".tooltip", "食用后:受到伤害可能取消或翻倍");
add(FAItems.STRONG_CARROT.get(), "强力胡萝卜");

add(FAEntities.EXPLOSION_POTATO.get(), "爆炎土豆");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ public FAEnglishLanguageProvider(PackOutput output) {
protected void addTranslations() {
add(FarmAway.descriptionId("itemGroup", "main"), "Farm Away");
add(FAItems.ENHANCED_HOE.get(), "Enhanced Hoe");
add(FAItems.ENHANCED_HOE.get().getDescriptionId() + ".tooltip", "Able to Till:");
add(FABlocks.STONE_FARMLAND.get(), "Stone Farmland");
add(FABlocks.NETHERRACK_FARMLAND.get(), "Netherrack Farmland");
add(FABlocks.END_STONE_FARMLAND.get(), "End Stone Farmland");
Expand All @@ -31,7 +32,9 @@ protected void addTranslations() {
add(FABlocks.STRONG_CARROTS.get(), "Strong Carrots");

add(FAItems.EXPLOSION_POTATO.get(), "Explosion Potato");
add(FAItems.EXPLOSION_POTATO.get().getDescriptionId() + ".tooltip", "When Crouching: Can be thrown");
add(FAItems.BLUES_CARROT.get(), "Blues Carrot");
add(FAItems.BLUES_CARROT.get().getDescriptionId() + ".tooltip", "When Eaten: Damage taken may be canceled or doubled");
add(FAItems.STRONG_CARROT.get(), "Strong Carrot");

add(FAEntities.EXPLOSION_POTATO.get(), "Explosion Potato");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public FAItemModelProvider(PackOutput output, ExistingFileHelper existingFileHel

@Override
protected void registerModels() {
inventory(FAItems.ENHANCED_HOE.get());
inventoryHandheld(FAItems.ENHANCED_HOE.get());
block(FAItems.STONE_FARMLAND.get());
block(FAItems.NETHERRACK_FARMLAND.get());
block(FAItems.END_STONE_FARMLAND.get());
Expand All @@ -44,9 +44,9 @@ private void handheld(Item item, ResourceLocation texture) {
.texture("layer0", texture);
}

private void inventory(Item item) {
private void inventoryHandheld(Item item) {
getBuilder(item.toString() + "_inventory")
.parent(new ModelFile.UncheckedModelFile("item/generated"))
.parent(new ModelFile.UncheckedModelFile("item/handheld"))
.texture("layer0", itemTexture(item) + "_inventory");
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "item/generated",
"parent": "item/handheld",
"textures": {
"layer0": "farm_away:item/enhanced_hoe"
},
Expand Down

0 comments on commit c297116

Please sign in to comment.