From 4f58dc489e8ead7b0a016a310b3ae7fab93698a9 Mon Sep 17 00:00:00 2001 From: Eugene <59817721+SKZGx@users.noreply.github.com> Date: Sat, 15 Jun 2024 01:27:54 +0300 Subject: [PATCH 1/5] working ver of FoodBlockComponents --- .../com/megatrex4/ukrainian_dlight/block/FoodBlocks.java | 5 +++-- .../ukrainian_dlight/item/FoodBlockComponents.java | 9 +++++++++ .../ukrainian_dlight/item/ModFoodComponents.java | 3 --- .../megatrex4/ukrainian_dlight/item/ToolTipHelper.java | 9 +++++---- 4 files changed, 17 insertions(+), 9 deletions(-) create mode 100644 src/main/java/com/megatrex4/ukrainian_dlight/item/FoodBlockComponents.java diff --git a/src/main/java/com/megatrex4/ukrainian_dlight/block/FoodBlocks.java b/src/main/java/com/megatrex4/ukrainian_dlight/block/FoodBlocks.java index 71655ab..0b3fea8 100644 --- a/src/main/java/com/megatrex4/ukrainian_dlight/block/FoodBlocks.java +++ b/src/main/java/com/megatrex4/ukrainian_dlight/block/FoodBlocks.java @@ -1,6 +1,7 @@ package com.megatrex4.ukrainian_dlight.block; import com.megatrex4.ukrainian_dlight.UkrainianDelight; +import com.megatrex4.ukrainian_dlight.item.FoodBlockComponents; import com.megatrex4.ukrainian_dlight.item.FoodBlockItem; import com.megatrex4.ukrainian_dlight.item.ModFoodComponents; import net.minecraft.block.Block; @@ -16,8 +17,8 @@ public class FoodBlocks { // New Jar Blocks public static final Block JAR = registerBlock("jar", new JarBlock(), null); - public static final Block APPLE_JAM = registerBlock("apple_jam", new JarBlock(), ModFoodComponents.APPLE_JAM); - public static final Block CANNED_TOMATOES = registerBlock("canned_tomatoes", new JarBlock(), ModFoodComponents.CANNED_TOMATOES); + public static final Block APPLE_JAM = registerBlock("apple_jam", new JarBlock(), FoodBlockComponents.APPLE_JAM); + public static final Block CANNED_TOMATOES = registerBlock("canned_tomatoes", new JarBlock(), FoodBlockComponents.CANNED_TOMATOES); private static Block registerBlock(String name, Block block, FoodComponent foodComponent){ registerBlockItem(name, block, foodComponent); diff --git a/src/main/java/com/megatrex4/ukrainian_dlight/item/FoodBlockComponents.java b/src/main/java/com/megatrex4/ukrainian_dlight/item/FoodBlockComponents.java new file mode 100644 index 0000000..9e6d01c --- /dev/null +++ b/src/main/java/com/megatrex4/ukrainian_dlight/item/FoodBlockComponents.java @@ -0,0 +1,9 @@ +package com.megatrex4.ukrainian_dlight.item; + +import net.minecraft.item.FoodComponent; + +public class FoodBlockComponents { + public static final FoodComponent APPLE_JAM = new FoodComponent.Builder().hunger(4).saturationModifier(0.3f).build(); + public static final FoodComponent CANNED_TOMATOES = new FoodComponent.Builder().hunger(6).saturationModifier(0.6f).build(); + +} diff --git a/src/main/java/com/megatrex4/ukrainian_dlight/item/ModFoodComponents.java b/src/main/java/com/megatrex4/ukrainian_dlight/item/ModFoodComponents.java index 86f9adc..7937931 100644 --- a/src/main/java/com/megatrex4/ukrainian_dlight/item/ModFoodComponents.java +++ b/src/main/java/com/megatrex4/ukrainian_dlight/item/ModFoodComponents.java @@ -11,9 +11,6 @@ public class ModFoodComponents { public static final StatusEffect COMFORT = EffectsRegistry.COMFORT.get(); public static final StatusEffect NOURISHMENT = EffectsRegistry.NOURISHMENT.get(); - public static final FoodComponent APPLE_JAM = new FoodComponent.Builder().hunger(4).saturationModifier(0.3f).build(); - public static final FoodComponent CANNED_TOMATOES = new FoodComponent.Builder().hunger(6).saturationModifier(0.6f).build(); - // MEALS public static final FoodComponent VARENYK = new FoodComponent.Builder() .hunger(6) diff --git a/src/main/java/com/megatrex4/ukrainian_dlight/item/ToolTipHelper.java b/src/main/java/com/megatrex4/ukrainian_dlight/item/ToolTipHelper.java index 55935aa..85807df 100644 --- a/src/main/java/com/megatrex4/ukrainian_dlight/item/ToolTipHelper.java +++ b/src/main/java/com/megatrex4/ukrainian_dlight/item/ToolTipHelper.java @@ -2,7 +2,6 @@ import com.megatrex4.ukrainian_dlight.UkrainianDelight; import com.megatrex4.ukrainian_dlight.util.StatusEffectUtil; -import com.mojang.datafixers.util.Pair; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.item.TooltipContext; @@ -28,18 +27,20 @@ public ToolTipHelper(Settings settings) { public void appendTooltip(ItemStack stack, @Nullable World world, List tooltip, TooltipContext context) { super.appendTooltip(stack, world, tooltip, context); - FoodComponent foodComponent = this.getFoodComponent(); + FoodComponent foodComponent = stack.getItem().getFoodComponent(); if (foodComponent != null && !foodComponent.getStatusEffects().isEmpty()) { + // Use Pair from net.minecraft.util addFoodEffectTooltip(stack, tooltip, foodComponent.getStatusEffects()); } } - public static void addFoodEffectTooltip(ItemStack itemStack, List tooltip, List> effects) { + // Adjusted to accept List> + public static void addFoodEffectTooltip(ItemStack itemStack, List tooltip, List> effects) { if (effects.isEmpty()) { tooltip.add(Text.translatable("tooltip.ukrainian_delight.no_effects").formatted(Formatting.GRAY)); } else { - for (Pair pair : effects) { + for (com.mojang.datafixers.util.Pair pair : effects) { StatusEffectInstance effect = pair.getFirst(); String name = effect.getEffectType().getTranslationKey(); int duration = effect.getDuration() / 20; // Convert ticks to seconds From 2237120f1699cd8c50995ef9f3d8895a6a650598 Mon Sep 17 00:00:00 2001 From: Eugene <59817721+SKZGx@users.noreply.github.com> Date: Sat, 15 Jun 2024 02:53:50 +0300 Subject: [PATCH 2/5] remade ToolTipHelper and added FoodBlocksItem tooltips --- .../ukrainian_dlight/block/FoodBlocks.java | 4 +- .../item/FoodBlockComponents.java | 5 ++- .../ukrainian_dlight/item/FoodBlockItem.java | 45 ++++++++++++++++++- .../ukrainian_dlight/item/ToolTipHelper.java | 37 ++++++--------- .../assets/ukrainian_delight/lang/en_us.json | 4 +- .../assets/ukrainian_delight/lang/uk_ua.json | 17 +------ 6 files changed, 66 insertions(+), 46 deletions(-) diff --git a/src/main/java/com/megatrex4/ukrainian_dlight/block/FoodBlocks.java b/src/main/java/com/megatrex4/ukrainian_dlight/block/FoodBlocks.java index 0b3fea8..4916302 100644 --- a/src/main/java/com/megatrex4/ukrainian_dlight/block/FoodBlocks.java +++ b/src/main/java/com/megatrex4/ukrainian_dlight/block/FoodBlocks.java @@ -2,8 +2,7 @@ import com.megatrex4.ukrainian_dlight.UkrainianDelight; import com.megatrex4.ukrainian_dlight.item.FoodBlockComponents; -import com.megatrex4.ukrainian_dlight.item.FoodBlockItem; -import com.megatrex4.ukrainian_dlight.item.ModFoodComponents; +import com.megatrex4.ukrainian_dlight.item.FoodBlockItem; // Import the FoodBlockItem class import net.minecraft.block.Block; import net.minecraft.item.BlockItem; import net.minecraft.item.FoodComponent; @@ -14,7 +13,6 @@ public class FoodBlocks { - // New Jar Blocks public static final Block JAR = registerBlock("jar", new JarBlock(), null); public static final Block APPLE_JAM = registerBlock("apple_jam", new JarBlock(), FoodBlockComponents.APPLE_JAM); diff --git a/src/main/java/com/megatrex4/ukrainian_dlight/item/FoodBlockComponents.java b/src/main/java/com/megatrex4/ukrainian_dlight/item/FoodBlockComponents.java index 9e6d01c..5b90c58 100644 --- a/src/main/java/com/megatrex4/ukrainian_dlight/item/FoodBlockComponents.java +++ b/src/main/java/com/megatrex4/ukrainian_dlight/item/FoodBlockComponents.java @@ -1,9 +1,12 @@ package com.megatrex4.ukrainian_dlight.item; +import net.minecraft.entity.effect.StatusEffectInstance; +import net.minecraft.entity.effect.StatusEffects; import net.minecraft.item.FoodComponent; public class FoodBlockComponents { public static final FoodComponent APPLE_JAM = new FoodComponent.Builder().hunger(4).saturationModifier(0.3f).build(); - public static final FoodComponent CANNED_TOMATOES = new FoodComponent.Builder().hunger(6).saturationModifier(0.6f).build(); + public static final FoodComponent CANNED_TOMATOES = new FoodComponent.Builder().hunger(6).saturationModifier(0.6f) + .statusEffect(new StatusEffectInstance(StatusEffects.REGENERATION, 3*20, 3), 1.0f).build(); } diff --git a/src/main/java/com/megatrex4/ukrainian_dlight/item/FoodBlockItem.java b/src/main/java/com/megatrex4/ukrainian_dlight/item/FoodBlockItem.java index f169bbd..3aa2021 100644 --- a/src/main/java/com/megatrex4/ukrainian_dlight/item/FoodBlockItem.java +++ b/src/main/java/com/megatrex4/ukrainian_dlight/item/FoodBlockItem.java @@ -1,12 +1,55 @@ package com.megatrex4.ukrainian_dlight.item; +import com.megatrex4.ukrainian_dlight.util.StatusEffectUtil; +import com.mojang.datafixers.util.Pair; +import net.minecraft.block.Block; +import net.minecraft.client.item.TooltipContext; +import net.minecraft.entity.effect.StatusEffectInstance; import net.minecraft.item.BlockItem; import net.minecraft.item.FoodComponent; import net.minecraft.item.Item; -import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; +import net.minecraft.text.Text; +import net.minecraft.util.Formatting; +import net.minecraft.world.World; + +import java.time.Duration; +import java.util.List; public class FoodBlockItem extends BlockItem { + private final FoodComponent foodComponent; + public FoodBlockItem(Block block, FoodComponent foodComponent) { super(block, new Item.Settings().food(foodComponent)); + this.foodComponent = foodComponent; } + + @Override + public void appendTooltip(ItemStack stack, World world, List tooltip, TooltipContext context) { + super.appendTooltip(stack, world, tooltip, context); + + // Add food component tooltip + if (foodComponent != null) { + // Check for status effects and add them to the tooltip + if (!foodComponent.getStatusEffects().isEmpty()) { + for (Pair effect : foodComponent.getStatusEffects()) { + StatusEffectInstance instance = effect.getFirst(); + String effectName = instance.getEffectType().getName().getString(); + int duration = effect.getFirst().getDuration() / 20; + int amplifier = effect.getFirst().getAmplifier() + 1; + String amplifierString = StatusEffectUtil.formatAmplifier(amplifier); + String durationString = formatDuration(duration); + tooltip.add(Text.translatable(effectName).append(Text.of(amplifierString)).append(Text.of(" (" + durationString + ") ")).formatted(Formatting.BLUE)); + } + } + } + } + + private static String formatDuration(int duration) { + int minutes = duration / 60; + int seconds = duration % 60; + + return String.format("%d:%02d", minutes, seconds); + } + } diff --git a/src/main/java/com/megatrex4/ukrainian_dlight/item/ToolTipHelper.java b/src/main/java/com/megatrex4/ukrainian_dlight/item/ToolTipHelper.java index 85807df..2f40709 100644 --- a/src/main/java/com/megatrex4/ukrainian_dlight/item/ToolTipHelper.java +++ b/src/main/java/com/megatrex4/ukrainian_dlight/item/ToolTipHelper.java @@ -2,6 +2,7 @@ import com.megatrex4.ukrainian_dlight.UkrainianDelight; import com.megatrex4.ukrainian_dlight.util.StatusEffectUtil; +import com.mojang.datafixers.util.Pair; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.item.TooltipContext; @@ -29,29 +30,19 @@ public void appendTooltip(ItemStack stack, @Nullable World world, List too FoodComponent foodComponent = stack.getItem().getFoodComponent(); - if (foodComponent != null && !foodComponent.getStatusEffects().isEmpty()) { - // Use Pair from net.minecraft.util - addFoodEffectTooltip(stack, tooltip, foodComponent.getStatusEffects()); - } - } - - // Adjusted to accept List> - public static void addFoodEffectTooltip(ItemStack itemStack, List tooltip, List> effects) { - if (effects.isEmpty()) { - tooltip.add(Text.translatable("tooltip.ukrainian_delight.no_effects").formatted(Formatting.GRAY)); - } else { - for (com.mojang.datafixers.util.Pair pair : effects) { - StatusEffectInstance effect = pair.getFirst(); - String name = effect.getEffectType().getTranslationKey(); - int duration = effect.getDuration() / 20; // Convert ticks to seconds - int amplifier = effect.getAmplifier() + 1; - String amplifierString = StatusEffectUtil.formatAmplifier(amplifier); - String durationString = formatDuration(duration); - - Text tooltipText = Text.translatable(name).formatted(Formatting.BLUE).append(Text.of(amplifierString)) - .append(Text.of(" (" + durationString + ") ")); - - tooltip.add(tooltipText); + // Add food component tooltip + if (foodComponent != null) { + // Check for status effects and add them to the tooltip + if (!foodComponent.getStatusEffects().isEmpty()) { + for (Pair effect : foodComponent.getStatusEffects()) { + StatusEffectInstance instance = effect.getFirst(); + String effectName = instance.getEffectType().getTranslationKey(); + int duration = instance.getDuration() / 20; + int amplifier = instance.getAmplifier() + 1; + String amplifierString = StatusEffectUtil.formatAmplifier(amplifier); + String durationString = formatDuration(duration); + tooltip.add(Text.translatable(effectName).append(Text.of(amplifierString)).append(Text.of(" (" + durationString + ") ")).formatted(Formatting.BLUE)); + } } } } diff --git a/src/main/resources/assets/ukrainian_delight/lang/en_us.json b/src/main/resources/assets/ukrainian_delight/lang/en_us.json index adca2d6..b5c4ad1 100644 --- a/src/main/resources/assets/ukrainian_delight/lang/en_us.json +++ b/src/main/resources/assets/ukrainian_delight/lang/en_us.json @@ -21,8 +21,8 @@ "_comment": "jars", "block.ukrainian_delight.jar": "Jar", - - + "block.ukrainian_delight.apple_jam": "Apple Jam", + "block.ukrainian_delight.canned_tomatoes": "Canned Tomatoes", "_comment": "blocks", "block.ukrainian_delight.salt_block": "Salt Block", diff --git a/src/main/resources/assets/ukrainian_delight/lang/uk_ua.json b/src/main/resources/assets/ukrainian_delight/lang/uk_ua.json index cf7f1e3..a01137e 100644 --- a/src/main/resources/assets/ukrainian_delight/lang/uk_ua.json +++ b/src/main/resources/assets/ukrainian_delight/lang/uk_ua.json @@ -29,21 +29,6 @@ "ukrainian_delight.advancement.borscht": "Де знайти червону воду!", "ukrainian_delight.advancement.borscht.desc": "Зваріть борщ", "ukrainian_delight.advancement.lean_borscht": "Те саме тільки з грибами", - "ukrainian_delight.advancement.lean_borscht.desc": "Зваріть пісний борщ", - - "_comment6": "tooltip", - "tooltip.ukrainian_delight.no_effects": "Немає ефектів", - - "amplifier.none": "", - "amplifier.1": "", - "amplifier.2": " II", - "amplifier.3": " III", - "amplifier.4": " IV", - "amplifier.5": " V", - "amplifier.6": " VI", - "amplifier.7": " VII", - "amplifier.8": " VIII", - "amplifier.9": " IX", - "amplifier.10": " X" + "ukrainian_delight.advancement.lean_borscht.desc": "Зваріть пісний борщ" } \ No newline at end of file From f82050cdec38f4c009cd77f32629b1b04f3826a2 Mon Sep 17 00:00:00 2001 From: Eugene <59817721+SKZGx@users.noreply.github.com> Date: Sun, 16 Jun 2024 03:31:30 +0300 Subject: [PATCH 3/5] damage to player by jumping on jars --- .../ukrainian_dlight/UkrainianDelight.java | 8 +++ .../ukrainian_dlight/block/JarBlock.java | 63 ++++++++++++++++-- .../blockstates/apple_jam.json | 28 ++++++-- .../blockstates/canned_tomatoes.json | 28 ++++++-- .../ukrainian_delight/blockstates/jar.json | 28 ++++++-- .../assets/ukrainian_delight/lang/en_us.json | 3 +- .../assets/ukrainian_delight/lang/uk_ua.json | 5 +- .../textures/block/jars/canned_tomatoes.png | Bin 1143 -> 2841 bytes .../textures/block/jars/jar.png | Bin 1213 -> 1329 bytes .../ukrainian_delight/textures/item/jar.png | Bin 296 -> 1777 bytes .../damage_type/glass_damage.json | 5 ++ 11 files changed, 148 insertions(+), 20 deletions(-) create mode 100644 src/main/resources/data/ukrainian_delight/damage_type/glass_damage.json diff --git a/src/main/java/com/megatrex4/ukrainian_dlight/UkrainianDelight.java b/src/main/java/com/megatrex4/ukrainian_dlight/UkrainianDelight.java index 1d340c8..78e6e5b 100644 --- a/src/main/java/com/megatrex4/ukrainian_dlight/UkrainianDelight.java +++ b/src/main/java/com/megatrex4/ukrainian_dlight/UkrainianDelight.java @@ -9,6 +9,11 @@ import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap; import net.minecraft.client.render.RenderLayer; +import net.minecraft.entity.damage.DamageType; +import net.minecraft.registry.Registry; +import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.util.Identifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -16,9 +21,12 @@ public class UkrainianDelight implements ModInitializer { public static final String MOD_ID = "ukrainian_delight"; public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID); + public static final RegistryKey GLASS_DAMAGE = RegistryKey.of(RegistryKeys.DAMAGE_TYPE, new Identifier("ukrainian_delight", "glass_damage")); @Override public void onInitialize() { + RegistryKey GLASS_DAMAGE; + FoodBlocks.registerFoodBlocks(); ModBlock.registerModBlocks(); ModItems.registerModItems(); diff --git a/src/main/java/com/megatrex4/ukrainian_dlight/block/JarBlock.java b/src/main/java/com/megatrex4/ukrainian_dlight/block/JarBlock.java index 55d797c..6ebd8c5 100644 --- a/src/main/java/com/megatrex4/ukrainian_dlight/block/JarBlock.java +++ b/src/main/java/com/megatrex4/ukrainian_dlight/block/JarBlock.java @@ -5,17 +5,28 @@ import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.block.ShapeContext; +import net.minecraft.entity.Entity; +import net.minecraft.entity.damage.DamageSource; +import net.minecraft.entity.damage.DamageType; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemPlacementContext; import net.minecraft.item.ItemStack; +import net.minecraft.particle.BlockStateParticleEffect; +import net.minecraft.particle.ParticleTypes; +import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.RegistryKeys; import net.minecraft.sound.BlockSoundGroup; import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvents; import net.minecraft.state.StateManager; +import net.minecraft.state.property.DirectionProperty; import net.minecraft.state.property.IntProperty; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; +import net.minecraft.util.Identifier; +import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.BlockView; import net.minecraft.world.World; @@ -23,11 +34,16 @@ import java.util.HashMap; import java.util.Map; +import static com.megatrex4.ukrainian_dlight.UkrainianDelight.GLASS_DAMAGE; + public class JarBlock extends Block { - public static final IntProperty JARS = IntProperty.of("jars", 1, 4); // Adjusted range to 1-4 for handling all jars + public static final IntProperty JARS = IntProperty.of("jars", 1, 4); + public static final DirectionProperty FACING = DirectionProperty.of("facing", Direction.NORTH, Direction.SOUTH, Direction.WEST, Direction.EAST); private static final Map SHAPES = new HashMap<>(); private static final ThreadLocal isRemovingJar = ThreadLocal.withInitial(() -> false); + + static { SHAPES.put(1, Block.createCuboidShape(6, 0, 6, 10, 8, 10)); SHAPES.put(2, Block.createCuboidShape(1, 0, 3, 14, 8, 12)); @@ -37,12 +53,12 @@ public class JarBlock extends Block { public JarBlock() { super(FabricBlockSettings.copyOf(Blocks.GLASS).strength(0.2F).nonOpaque().sounds(BlockSoundGroup.GLASS)); - this.setDefaultState(this.stateManager.getDefaultState().with(JARS, 1)); // Start with 1 jar + this.setDefaultState(this.stateManager.getDefaultState().with(JARS, 1).with(FACING, Direction.NORTH)); // Start with 1 jar facing north } @Override protected void appendProperties(StateManager.Builder builder) { - builder.add(JARS); + builder.add(JARS, FACING); } @Override @@ -52,12 +68,12 @@ public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos @Override public BlockState getPlacementState(ItemPlacementContext ctx) { - // Check if the player is sneaking (crouching) - return ctx.getPlayer().isSneaking() ? this.getDefaultState().with(JARS, 1) : null; + Direction facing = ctx.getHorizontalPlayerFacing().getOpposite(); + return ctx.getPlayer().isSneaking() ? this.getDefaultState().with(JARS, 1).with(FACING, facing) : null; // Set the facing direction based on player placement } @Override - public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, net.minecraft.util.hit.BlockHitResult hit) { + public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { int currentJars = state.get(JARS); ItemStack heldItem = player.getStackInHand(hand); @@ -104,4 +120,39 @@ private void dropJarItem(World world, BlockPos pos, int count) { Block.dropStack(world, pos, jarItemStack); } } + + @Override + public void onLandedUpon(World world, BlockState state, BlockPos pos, Entity entity, float fallDistance) { + this.tryBreakJar(world, state, pos, entity, 0.3); // 30% chance + super.onLandedUpon(world, state, pos, entity, fallDistance); + + } + + private void tryBreakJar(World world, BlockState state, BlockPos pos, Entity entity, double breakChance) { + if (this.breaksJar(world, entity)) { + if (!world.isClient && world.random.nextDouble() < breakChance) { + this.breakJar(world, pos, state); + entity.damage(world.getDamageSources().create(GLASS_DAMAGE), 2.0F); + } + } + } + + + private void breakJar(World world, BlockPos pos, BlockState state) { + world.playSound(null, pos, SoundEvents.BLOCK_GLASS_BREAK, SoundCategory.BLOCKS, 0.7F, 0.9F + world.random.nextFloat() * 0.2F); + int currentJars = state.get(JARS); + if (currentJars <= 1) { + isRemovingJar.set(true); // Set flag to avoid dropping items + world.breakBlock(pos, false); + isRemovingJar.set(false); // Reset flag after breaking + } else { + world.setBlockState(pos, state.with(JARS, currentJars - 1), 2); + world.syncWorldEvent(2001, pos, Block.getRawIdFromState(state)); + world.addParticle(new BlockStateParticleEffect(ParticleTypes.BLOCK, Blocks.GLASS.getDefaultState()), pos.getX() + 0.5, pos.getY() + 1.0, pos.getZ() + 0.5, 0.0, 0.0, 0.0); // Glass break particles + } + } + + private boolean breaksJar(World world, Entity entity) { + return entity instanceof PlayerEntity; + } } diff --git a/src/main/resources/assets/ukrainian_delight/blockstates/apple_jam.json b/src/main/resources/assets/ukrainian_delight/blockstates/apple_jam.json index 4a2280b..571cfe0 100644 --- a/src/main/resources/assets/ukrainian_delight/blockstates/apple_jam.json +++ b/src/main/resources/assets/ukrainian_delight/blockstates/apple_jam.json @@ -1,8 +1,28 @@ { "variants": { - "jars=1": { "model": "ukrainian_delight:block/jars/one_jar_apple_jam" }, - "jars=2": { "model": "ukrainian_delight:block/jars/two_jar_apple_jam" }, - "jars=3": { "model": "ukrainian_delight:block/jars/three_jar_apple_jam" }, - "jars=4": { "model": "ukrainian_delight:block/jars/four_jar_apple_jam" } + "jars=1": [ + { "model": "ukrainian_delight:block/jars/one_jar_apple_jam" }, + { "model": "ukrainian_delight:block/jars/one_jar_apple_jam", "y": 90 }, + { "model": "ukrainian_delight:block/jars/one_jar_apple_jam", "y": 180 }, + { "model": "ukrainian_delight:block/jars/one_jar_apple_jam", "y": 270 } + ], + "jars=2": [ + { "model": "ukrainian_delight:block/jars/two_jar_apple_jam" }, + { "model": "ukrainian_delight:block/jars/two_jar_apple_jam", "y": 90 }, + { "model": "ukrainian_delight:block/jars/two_jar_apple_jam", "y": 180 }, + { "model": "ukrainian_delight:block/jars/two_jar_apple_jam", "y": 270 } + ], + "jars=3": [ + { "model": "ukrainian_delight:block/jars/three_jar_apple_jam" }, + { "model": "ukrainian_delight:block/jars/three_jar_apple_jam", "y": 90 }, + { "model": "ukrainian_delight:block/jars/three_jar_apple_jam", "y": 180 }, + { "model": "ukrainian_delight:block/jars/three_jar_apple_jam", "y": 270 } + ], + "jars=4": [ + { "model": "ukrainian_delight:block/jars/four_jar_apple_jam" }, + { "model": "ukrainian_delight:block/jars/four_jar_apple_jam", "y": 90 }, + { "model": "ukrainian_delight:block/jars/four_jar_apple_jam", "y": 180 }, + { "model": "ukrainian_delight:block/jars/four_jar_apple_jam", "y": 270 } + ] } } diff --git a/src/main/resources/assets/ukrainian_delight/blockstates/canned_tomatoes.json b/src/main/resources/assets/ukrainian_delight/blockstates/canned_tomatoes.json index b552396..e29963e 100644 --- a/src/main/resources/assets/ukrainian_delight/blockstates/canned_tomatoes.json +++ b/src/main/resources/assets/ukrainian_delight/blockstates/canned_tomatoes.json @@ -1,8 +1,28 @@ { "variants": { - "jars=1": { "model": "ukrainian_delight:block/jars/one_jar_canned_tomatoes" }, - "jars=2": { "model": "ukrainian_delight:block/jars/two_jar_canned_tomatoes" }, - "jars=3": { "model": "ukrainian_delight:block/jars/three_jar_canned_tomatoes" }, - "jars=4": { "model": "ukrainian_delight:block/jars/four_jar_canned_tomatoes" } + "jars=1": [ + { "model": "ukrainian_delight:block/jars/one_jar_canned_tomatoes" }, + { "model": "ukrainian_delight:block/jars/one_jar_canned_tomatoes", "y": 90 }, + { "model": "ukrainian_delight:block/jars/one_jar_canned_tomatoes", "y": 180 }, + { "model": "ukrainian_delight:block/jars/one_jar_canned_tomatoes", "y": 270 } + ], + "jars=2": [ + { "model": "ukrainian_delight:block/jars/two_jar_canned_tomatoes" }, + { "model": "ukrainian_delight:block/jars/two_jar_canned_tomatoes", "y": 90 }, + { "model": "ukrainian_delight:block/jars/two_jar_canned_tomatoes", "y": 180 }, + { "model": "ukrainian_delight:block/jars/two_jar_canned_tomatoes", "y": 270 } + ], + "jars=3": [ + { "model": "ukrainian_delight:block/jars/three_jar_canned_tomatoes" }, + { "model": "ukrainian_delight:block/jars/three_jar_canned_tomatoes", "y": 90 }, + { "model": "ukrainian_delight:block/jars/three_jar_canned_tomatoes", "y": 180 }, + { "model": "ukrainian_delight:block/jars/three_jar_canned_tomatoes", "y": 270 } + ], + "jars=4": [ + { "model": "ukrainian_delight:block/jars/four_jar_canned_tomatoes" }, + { "model": "ukrainian_delight:block/jars/four_jar_canned_tomatoes", "y": 90 }, + { "model": "ukrainian_delight:block/jars/four_jar_canned_tomatoes", "y": 180 }, + { "model": "ukrainian_delight:block/jars/four_jar_canned_tomatoes", "y": 270 } + ] } } diff --git a/src/main/resources/assets/ukrainian_delight/blockstates/jar.json b/src/main/resources/assets/ukrainian_delight/blockstates/jar.json index 502e5f4..a920b63 100644 --- a/src/main/resources/assets/ukrainian_delight/blockstates/jar.json +++ b/src/main/resources/assets/ukrainian_delight/blockstates/jar.json @@ -1,8 +1,28 @@ { "variants": { - "jars=1": { "model": "ukrainian_delight:block/jars/one_jar" }, - "jars=2": { "model": "ukrainian_delight:block/jars/two_jar" }, - "jars=3": { "model": "ukrainian_delight:block/jars/three_jar" }, - "jars=4": { "model": "ukrainian_delight:block/jars/four_jar" } + "jars=1": [ + { "model": "ukrainian_delight:block/jars/one_jar" }, + { "model": "ukrainian_delight:block/jars/one_jar", "y": 90 }, + { "model": "ukrainian_delight:block/jars/one_jar", "y": 180 }, + { "model": "ukrainian_delight:block/jars/one_jar", "y": 270 } + ], + "jars=2": [ + { "model": "ukrainian_delight:block/jars/two_jar" }, + { "model": "ukrainian_delight:block/jars/two_jar", "y": 90 }, + { "model": "ukrainian_delight:block/jars/two_jar", "y": 180 }, + { "model": "ukrainian_delight:block/jars/two_jar", "y": 270 } + ], + "jars=3": [ + { "model": "ukrainian_delight:block/jars/three_jar" }, + { "model": "ukrainian_delight:block/jars/three_jar", "y": 90 }, + { "model": "ukrainian_delight:block/jars/three_jar", "y": 180 }, + { "model": "ukrainian_delight:block/jars/three_jar", "y": 270 } + ], + "jars=4": [ + { "model": "ukrainian_delight:block/jars/four_jar" }, + { "model": "ukrainian_delight:block/jars/four_jar", "y": 90 }, + { "model": "ukrainian_delight:block/jars/four_jar", "y": 180 }, + { "model": "ukrainian_delight:block/jars/four_jar", "y": 270 } + ] } } diff --git a/src/main/resources/assets/ukrainian_delight/lang/en_us.json b/src/main/resources/assets/ukrainian_delight/lang/en_us.json index b5c4ad1..1ece081 100644 --- a/src/main/resources/assets/ukrainian_delight/lang/en_us.json +++ b/src/main/resources/assets/ukrainian_delight/lang/en_us.json @@ -36,7 +36,8 @@ "ukrainian_delight.advancement.lean_borscht": "The same, but with mushrooms!", "ukrainian_delight.advancement.lean_borscht.desc": "Cook lean borscht", - "_comment": "tooltip", + "_comment": "misc", + "death.attack.glass_damage": "%s was not very careful with the glass", "tooltip.ukrainian_delight.no_effects": "No effects", "amplifier.none": "", diff --git a/src/main/resources/assets/ukrainian_delight/lang/uk_ua.json b/src/main/resources/assets/ukrainian_delight/lang/uk_ua.json index a01137e..167a31a 100644 --- a/src/main/resources/assets/ukrainian_delight/lang/uk_ua.json +++ b/src/main/resources/assets/ukrainian_delight/lang/uk_ua.json @@ -29,6 +29,9 @@ "ukrainian_delight.advancement.borscht": "Де знайти червону воду!", "ukrainian_delight.advancement.borscht.desc": "Зваріть борщ", "ukrainian_delight.advancement.lean_borscht": "Те саме тільки з грибами", - "ukrainian_delight.advancement.lean_borscht.desc": "Зваріть пісний борщ" + "ukrainian_delight.advancement.lean_borscht.desc": "Зваріть пісний борщ", + + "_comment6": "misc", + "death.attack.glass_damage": "%s був не дуже обережний зі склом" } \ No newline at end of file diff --git a/src/main/resources/assets/ukrainian_delight/textures/block/jars/canned_tomatoes.png b/src/main/resources/assets/ukrainian_delight/textures/block/jars/canned_tomatoes.png index d3d4cbd3d56015ca2fe654e27b636ee715e0868b..86179840b3051a370f0a3ae6b29341afc684a40f 100644 GIT binary patch literal 2841 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 delta 1193 zcmV;a1Xla83cU%CB!7fSL_t(oh3%KUZyZG!ho5(L_V)JdvmM*{R1!!ipaW7+Af=?B zLKIYpf&vNXsAz*|$bUgaO(Z(1fN&BiSWZw#f>7clj=^z!zVm(U?Z>uJ%7znKn9nhC=Lc(fI(Fe z6#@hW0-z8@q|duTX!UZ=FP;_ve(P*0o^~_Y)SJnsms?97>uR#$`~Lj`I)9oTU|o=lBUe8envnt9liWMNp`iYiHC=)s@N(#A6K!??;k4Z)54^#R z!O%Uxf(kpD(`KE-J7DeC>qMoJmuqJU=>aw%Gb5As>Mtwa0i`fRoqq?`*KTp_&DXfr zd8lO*z#zZ_%c6y#GpOoB<1>w=^JRf}hsg`WWR(%I+0*WGMVQztTw@p^$ zY}KA(gMWbczxqUH%N1JP4tbHYJikaOEOGYeDRx^8k~HPjQ)j0dT}?I=MIL^?J~Ht6 zdmqu(j66`BDl?`;TXT#N`lpX#5Ud1)YN!}77%|8orA36W5X1=AZm&)>Fuq&%hp`w4 zqllNH#i_?Dz?IG4wNi?CefiA3+=Ha1ab;#d1b=`NM@|g;rb{-wnO5aaFCAy0I_Kpw zDQG5>V`{v`VR>X=Pm`hOv_jJ*MOD3AqB$E|n_dH991Z){x-R&tTq8$a=H(&+&YU>? z;)CZ>vT&nUELq+)J-M7?=!B*qg zE8I;x#3u4`H`Z^XD4jH=ou)8|o5R&ATRU|!b^VW85z?%{sA9LbZ+V5Yw8hK;j4o8F z>=p%iQIO?1B0?YnsvN0SQ7d%P3QtdGsf; z;FLzIg9eZ*s5%6}BAB*Ym@4=z-#2&bxL|srf5tWHyQotF5k!Pa6!nb=%taA1)e19} zh?z=EHI6y7G>6@+O)j(J`5xNR)UVxfZo9S1(N@A@T!F#FB0|wjcGYsf?l|X~H`zcP1KbMv$f% zh4zbH0F;bn-{SIb+Qsv4Oso@M{vy0KajpaXFZeIp{|5d6P&-f+rrK|#00000NkvXX Hu0mjfZ2d)C diff --git a/src/main/resources/assets/ukrainian_delight/textures/item/jar.png b/src/main/resources/assets/ukrainian_delight/textures/item/jar.png index 04a851db1b262ac3723fe734a6b2928bd7312ca4..5067820530ae5cc667cfd80a23acc18bb56aaa88 100644 GIT binary patch literal 1777 zcmbVNTWB0r7#=H)8VyAH(5Og<2}-q{%g*d2JMA_}vum@`O+&gN5eM6|GiP_l?97?W zIh)<&LE4B9LJ_fGAr>uCd{IPHs4;2{2)=GW&?j$w5erJqi&Egr>9`-51xB_;Js(FiD0vj(PgMEx^%G1kjB*XZI9W+;ug(aAxgY0 z{Nb3U?N8@Zx|D|V^O#E7IS2K7zDfepj&B#Rn|Qp~m- zIMF#^FkELhYZRy3tkTw+8 z6tQTja5W3jxLCk3Rn!s%jAANEL<@=T`7|-BL6LXQTmSR?G2ezRgDQ8-6ZD?ocIcgi zcACR+Jl~mBY`%3NbYun>Jtdeyg=0(TEZcV+fi`WejDa+)fPYth8%9Zy)sT-zOAxKw z-Ygl!%Rx(O`yt=#Vry?p`|84>CkE578^cG~&#?idNe=up!sLB zIehnH121h}&HoJ3-`21FWWUoqxBJ~2C%!Lp>wLWbO7zF(p&QMaZ!@PNN9nUG4-E`{ zH2(&5&NIKPo7~gv?3Eqw_4L2-sGZx^prw85kHIdAc};So9_*ED$g_B=P_I%m4q+CLcMlDx7<| zjgkJGhbQm$^YGNf2sHZNmjHox^36~GMtXaE*!Al{kP|M&^PzU#fw@oFp9ZvBqxWQ`Nzs9}5qtmIx)`tfO%nT1c zv1+jiS6J>gC8JsLknVxg2Y}$i*Td;-K+qPye*XfA4;8mrCoPs%XJClj9dKnI%eQqv Q?=pD0viZ5Jb4q9e0AJC2TL1t6 diff --git a/src/main/resources/data/ukrainian_delight/damage_type/glass_damage.json b/src/main/resources/data/ukrainian_delight/damage_type/glass_damage.json new file mode 100644 index 0000000..fd428ad --- /dev/null +++ b/src/main/resources/data/ukrainian_delight/damage_type/glass_damage.json @@ -0,0 +1,5 @@ +{ + "exhaustion": 0.1, + "message_id": "glass_damage", + "scaling": "when_caused_by_living_non_player" +} From 5cb16dfc6a93ef9622bfcbe17adbf6cbc1f0ac88 Mon Sep 17 00:00:00 2001 From: Eugene <59817721+SKZGx@users.noreply.github.com> Date: Sun, 16 Jun 2024 16:17:01 +0300 Subject: [PATCH 4/5] rename canned_tomatoes to jarred_tomatoes changed jar texture --- .../ukrainian_dlight/UkrainianDelight.java | 2 +- .../ukrainian_dlight/block/FoodBlocks.java | 2 +- .../item/FoodBlockComponents.java | 2 +- .../ukrainian_dlight/item/ModItemGroups.java | 2 +- .../blockstates/canned_tomatoes.json | 28 --------------- .../ukrainian_delight/blockstates/jar.json | 32 +++++++++--------- .../blockstates/jarred_tomatoes.json | 28 +++++++++++++++ .../assets/ukrainian_delight/lang/en_us.json | 18 +++++----- .../assets/ukrainian_delight/lang/uk_ua.json | 13 ++++--- ...oes.json => four_jar_jarred_tomatoes.json} | 2 +- ...toes.json => one_jar_jarred_tomatoes.json} | 2 +- ...es.json => three_jar_jarred_tomatoes.json} | 2 +- ...toes.json => two_jar_jarred_tomatoes.json} | 2 +- ...anned_tomatoes.png => jarred_tomatoes.png} | Bin .../textures/item/apple_jam.png | Bin 398 -> 2046 bytes .../textures/item/canned_tomatoes.png | Bin 429 -> 0 bytes .../textures/item/homemade_sausage.png | Bin 591 -> 498 bytes .../ukrainian_delight/textures/item/jar.png | Bin 1777 -> 2199 bytes .../textures/item/jarred_tomatoes.png | Bin 0 -> 1987 bytes 19 files changed, 70 insertions(+), 65 deletions(-) delete mode 100644 src/main/resources/assets/ukrainian_delight/blockstates/canned_tomatoes.json create mode 100644 src/main/resources/assets/ukrainian_delight/blockstates/jarred_tomatoes.json rename src/main/resources/assets/ukrainian_delight/models/block/jars/{four_jar_canned_tomatoes.json => four_jar_jarred_tomatoes.json} (99%) rename src/main/resources/assets/ukrainian_delight/models/block/jars/{one_jar_canned_tomatoes.json => one_jar_jarred_tomatoes.json} (97%) rename src/main/resources/assets/ukrainian_delight/models/block/jars/{three_jar_canned_tomatoes.json => three_jar_jarred_tomatoes.json} (98%) rename src/main/resources/assets/ukrainian_delight/models/block/jars/{two_jar_canned_tomatoes.json => two_jar_jarred_tomatoes.json} (98%) rename src/main/resources/assets/ukrainian_delight/textures/block/jars/{canned_tomatoes.png => jarred_tomatoes.png} (100%) delete mode 100644 src/main/resources/assets/ukrainian_delight/textures/item/canned_tomatoes.png create mode 100644 src/main/resources/assets/ukrainian_delight/textures/item/jarred_tomatoes.png diff --git a/src/main/java/com/megatrex4/ukrainian_dlight/UkrainianDelight.java b/src/main/java/com/megatrex4/ukrainian_dlight/UkrainianDelight.java index 78e6e5b..b5791aa 100644 --- a/src/main/java/com/megatrex4/ukrainian_dlight/UkrainianDelight.java +++ b/src/main/java/com/megatrex4/ukrainian_dlight/UkrainianDelight.java @@ -35,7 +35,7 @@ public void onInitialize() { BlockRenderLayerMap.INSTANCE.putBlock(FoodBlocks.JAR, RenderLayer.getCutout()); BlockRenderLayerMap.INSTANCE.putBlock(FoodBlocks.APPLE_JAM, RenderLayer.getCutout()); - BlockRenderLayerMap.INSTANCE.putBlock(FoodBlocks.CANNED_TOMATOES, RenderLayer.getCutout()); + BlockRenderLayerMap.INSTANCE.putBlock(FoodBlocks.JARRED_TOMATOES, RenderLayer.getCutout()); LOGGER.info("Hello Fabric world it's " + MOD_ID + "!"); diff --git a/src/main/java/com/megatrex4/ukrainian_dlight/block/FoodBlocks.java b/src/main/java/com/megatrex4/ukrainian_dlight/block/FoodBlocks.java index 4916302..1b8da98 100644 --- a/src/main/java/com/megatrex4/ukrainian_dlight/block/FoodBlocks.java +++ b/src/main/java/com/megatrex4/ukrainian_dlight/block/FoodBlocks.java @@ -16,7 +16,7 @@ public class FoodBlocks { // New Jar Blocks public static final Block JAR = registerBlock("jar", new JarBlock(), null); public static final Block APPLE_JAM = registerBlock("apple_jam", new JarBlock(), FoodBlockComponents.APPLE_JAM); - public static final Block CANNED_TOMATOES = registerBlock("canned_tomatoes", new JarBlock(), FoodBlockComponents.CANNED_TOMATOES); + public static final Block JARRED_TOMATOES = registerBlock("JARRED_tomatoes", new JarBlock(), FoodBlockComponents.JARRED_TOMATOES); private static Block registerBlock(String name, Block block, FoodComponent foodComponent){ registerBlockItem(name, block, foodComponent); diff --git a/src/main/java/com/megatrex4/ukrainian_dlight/item/FoodBlockComponents.java b/src/main/java/com/megatrex4/ukrainian_dlight/item/FoodBlockComponents.java index 5b90c58..95062f0 100644 --- a/src/main/java/com/megatrex4/ukrainian_dlight/item/FoodBlockComponents.java +++ b/src/main/java/com/megatrex4/ukrainian_dlight/item/FoodBlockComponents.java @@ -6,7 +6,7 @@ public class FoodBlockComponents { public static final FoodComponent APPLE_JAM = new FoodComponent.Builder().hunger(4).saturationModifier(0.3f).build(); - public static final FoodComponent CANNED_TOMATOES = new FoodComponent.Builder().hunger(6).saturationModifier(0.6f) + public static final FoodComponent JARRED_TOMATOES = new FoodComponent.Builder().hunger(6).saturationModifier(0.6f) .statusEffect(new StatusEffectInstance(StatusEffects.REGENERATION, 3*20, 3), 1.0f).build(); } diff --git a/src/main/java/com/megatrex4/ukrainian_dlight/item/ModItemGroups.java b/src/main/java/com/megatrex4/ukrainian_dlight/item/ModItemGroups.java index 5850578..d193f48 100644 --- a/src/main/java/com/megatrex4/ukrainian_dlight/item/ModItemGroups.java +++ b/src/main/java/com/megatrex4/ukrainian_dlight/item/ModItemGroups.java @@ -32,7 +32,7 @@ public class ModItemGroups { .entries((displayContext, entries) -> { entries.add(FoodBlocks.JAR); entries.add(FoodBlocks.APPLE_JAM); - entries.add(FoodBlocks.CANNED_TOMATOES); + entries.add(FoodBlocks.JARRED_TOMATOES); entries.add(ModBlock.SALT_BLOCK); entries.add(ModItems.SALT); diff --git a/src/main/resources/assets/ukrainian_delight/blockstates/canned_tomatoes.json b/src/main/resources/assets/ukrainian_delight/blockstates/canned_tomatoes.json deleted file mode 100644 index e29963e..0000000 --- a/src/main/resources/assets/ukrainian_delight/blockstates/canned_tomatoes.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "variants": { - "jars=1": [ - { "model": "ukrainian_delight:block/jars/one_jar_canned_tomatoes" }, - { "model": "ukrainian_delight:block/jars/one_jar_canned_tomatoes", "y": 90 }, - { "model": "ukrainian_delight:block/jars/one_jar_canned_tomatoes", "y": 180 }, - { "model": "ukrainian_delight:block/jars/one_jar_canned_tomatoes", "y": 270 } - ], - "jars=2": [ - { "model": "ukrainian_delight:block/jars/two_jar_canned_tomatoes" }, - { "model": "ukrainian_delight:block/jars/two_jar_canned_tomatoes", "y": 90 }, - { "model": "ukrainian_delight:block/jars/two_jar_canned_tomatoes", "y": 180 }, - { "model": "ukrainian_delight:block/jars/two_jar_canned_tomatoes", "y": 270 } - ], - "jars=3": [ - { "model": "ukrainian_delight:block/jars/three_jar_canned_tomatoes" }, - { "model": "ukrainian_delight:block/jars/three_jar_canned_tomatoes", "y": 90 }, - { "model": "ukrainian_delight:block/jars/three_jar_canned_tomatoes", "y": 180 }, - { "model": "ukrainian_delight:block/jars/three_jar_canned_tomatoes", "y": 270 } - ], - "jars=4": [ - { "model": "ukrainian_delight:block/jars/four_jar_canned_tomatoes" }, - { "model": "ukrainian_delight:block/jars/four_jar_canned_tomatoes", "y": 90 }, - { "model": "ukrainian_delight:block/jars/four_jar_canned_tomatoes", "y": 180 }, - { "model": "ukrainian_delight:block/jars/four_jar_canned_tomatoes", "y": 270 } - ] - } -} diff --git a/src/main/resources/assets/ukrainian_delight/blockstates/jar.json b/src/main/resources/assets/ukrainian_delight/blockstates/jar.json index a920b63..98a54f8 100644 --- a/src/main/resources/assets/ukrainian_delight/blockstates/jar.json +++ b/src/main/resources/assets/ukrainian_delight/blockstates/jar.json @@ -1,28 +1,28 @@ { "variants": { "jars=1": [ - { "model": "ukrainian_delight:block/jars/one_jar" }, - { "model": "ukrainian_delight:block/jars/one_jar", "y": 90 }, - { "model": "ukrainian_delight:block/jars/one_jar", "y": 180 }, - { "model": "ukrainian_delight:block/jars/one_jar", "y": 270 } + { "model": "ukrainian_delight:block/jars/one_jar", "particles": "minecraft:block/glass" }, + { "model": "ukrainian_delight:block/jars/one_jar", "y": 90, "particles": "minecraft:block/glass" }, + { "model": "ukrainian_delight:block/jars/one_jar", "y": 180, "particles": "minecraft:block/glass" }, + { "model": "ukrainian_delight:block/jars/one_jar", "y": 270, "particles": "minecraft:block/glass" } ], "jars=2": [ - { "model": "ukrainian_delight:block/jars/two_jar" }, - { "model": "ukrainian_delight:block/jars/two_jar", "y": 90 }, - { "model": "ukrainian_delight:block/jars/two_jar", "y": 180 }, - { "model": "ukrainian_delight:block/jars/two_jar", "y": 270 } + { "model": "ukrainian_delight:block/jars/two_jar", "particles": "minecraft:block/glass" }, + { "model": "ukrainian_delight:block/jars/two_jar", "y": 90, "particles": "minecraft:block/glass" }, + { "model": "ukrainian_delight:block/jars/two_jar", "y": 180, "particles": "minecraft:block/glass" }, + { "model": "ukrainian_delight:block/jars/two_jar", "y": 270, "particles": "minecraft:block/glass" } ], "jars=3": [ - { "model": "ukrainian_delight:block/jars/three_jar" }, - { "model": "ukrainian_delight:block/jars/three_jar", "y": 90 }, - { "model": "ukrainian_delight:block/jars/three_jar", "y": 180 }, - { "model": "ukrainian_delight:block/jars/three_jar", "y": 270 } + { "model": "ukrainian_delight:block/jars/three_jar", "particles": "minecraft:block/glass" }, + { "model": "ukrainian_delight:block/jars/three_jar", "y": 90, "particles": "minecraft:block/glass" }, + { "model": "ukrainian_delight:block/jars/three_jar", "y": 180, "particles": "minecraft:block/glass" }, + { "model": "ukrainian_delight:block/jars/three_jar", "y": 270, "particles": "minecraft:block/glass" } ], "jars=4": [ - { "model": "ukrainian_delight:block/jars/four_jar" }, - { "model": "ukrainian_delight:block/jars/four_jar", "y": 90 }, - { "model": "ukrainian_delight:block/jars/four_jar", "y": 180 }, - { "model": "ukrainian_delight:block/jars/four_jar", "y": 270 } + { "model": "ukrainian_delight:block/jars/four_jar", "particles": "minecraft:block/glass" }, + { "model": "ukrainian_delight:block/jars/four_jar", "y": 90, "particles": "minecraft:block/glass" }, + { "model": "ukrainian_delight:block/jars/four_jar", "y": 180, "particles": "minecraft:block/glass" }, + { "model": "ukrainian_delight:block/jars/four_jar", "y": 270, "particles": "minecraft:block/glass" } ] } } diff --git a/src/main/resources/assets/ukrainian_delight/blockstates/jarred_tomatoes.json b/src/main/resources/assets/ukrainian_delight/blockstates/jarred_tomatoes.json new file mode 100644 index 0000000..461d773 --- /dev/null +++ b/src/main/resources/assets/ukrainian_delight/blockstates/jarred_tomatoes.json @@ -0,0 +1,28 @@ +{ + "variants": { + "jars=1": [ + { "model": "ukrainian_delight:block/jars/one_jar_jarred_tomatoes" }, + { "model": "ukrainian_delight:block/jars/one_jar_jarred_tomatoes", "y": 90 }, + { "model": "ukrainian_delight:block/jars/one_jar_jarred_tomatoes", "y": 180 }, + { "model": "ukrainian_delight:block/jars/one_jar_jarred_tomatoes", "y": 270 } + ], + "jars=2": [ + { "model": "ukrainian_delight:block/jars/two_jar_jarred_tomatoes" }, + { "model": "ukrainian_delight:block/jars/two_jar_jarred_tomatoes", "y": 90 }, + { "model": "ukrainian_delight:block/jars/two_jar_jarred_tomatoes", "y": 180 }, + { "model": "ukrainian_delight:block/jars/two_jar_jarred_tomatoes", "y": 270 } + ], + "jars=3": [ + { "model": "ukrainian_delight:block/jars/three_jar_jarred_tomatoes" }, + { "model": "ukrainian_delight:block/jars/three_jar_jarred_tomatoes", "y": 90 }, + { "model": "ukrainian_delight:block/jars/three_jar_jarred_tomatoes", "y": 180 }, + { "model": "ukrainian_delight:block/jars/three_jar_jarred_tomatoes", "y": 270 } + ], + "jars=4": [ + { "model": "ukrainian_delight:block/jars/four_jar_jarred_tomatoes" }, + { "model": "ukrainian_delight:block/jars/four_jar_jarred_tomatoes", "y": 90 }, + { "model": "ukrainian_delight:block/jars/four_jar_jarred_tomatoes", "y": 180 }, + { "model": "ukrainian_delight:block/jars/four_jar_jarred_tomatoes", "y": 270 } + ] + } +} diff --git a/src/main/resources/assets/ukrainian_delight/lang/en_us.json b/src/main/resources/assets/ukrainian_delight/lang/en_us.json index 1ece081..8057db8 100644 --- a/src/main/resources/assets/ukrainian_delight/lang/en_us.json +++ b/src/main/resources/assets/ukrainian_delight/lang/en_us.json @@ -1,10 +1,10 @@ { - "_comment": "groups", + "_comment1": "groups", "itemgroup.meals_ukrainian_delight": "Ukrainian Delight", "itemgroup.ingredients_ukrainian_delight": "Ukrainian Delight Ingredients", "rei.ukrainian_delight": "Ukrainian Delight", - "_comment": "ingredients", + "_comment2": "ingredients", "item.ukrainian_delight.horseradish": "Horseradish", "item.ukrainian_delight.salt": "Salt", "item.ukrainian_delight.cucumber": "Cucumber", @@ -13,21 +13,21 @@ "item.ukrainian_delight.apple_slice": "Apple Slice", "item.ukrainian_delight.dried_apple_slice": "Dried Apple Slice", - "_comment": "meals", + "_comment3": "meals", "item.ukrainian_delight.varenyk": "Varenyk", "item.ukrainian_delight.borscht": "Borscht", "item.ukrainian_delight.lean_borscht": "Lean Borscht", "item.ukrainian_delight.homemade_sausage": "Homemade Sausage", - "_comment": "jars", + "_comment4": "jars", "block.ukrainian_delight.jar": "Jar", "block.ukrainian_delight.apple_jam": "Apple Jam", - "block.ukrainian_delight.canned_tomatoes": "Canned Tomatoes", + "block.ukrainian_delight.jarred_tomatoes": "Jarred Tomatoes", - "_comment": "blocks", + "_comment5": "blocks", "block.ukrainian_delight.salt_block": "Salt Block", - "_comment": "advancements", + "_comment6": "advancements", "ukrainian_delight.advancement.root": "Ukrainian Delight", "ukrainian_delight.advancement.root.desc": "The power of Ukrainian delicacies!", @@ -36,8 +36,8 @@ "ukrainian_delight.advancement.lean_borscht": "The same, but with mushrooms!", "ukrainian_delight.advancement.lean_borscht.desc": "Cook lean borscht", - "_comment": "misc", - "death.attack.glass_damage": "%s was not very careful with the glass", + "_comment7": "misc", + "death.attack.glass_damage": "%s was not careful with glass", "tooltip.ukrainian_delight.no_effects": "No effects", "amplifier.none": "", diff --git a/src/main/resources/assets/ukrainian_delight/lang/uk_ua.json b/src/main/resources/assets/ukrainian_delight/lang/uk_ua.json index 167a31a..c360198 100644 --- a/src/main/resources/assets/ukrainian_delight/lang/uk_ua.json +++ b/src/main/resources/assets/ukrainian_delight/lang/uk_ua.json @@ -19,10 +19,15 @@ "item.ukrainian_delight.lean_borscht": "Пісний борщ", "item.ukrainian_delight.homemade_sausage": "Домашня ковбаса", - "_comment4": "blocks", + "_comment4": "jars", + "block.ukrainian_delight.jar": "Банка", + "block.ukrainian_delight.apple_jam": "Яблучне варення", + "block.ukrainian_delight.jarred_tomatoes": "Консервовані помідори", + + "_comment5": "blocks", "block.ukrainian_delight.salt_block": "Солевий блок", - "_comment5": "advancements", + "_comment6": "advancements", "ukrainian_delight.advancement.root": "Українська насолода", "ukrainian_delight.advancement.root.desc": "Сила українських смаколиків!", @@ -31,7 +36,7 @@ "ukrainian_delight.advancement.lean_borscht": "Те саме тільки з грибами", "ukrainian_delight.advancement.lean_borscht.desc": "Зваріть пісний борщ", - "_comment6": "misc", - "death.attack.glass_damage": "%s був не дуже обережний зі склом" + "_comment7": "misc", + "death.attack.glass_damage": "%s був не обережний зі склом" } \ No newline at end of file diff --git a/src/main/resources/assets/ukrainian_delight/models/block/jars/four_jar_canned_tomatoes.json b/src/main/resources/assets/ukrainian_delight/models/block/jars/four_jar_jarred_tomatoes.json similarity index 99% rename from src/main/resources/assets/ukrainian_delight/models/block/jars/four_jar_canned_tomatoes.json rename to src/main/resources/assets/ukrainian_delight/models/block/jars/four_jar_jarred_tomatoes.json index 00d1c78..3eea00d 100644 --- a/src/main/resources/assets/ukrainian_delight/models/block/jars/four_jar_canned_tomatoes.json +++ b/src/main/resources/assets/ukrainian_delight/models/block/jars/four_jar_jarred_tomatoes.json @@ -1,7 +1,7 @@ { "credit": "Made with Blockbench", "textures": { - "inside": "ukrainian_delight:block/jars/canned_tomatoes", + "inside": "ukrainian_delight:block/jars/jarred_tomatoes", "outside": "ukrainian_delight:block/jars/jar", "particle": "ukrainian_delight:block/jars/jar" }, diff --git a/src/main/resources/assets/ukrainian_delight/models/block/jars/one_jar_canned_tomatoes.json b/src/main/resources/assets/ukrainian_delight/models/block/jars/one_jar_jarred_tomatoes.json similarity index 97% rename from src/main/resources/assets/ukrainian_delight/models/block/jars/one_jar_canned_tomatoes.json rename to src/main/resources/assets/ukrainian_delight/models/block/jars/one_jar_jarred_tomatoes.json index bfebe25..3d2e2ca 100644 --- a/src/main/resources/assets/ukrainian_delight/models/block/jars/one_jar_canned_tomatoes.json +++ b/src/main/resources/assets/ukrainian_delight/models/block/jars/one_jar_jarred_tomatoes.json @@ -1,7 +1,7 @@ { "credit": "Made with Blockbench", "textures": { - "inside": "ukrainian_delight:block/jars/canned_tomatoes", + "inside": "ukrainian_delight:block/jars/jarred_tomatoes", "outside": "ukrainian_delight:block/jars/jar", "particle": "ukrainian_delight:block/jars/jar" }, diff --git a/src/main/resources/assets/ukrainian_delight/models/block/jars/three_jar_canned_tomatoes.json b/src/main/resources/assets/ukrainian_delight/models/block/jars/three_jar_jarred_tomatoes.json similarity index 98% rename from src/main/resources/assets/ukrainian_delight/models/block/jars/three_jar_canned_tomatoes.json rename to src/main/resources/assets/ukrainian_delight/models/block/jars/three_jar_jarred_tomatoes.json index 8043880..bf15faa 100644 --- a/src/main/resources/assets/ukrainian_delight/models/block/jars/three_jar_canned_tomatoes.json +++ b/src/main/resources/assets/ukrainian_delight/models/block/jars/three_jar_jarred_tomatoes.json @@ -1,7 +1,7 @@ { "credit": "Made with Blockbench", "textures": { - "inside": "ukrainian_delight:block/jars/canned_tomatoes", + "inside": "ukrainian_delight:block/jars/jarred_tomatoes", "outside": "ukrainian_delight:block/jars/jar", "particle": "ukrainian_delight:block/jars/jar" }, diff --git a/src/main/resources/assets/ukrainian_delight/models/block/jars/two_jar_canned_tomatoes.json b/src/main/resources/assets/ukrainian_delight/models/block/jars/two_jar_jarred_tomatoes.json similarity index 98% rename from src/main/resources/assets/ukrainian_delight/models/block/jars/two_jar_canned_tomatoes.json rename to src/main/resources/assets/ukrainian_delight/models/block/jars/two_jar_jarred_tomatoes.json index 6970451..8eb446e 100644 --- a/src/main/resources/assets/ukrainian_delight/models/block/jars/two_jar_canned_tomatoes.json +++ b/src/main/resources/assets/ukrainian_delight/models/block/jars/two_jar_jarred_tomatoes.json @@ -1,7 +1,7 @@ { "credit": "Made with Blockbench", "textures": { - "inside": "ukrainian_delight:block/jars/canned_tomatoes", + "inside": "ukrainian_delight:block/jars/jarred_tomatoes", "outside": "ukrainian_delight:block/jars/jar", "particle": "ukrainian_delight:block/jars/jar" }, diff --git a/src/main/resources/assets/ukrainian_delight/textures/block/jars/canned_tomatoes.png b/src/main/resources/assets/ukrainian_delight/textures/block/jars/jarred_tomatoes.png similarity index 100% rename from src/main/resources/assets/ukrainian_delight/textures/block/jars/canned_tomatoes.png rename to src/main/resources/assets/ukrainian_delight/textures/block/jars/jarred_tomatoes.png diff --git a/src/main/resources/assets/ukrainian_delight/textures/item/apple_jam.png b/src/main/resources/assets/ukrainian_delight/textures/item/apple_jam.png index e11bd8d889f934a75bf74a4e93e97097d62f432a..108baf3f61399a482b27079806da9a5477e5b616 100644 GIT binary patch literal 2046 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 diff --git a/src/main/resources/assets/ukrainian_delight/textures/item/jar.png b/src/main/resources/assets/ukrainian_delight/textures/item/jar.png index 5067820530ae5cc667cfd80a23acc18bb56aaa88..9928be77c789f70822619d632c5865b72e6f6122 100644 GIT binary patch delta 374 zcmey!J6&*s1rz(8jaJ=ETxKDLrd9@KR;Ff?&oe0_aX0^AvS$=FGB7gHH89gPgs3yM zGO?T-!EA-3Zt@)F-73ZgCI%_Vsg}Bl$tf1PDTyX#x`}26mb!)}hDjD_DTyf-si~W* zS&|tiE3%3*7bliYwq}(hO4sCCR&iw8=CRrcDioKvmX%l~XC&sOr>58{=}*4N8dop> z+rf~5fuYgU#WBP}F!{&-|MtwPGa6s9{jr+*L%!wz{~hedPD}GD?1^k_xydg<{!EqMPiydc~=4?B#L2k`-Mw!d%#uK|3gCD(dFj+h^1?Up&l1rzJfjaJ=ET&5vLMphp>t&oe0_aX0^AvS*xZ$SO10pG|FZF>4~@ zsko>^6*_4DhHM?mJggC8GeF8e=SeD&Y>dl?J| z70d)4n>_e$_xFGJb=L+%pW^6Qk`l_B3#A#3eBAx}zx?li3>wW`4oM1@d*TB6wl``! zu-~|{K!U+oHbvM>e8KKXWo!bUm_m6Nb`~V?9(cvtWBuY_GJ{vir{s06_brDB^c(+Pt+>hS+@x2R0dC1KbLh*2~7Ycq+)Xb diff --git a/src/main/resources/assets/ukrainian_delight/textures/item/jarred_tomatoes.png b/src/main/resources/assets/ukrainian_delight/textures/item/jarred_tomatoes.png new file mode 100644 index 0000000000000000000000000000000000000000..743a5840ba702a6e76c72f231470e02b23f2adca GIT binary patch literal 1987 zcmbVNTWB0r7@lBVleVFeqQ>;0<3y!JXXm!Nvop;$-DWq|Np=La{lw|(BPr=tzBC&3~NsfB!Djmv^U^zO%dDk4&#K?mR!t*F~#B}UZsifHX_Qv_azIO8!Q?i$2L z(?fWlVL@C7GNeq?49*Kd5LH5an0pjwX_ljCj$%2Ij*8)k$nm)M5XhXRUje9!zlI{MZ-dd5j$?}{(x#D zHz(I{ZV=%`I@BQYaCb%6SG`butNMO*4wr$hL*=MrAX5gkgUAeCeP`+A>c#2@OHWs4 zm!_*9BZ>GvKL#5eTdyx6N=IyH*;4Yzq2ypvLbW*V7^b8diY=AKEuiWu&`AXr)qKGr znIKC`wk1m%`XO0f;%o`nHgwhq9Q6bw2UeUC!bz$FHEC1!?;+Rb5%Uvh{>WorPgFWB zrgYl@x(ri^7=g+nsH%#n$XQkfj7%~tmnG?Nh$o{kj0SaU6?Y7rK4uZV5DysWkH(i=JKFUQS98KmF7Img< zC_-jom?b$r3qhC#d??HJP;S3KLU?1T7QjCz@ zlL!^U+g5KoBMr6X0z^vv>ip*kZNO|J=ahj3<9U?5TXq1d8Gwc#)J7NUVOrB>n{d>- z-KBqPpb!7vfjYWuEOe_JPmOFrH_~D%5zj>LmX~X_-a8&Ted4FUiuls}tnnN86uon;Sd3T6^PXVqy80&{s80&5fPJyJp(DzPDBUc zV9UGl?12cN_I&Zp${&yASI&O9{S!R0*wGQV{9PD3w(VMfM?a6v#E(4_!G656(tka%R63q;K0fY=k7ZfSo!q(drn>J{q6KZ*Gc-b t8=coD&P=u_t=q3m-M_#*#qNB)6T2k8cJZpV_mX?frjmn+HxG_Y{{{HeqMQH# literal 0 HcmV?d00001 From a0288a3bc64f545002a91de7f5361db2226cc807 Mon Sep 17 00:00:00 2001 From: Eugene <59817721+SKZGx@users.noreply.github.com> Date: Sun, 16 Jun 2024 16:18:23 +0300 Subject: [PATCH 5/5] fix --- .../java/com/megatrex4/ukrainian_dlight/block/FoodBlocks.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/megatrex4/ukrainian_dlight/block/FoodBlocks.java b/src/main/java/com/megatrex4/ukrainian_dlight/block/FoodBlocks.java index 1b8da98..29d56b3 100644 --- a/src/main/java/com/megatrex4/ukrainian_dlight/block/FoodBlocks.java +++ b/src/main/java/com/megatrex4/ukrainian_dlight/block/FoodBlocks.java @@ -16,7 +16,7 @@ public class FoodBlocks { // New Jar Blocks public static final Block JAR = registerBlock("jar", new JarBlock(), null); public static final Block APPLE_JAM = registerBlock("apple_jam", new JarBlock(), FoodBlockComponents.APPLE_JAM); - public static final Block JARRED_TOMATOES = registerBlock("JARRED_tomatoes", new JarBlock(), FoodBlockComponents.JARRED_TOMATOES); + public static final Block JARRED_TOMATOES = registerBlock("jarred_tomatoes", new JarBlock(), FoodBlockComponents.JARRED_TOMATOES); private static Block registerBlock(String name, Block block, FoodComponent foodComponent){ registerBlockItem(name, block, foodComponent);