diff --git a/gradle.properties b/gradle.properties index b5d31e9d..caafde83 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx2G # Mod Info maven_group = net.dakotapride archives_base_name = garnished -mod_version = 1.9.8 +mod_version = 2.0 minecraft_version = 1.19.2 diff --git a/src/main/java/net/dakotapride/garnished/CreateGarnished.java b/src/main/java/net/dakotapride/garnished/CreateGarnished.java index 5537ebb0..75ff5182 100644 --- a/src/main/java/net/dakotapride/garnished/CreateGarnished.java +++ b/src/main/java/net/dakotapride/garnished/CreateGarnished.java @@ -5,6 +5,7 @@ import net.dakotapride.garnished.registry.GarnishedAdvancementUtils; import net.dakotapride.garnished.registry.GarnishedBlockEntities; import net.dakotapride.garnished.registry.GarnishedEnchantments; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.dakotapride.garnished.registry.GarnishedRecipeTypes; import net.fabricmc.fabric.api.biome.v1.BiomeModifications; @@ -12,6 +13,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.BiomeTags; import net.minecraft.world.level.biome.Biomes; +import net.minecraft.world.level.block.ComposterBlock; import net.minecraft.world.level.levelgen.GenerationStep; import org.slf4j.Logger; @@ -26,7 +28,6 @@ import net.dakotapride.garnished.registry.GarnishedEffects; import net.dakotapride.garnished.registry.GarnishedFeatures; import net.dakotapride.garnished.registry.GarnishedFluids; -import net.dakotapride.garnished.registry.GarnishedFoods; import net.dakotapride.garnished.registry.GarnishedItems; import net.dakotapride.garnished.registry.GarnishedTabs; import net.dakotapride.garnished.registry.GarnishedTags; @@ -58,7 +59,7 @@ public void onInitialize() { GarnishedBlocks.setRegister(); GarnishedTabs.setRegister(); GarnishedFluids.setRegister(); - GarnishedFoods.setRegister(); + GarnishedFoodValues.setRegister(); GarnishedEffects.setRegister(); GarnishedFeatures.setRegister(); GarnishedTags.setRegister(); @@ -119,6 +120,125 @@ public void onInitialize() { StrippableBlockRegistry.register(GarnishedBlocks.NUT_LOG.get(), GarnishedBlocks.STRIPPED_NUT_LOG.get()); StrippableBlockRegistry.register(GarnishedBlocks.NUT_WOOD.get(), GarnishedBlocks.STRIPPED_NUT_WOOD.get()); + + ComposterBlock.COMPOSTABLES.put(GarnishedItems.CRACKED_BUHG.get(), 0.10f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.CRACKED_CASHEW.get(), 0.10f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.CRACKED_WALNUT.get(), 0.10f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.CRACKED_ALMOND.get(), 0.10f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.CRACKED_PISTACHIO.get(), 0.10f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.CRACKED_PECAN.get(), 0.10f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.CRACKED_MACADAMIA.get(), 0.10f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.CRACKED_HAZELNUT.get(), 0.10f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.CRACKED_CHESTNUT.get(), 0.10f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.UNGARNISHED_BUHG.get(), 0.15f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.UNGARNISHED_CASHEW.get(), 0.15f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.UNGARNISHED_WALNUT.get(), 0.15f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.UNGARNISHED_ALMOND.get(), 0.15f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.UNGARNISHED_PISTACHIO.get(), 0.15f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.UNGARNISHED_PECAN.get(), 0.15f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.UNGARNISHED_MACADAMIA.get(), 0.15f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.UNGARNISHED_HAZELNUT.get(), 0.15f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.UNGARNISHED_CHESTNUT.get(), 0.15f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.BUHG.get(), 0.20f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.CASHEW.get(), 0.20f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.WALNUT.get(), 0.20f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.ALMOND.get(), 0.20f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.PISTACHIO.get(), 0.20f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.PECAN.get(), 0.20f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.MACADAMIA.get(), 0.20f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.HAZELNUT.get(), 0.20f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.CHESTNUT.get(), 0.20f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.CHOCOLATE_GLAZED_BUHG.get(), 0.25f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.CHOCOLATE_GLAZED_CASHEW.get(), 0.25f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.CHOCOLATE_GLAZED_WALNUT.get(), 0.25f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.CHOCOLATE_GLAZED_ALMOND.get(), 0.25f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.CHOCOLATE_GLAZED_PISTACHIO.get(), 0.25f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.CHOCOLATE_GLAZED_PECAN.get(), 0.25f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.CHOCOLATE_GLAZED_MACADAMIA.get(), 0.25f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.CHOCOLATE_GLAZED_HAZELNUT.get(), 0.25f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.CHOCOLATE_GLAZED_CHESTNUT.get(), 0.25f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.SWEETENED_BUHG.get(), 0.25f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.SWEETENED_CASHEW.get(), 0.25f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.SWEETENED_WALNUT.get(), 0.25f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.SWEETENED_ALMOND.get(), 0.25f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.SWEETENED_PISTACHIO.get(), 0.25f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.SWEETENED_PECAN.get(), 0.25f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.SWEETENED_MACADAMIA.get(), 0.25f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.SWEETENED_HAZELNUT.get(), 0.25f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.SWEETENED_CHESTNUT.get(), 0.25f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.HONEYED_BUHG.get(), 0.25f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.HONEYED_CASHEW.get(), 0.25f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.HONEYED_WALNUT.get(), 0.25f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.HONEYED_ALMOND.get(), 0.25f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.HONEYED_PISTACHIO.get(), 0.25f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.HONEYED_PECAN.get(), 0.25f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.HONEYED_MACADAMIA.get(), 0.25f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.HONEYED_HAZELNUT.get(), 0.25f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.HONEYED_CHESTNUT.get(), 0.25f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.CINDER_FLOUR_BUHG.get(), 0.30f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.CINDER_FLOUR_CASHEW.get(), 0.30f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.CINDER_FLOUR_WALNUT.get(), 0.30f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.CINDER_FLOUR_ALMOND.get(), 0.30f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.CINDER_FLOUR_PISTACHIO.get(), 0.30f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.CINDER_FLOUR_PECAN.get(), 0.30f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.CINDER_FLOUR_MACADAMIA.get(), 0.30f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.CINDER_FLOUR_HAZELNUT.get(), 0.30f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.CINDER_FLOUR_CHESTNUT.get(), 0.30f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.MELTED_CINDER_FLOUR_BUHG.get(), 0.40f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.MELTED_CINDER_FLOUR_CASHEW.get(), 0.40f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.MELTED_CINDER_FLOUR_WALNUT.get(), 0.40f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.MELTED_CINDER_FLOUR_ALMOND.get(), 0.40f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.MELTED_CINDER_FLOUR_PISTACHIO.get(), 0.40f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.MELTED_CINDER_FLOUR_PECAN.get(), 0.40f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.MELTED_CINDER_FLOUR_MACADAMIA.get(), 0.40f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.MELTED_CINDER_FLOUR_HAZELNUT.get(), 0.40f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.MELTED_CINDER_FLOUR_CHESTNUT.get(), 0.40f); + ComposterBlock.COMPOSTABLES.put(GarnishedBlocks.NUT_LEAVES.get().asItem(), 0.35f); + ComposterBlock.COMPOSTABLES.put(GarnishedBlocks.UNASSIGNED_NUT_LEAVES.get().asItem(), 0.35f); + ComposterBlock.COMPOSTABLES.put(GarnishedBlocks.BUHG_LEAVES.get().asItem(), 0.35f); + ComposterBlock.COMPOSTABLES.put(GarnishedBlocks.CASHEW_LEAVES.get().asItem(), 0.35f); + ComposterBlock.COMPOSTABLES.put(GarnishedBlocks.WALNUT_LEAVES.get().asItem(), 0.35f); + ComposterBlock.COMPOSTABLES.put(GarnishedBlocks.ALMOND_LEAVES.get().asItem(), 0.35f); + ComposterBlock.COMPOSTABLES.put(GarnishedBlocks.PISTACHIO_LEAVES.get().asItem(), 0.35f); + ComposterBlock.COMPOSTABLES.put(GarnishedBlocks.PECAN_LEAVES.get().asItem(), 0.35f); + ComposterBlock.COMPOSTABLES.put(GarnishedBlocks.MACADAMIA_LEAVES.get().asItem(), 0.35f); + ComposterBlock.COMPOSTABLES.put(GarnishedBlocks.HAZELNUT_LEAVES.get().asItem(), 0.35f); + ComposterBlock.COMPOSTABLES.put(GarnishedBlocks.CHESTNUT_LEAVES.get().asItem(), 0.35f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.PECAN_PIE_SLICE.get(), 0.25f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.PECAN_PIE.get(), 1.0f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.ALMOND_CHEESE.get(), 0.20f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.SALAD.get(), 0.75f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.CRUSHED_CRIMSON_FUNGUS.get(), 0.35f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.CRUSHED_WARPED_FUNGUS.get(), 0.35f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.CRUSHED_SEPIA_FUNGUS.get(), 0.35f); + ComposterBlock.COMPOSTABLES.put(GarnishedBlocks.SEPIA_FUNGUS.get().asItem(), 0.65f); + ComposterBlock.COMPOSTABLES.put(Items.CHORUS_FRUIT, 0.45f); + ComposterBlock.COMPOSTABLES.put(Items.CHORUS_FLOWER, 0.65f); + ComposterBlock.COMPOSTABLES.put(Items.CHORUS_PLANT, 0.65f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.HOLLOWED_CHORUS_FRUIT.get(), 0.35f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.CHORUS_TUFT.get(), 0.10f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.MULCH.get(), 0.25f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.WHEAT_GRAZE.get(), 0.65f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.DRIED_DULSE_KELP.get(), 0.30f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.DRIED_VERMILION_KELP.get(), 0.30f); + ComposterBlock.COMPOSTABLES.put(GarnishedBlocks.DULSE_KELP.get().asItem(), 0.30f); + ComposterBlock.COMPOSTABLES.put(GarnishedBlocks.VERMILION_KELP.get().asItem(), 0.30f); + ComposterBlock.COMPOSTABLES.put(GarnishedBlocks.DRIED_DULSE_KELP_BLOCK.get().asItem(), 0.50f); + ComposterBlock.COMPOSTABLES.put(GarnishedBlocks.DRIED_VERMILION_KELP_BLOCK.get().asItem(), 0.50f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.PRICKLY_PEAR.get(), 0.45f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.BAMBOO_CLOD.get(), 0.45f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.BOK_CHOY.get(), 0.65f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.BOK_CHOY_SEEDS.get(), 0.30f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.PANSOPHICAL_PETAL.get(), 0.45f); + ComposterBlock.COMPOSTABLES.put(GarnishedItems.INCANDESCENT_PETAL.get(), 0.45f); + ComposterBlock.COMPOSTABLES.put(GarnishedBlocks.PANSOPHICAL_DAISY.get().asItem(), 0.65f); + ComposterBlock.COMPOSTABLES.put(GarnishedBlocks.INCANDESCENT_LILY.get().asItem(), 0.65f); + ComposterBlock.COMPOSTABLES.put(GarnishedBlocks.SORROWFUL_LICHEN.get().asItem(), 0.65f); + ComposterBlock.COMPOSTABLES.put(GarnishedBlocks.SOUL_ROOTS.get().asItem(), 0.65f); + ComposterBlock.COMPOSTABLES.put(GarnishedBlocks.AUREATE_SHRUB.get().asItem(), 0.65f); + ComposterBlock.COMPOSTABLES.put(GarnishedBlocks.SMALL_CHORUS_PLANT.get().asItem(), 0.65f); + ComposterBlock.COMPOSTABLES.put(GarnishedBlocks.BARREN_ROOTS.get().asItem(), 0.65f); + } public static CreateRegistrate registrate() { diff --git a/src/main/java/net/dakotapride/garnished/CreateGarnishedClient.java b/src/main/java/net/dakotapride/garnished/CreateGarnishedClient.java index 71c621c8..d3f8e1ef 100644 --- a/src/main/java/net/dakotapride/garnished/CreateGarnishedClient.java +++ b/src/main/java/net/dakotapride/garnished/CreateGarnishedClient.java @@ -58,6 +58,7 @@ public void onInitializeClient() { BlockRenderLayerMap.INSTANCE.putBlock(GarnishedBlocks.NUT_PLANT.get(), RenderType.cutout()); BlockRenderLayerMap.INSTANCE.putBlock(GarnishedBlocks.NUT_LEAVES.get(), RenderType.cutout()); + BlockRenderLayerMap.INSTANCE.putBlock(GarnishedBlocks.UNASSIGNED_NUT_LEAVES.get(), RenderType.cutout()); BlockRenderLayerMap.INSTANCE.putBlock(GarnishedBlocks.ALMOND_LEAVES.get(), RenderType.cutoutMipped()); BlockRenderLayerMap.INSTANCE.putBlock(GarnishedBlocks.CASHEW_LEAVES.get(), RenderType.cutoutMipped()); @@ -127,8 +128,8 @@ public void onInitializeClient() { public static synchronized void blockColourProvider(BlockColors colors) { colors.register((unknown, lightReader, pos, unknown2) -> lightReader != null && pos != null ? - BiomeColors.getAverageFoliageColor(lightReader, pos) : FoliageColor.get(0.5D, 1.0D), - GarnishedBlocks.NUT_LEAVES.get(), + BiomeColors.getAverageFoliageColor(lightReader, pos) : FoliageColor.get(0.6D, 1.0D), + GarnishedBlocks.NUT_LEAVES.get(), GarnishedBlocks.UNASSIGNED_NUT_LEAVES.get(), GarnishedBlocks.ALMOND_LEAVES.get(), GarnishedBlocks.CASHEW_LEAVES.get(), GarnishedBlocks.WALNUT_LEAVES.get(), GarnishedBlocks.PECAN_LEAVES.get(), GarnishedBlocks.BUHG_LEAVES.get(), GarnishedBlocks.PISTACHIO_LEAVES.get(), GarnishedBlocks.MACADAMIA_LEAVES.get(), GarnishedBlocks.HAZELNUT_LEAVES.get(), GarnishedBlocks.CHESTNUT_LEAVES.get()); @@ -140,7 +141,7 @@ public static synchronized void itemColourProvider(BlockColors colors, ItemColor return colors.getColor(state, null, null, tintIndex); }; - itemColors.register(itemBlockColourHandler, GarnishedBlocks.NUT_LEAVES.get(), + itemColors.register(itemBlockColourHandler, GarnishedBlocks.NUT_LEAVES.get(), GarnishedBlocks.UNASSIGNED_NUT_LEAVES.get(), GarnishedBlocks.ALMOND_LEAVES.get(), GarnishedBlocks.CASHEW_LEAVES.get(), GarnishedBlocks.WALNUT_LEAVES.get(), GarnishedBlocks.PECAN_LEAVES.get(), GarnishedBlocks.BUHG_LEAVES.get(), GarnishedBlocks.PISTACHIO_LEAVES.get(), GarnishedBlocks.MACADAMIA_LEAVES.get(), GarnishedBlocks.HAZELNUT_LEAVES.get(), GarnishedBlocks.CHESTNUT_LEAVES.get()); diff --git a/src/main/java/net/dakotapride/garnished/block/DragonStoneBlock.java b/src/main/java/net/dakotapride/garnished/block/DragonStoneBlock.java new file mode 100644 index 00000000..3c78e131 --- /dev/null +++ b/src/main/java/net/dakotapride/garnished/block/DragonStoneBlock.java @@ -0,0 +1,28 @@ +package net.dakotapride.garnished.block; + +import org.jetbrains.annotations.NotNull; + +import net.minecraft.core.BlockPos; +import net.minecraft.util.RandomSource; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.BlockState; + +public class DragonStoneBlock extends Block { + public DragonStoneBlock(Properties properties) { + super(properties); + } + + @Override + public void animateTick(@NotNull BlockState state, @NotNull Level level, @NotNull BlockPos pos, @NotNull RandomSource random) { + SpecialEffectsBlock.Wyvern.getParticles(state, level, pos, random); + } + + @Override + public void stepOn(@NotNull Level level, @NotNull BlockPos pos, @NotNull BlockState state, @NotNull Entity entity) { + SpecialEffectsBlock.Wyvern.getEffects(level, pos, state, entity); + + super.stepOn(level, pos, state, entity); + } +} diff --git a/src/main/java/net/dakotapride/garnished/block/DragonStoneSlabBlock.java b/src/main/java/net/dakotapride/garnished/block/DragonStoneSlabBlock.java new file mode 100644 index 00000000..9af100de --- /dev/null +++ b/src/main/java/net/dakotapride/garnished/block/DragonStoneSlabBlock.java @@ -0,0 +1,28 @@ +package net.dakotapride.garnished.block; + +import org.jetbrains.annotations.NotNull; + +import net.minecraft.core.BlockPos; +import net.minecraft.util.RandomSource; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.SlabBlock; +import net.minecraft.world.level.block.state.BlockState; + +public class DragonStoneSlabBlock extends SlabBlock { + public DragonStoneSlabBlock(Properties properties) { + super(properties); + } + + @Override + public void animateTick(@NotNull BlockState state, @NotNull Level level, @NotNull BlockPos pos, @NotNull RandomSource random) { + SpecialEffectsBlock.Wyvern.getParticles(state, level, pos, random); + } + + @Override + public void stepOn(@NotNull Level level, @NotNull BlockPos pos, @NotNull BlockState state, @NotNull Entity entity) { + SpecialEffectsBlock.Wyvern.getEffects(level, pos, state, entity); + + super.stepOn(level, pos, state, entity); + } +} diff --git a/src/main/java/net/dakotapride/garnished/block/DragonStoneStairsBlock.java b/src/main/java/net/dakotapride/garnished/block/DragonStoneStairsBlock.java index 3fdcd443..33d82056 100644 --- a/src/main/java/net/dakotapride/garnished/block/DragonStoneStairsBlock.java +++ b/src/main/java/net/dakotapride/garnished/block/DragonStoneStairsBlock.java @@ -1,10 +1,29 @@ package net.dakotapride.garnished.block; +import org.jetbrains.annotations.NotNull; + import net.dakotapride.garnished.registry.GarnishedBlocks; +import net.minecraft.core.BlockPos; +import net.minecraft.util.RandomSource; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.level.Level; import net.minecraft.world.level.block.StairBlock; +import net.minecraft.world.level.block.state.BlockState; public class DragonStoneStairsBlock extends StairBlock { public DragonStoneStairsBlock(Properties properties) { super(GarnishedBlocks.DRAGON_STONE.get().defaultBlockState(), properties); } + + @Override + public void animateTick(@NotNull BlockState state, @NotNull Level level, @NotNull BlockPos pos, @NotNull RandomSource random) { + SpecialEffectsBlock.Wyvern.getParticles(state, level, pos, random); + } + + @Override + public void stepOn(@NotNull Level level, @NotNull BlockPos pos, @NotNull BlockState state, @NotNull Entity entity) { + SpecialEffectsBlock.Wyvern.getEffects(level, pos, state, entity); + + super.stepOn(level, pos, state, entity); + } } diff --git a/src/main/java/net/dakotapride/garnished/block/DragonStoneWallBlock.java b/src/main/java/net/dakotapride/garnished/block/DragonStoneWallBlock.java new file mode 100644 index 00000000..50d8346b --- /dev/null +++ b/src/main/java/net/dakotapride/garnished/block/DragonStoneWallBlock.java @@ -0,0 +1,28 @@ +package net.dakotapride.garnished.block; + +import org.jetbrains.annotations.NotNull; + +import net.minecraft.core.BlockPos; +import net.minecraft.util.RandomSource; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.WallBlock; +import net.minecraft.world.level.block.state.BlockState; + +public class DragonStoneWallBlock extends WallBlock { + public DragonStoneWallBlock(Properties properties) { + super(properties); + } + + @Override + public void animateTick(@NotNull BlockState state, @NotNull Level level, @NotNull BlockPos pos, @NotNull RandomSource random) { + SpecialEffectsBlock.Wyvern.getParticles(state, level, pos, random); + } + + @Override + public void stepOn(@NotNull Level level, @NotNull BlockPos pos, @NotNull BlockState state, @NotNull Entity entity) { + SpecialEffectsBlock.Wyvern.getEffects(level, pos, state, entity); + + super.stepOn(level, pos, state, entity); + } +} diff --git a/src/main/java/net/dakotapride/garnished/block/NumbingParchmentBlock.java b/src/main/java/net/dakotapride/garnished/block/NumbingParchmentBlock.java new file mode 100644 index 00000000..c13ab0a5 --- /dev/null +++ b/src/main/java/net/dakotapride/garnished/block/NumbingParchmentBlock.java @@ -0,0 +1,54 @@ +package net.dakotapride.garnished.block; + +import org.jetbrains.annotations.NotNull; + +import net.dakotapride.garnished.item.IGarnishedUtilities; +import net.dakotapride.garnished.registry.GarnishedEffects; +import net.minecraft.core.BlockPos; +import net.minecraft.world.effect.MobEffectInstance; +import net.minecraft.world.effect.MobEffects; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.animal.PolarBear; +import net.minecraft.world.entity.monster.Stray; +import net.minecraft.world.item.enchantment.EnchantmentHelper; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.CarpetBlock; +import net.minecraft.world.level.block.state.BlockState; + +public class NumbingParchmentBlock extends Block implements IGarnishedUtilities { + public NumbingParchmentBlock(Properties pProperties) { + super(pProperties); + } + + @Override + public void stepOn(@NotNull Level level, @NotNull BlockPos pos, @NotNull BlockState state, @NotNull Entity entity) { + if (entity instanceof LivingEntity living && !(living instanceof Stray || living instanceof PolarBear) && !living.isSteppingCarefully()) { + if (EnchantmentHelper.hasFrostWalker(living)) { + living.addEffect(new MobEffectInstance(GarnishedEffects.FREEZING, tick * 12, 0)); + living.setTicksFrozen(tick * 15); + } else { + living.addEffect(new MobEffectInstance(MobEffects.MOVEMENT_SLOWDOWN, tick * 6, 1)); + } + } + } + + public static class Carpet extends CarpetBlock implements IGarnishedUtilities { + public Carpet(Properties properties) { + super(properties); + } + + @Override + public void entityInside(@NotNull BlockState state, @NotNull Level level, @NotNull BlockPos pos, @NotNull Entity entity) { + if (entity instanceof LivingEntity living && !(living instanceof Stray || living instanceof PolarBear) && !living.isSteppingCarefully()) { + if (EnchantmentHelper.hasFrostWalker(living)) { + living.addEffect(new MobEffectInstance(GarnishedEffects.FREEZING, tick * 12, 0)); + living.setTicksFrozen(tick * 15); + } else { + living.addEffect(new MobEffectInstance(MobEffects.MOVEMENT_SLOWDOWN, tick * 6, 1)); + } + } + } + } +} diff --git a/src/main/java/net/dakotapride/garnished/block/SpecialEffectsBlock.java b/src/main/java/net/dakotapride/garnished/block/SpecialEffectsBlock.java index de545acf..c098b328 100644 --- a/src/main/java/net/dakotapride/garnished/block/SpecialEffectsBlock.java +++ b/src/main/java/net/dakotapride/garnished/block/SpecialEffectsBlock.java @@ -1,9 +1,12 @@ package net.dakotapride.garnished.block; +import net.dakotapride.garnished.item.IGarnishedUtilities; +import net.dakotapride.garnished.registry.GarnishedBlocks; import net.minecraft.core.BlockPos; import net.minecraft.core.particles.ParticleOptions; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.util.RandomSource; +import net.minecraft.world.effect.MobEffect; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.Entity; @@ -12,9 +15,10 @@ import net.minecraft.world.level.block.state.BlockState; @SuppressWarnings("unused") -public class SpecialEffectsBlock { +public class SpecialEffectsBlock implements IGarnishedUtilities { public static class Abyssal { + public static void getParticles(BlockState state, Level level, BlockPos pos, RandomSource random) { for(int i = 0; i < 4; ++i) { double d0 = (double) pos.getX() + random.nextDouble(); @@ -76,4 +80,67 @@ public static void getEffects(Level level, BlockPos pos, BlockState state, Entit } } + + public static class Wyvern { + + public static void getParticles(BlockState state, Level level, BlockPos pos, RandomSource random) { + for(int i = 0; i < 8; ++i) { + double d0 = (double) pos.getX() + random.nextDouble(); + double d1 = (double) pos.getY() + random.nextDouble(); + double d2 = (double) pos.getZ() + random.nextDouble(); + double d3 = ((double) random.nextFloat() - 0.5D) * 0.5D; + double d4 = ((double) random.nextFloat() - 0.5D) * 0.5D; + double d5 = ((double) random.nextFloat() - 0.5D) * 0.5D; + int j = random.nextInt(2) * 2 - 1; + if (!level.getBlockState(pos.west()).is(state.getBlock()) && !level.getBlockState(pos.east()).is(state.getBlock())) { + d0 = (double) pos.getX() + 0.5D + 0.25D * (double) j; + d3 = (random.nextFloat() * 2.0F * (float) j); + } else { + d2 = (double) pos.getZ() + 0.5D + 0.25D * (double) j; + d5 = (random.nextFloat() * 2.0F * (float) j); + } + + level.addParticle(ParticleTypes.ENCHANT, d0, d1, d2, d3, d4, d5); + } + } + + public static void getEffects(Level level, BlockPos pos, BlockState state, Entity entity) { + RandomSource random = RandomSource.create(); + int effect_list = random.nextInt(10); + int effect_trigger = random.nextInt(6); + + if (entity instanceof LivingEntity living) { + + if (effect_trigger == 1 && effect_list >= 0 && effect_list <= 10) { + switch (effect_list) { + case 0 -> applyEffectIfNotPresent(living, MobEffects.LUCK); + case 1 -> applyEffectIfNotPresent(living, MobEffects.MOVEMENT_SPEED); + case 2 -> applyEffectIfNotPresent(living, MobEffects.JUMP); + case 3 -> applyEffectIfNotPresent(living, MobEffects.DAMAGE_RESISTANCE); + case 4 -> applyEffectIfNotPresent(living, MobEffects.REGENERATION); + case 5 -> applyEffectIfNotPresent(living, MobEffects.GLOWING); + case 6 -> applyEffectIfNotPresent(living, MobEffects.DAMAGE_BOOST); + case 7 -> applyEffectIfNotPresent(living, MobEffects.DIG_SPEED); + case 8 -> applyEffectIfNotPresent(living, MobEffects.FIRE_RESISTANCE); + case 9 -> applyEffectIfNotPresent(living, MobEffects.NIGHT_VISION); + case 10 -> applyEffectIfNotPresent(living, MobEffects.INVISIBILITY); + default -> throw new IllegalStateException("Unexpected value: " + effect_list); + } + } + + if (living.getBlockStateOn().is(GarnishedBlocks.DRAGON_STONE.get())) { + System.out.println("Value provided from the mathematical equation, random.nextInt(10): " + effect_list); + System.out.println("Value provided from the mathematical equation, random.nextInt(6): " + effect_trigger); + } + } + + } + + private static void applyEffectIfNotPresent(LivingEntity living, MobEffect effect) { + if (living.hasEffect(effect)) { + } else { + living.addEffect(new MobEffectInstance(effect, tick * 15, 0)); + } + } + } } diff --git a/src/main/java/net/dakotapride/garnished/effect/AustralMobEffect.java b/src/main/java/net/dakotapride/garnished/effect/AugmentedMobEffect.java similarity index 70% rename from src/main/java/net/dakotapride/garnished/effect/AustralMobEffect.java rename to src/main/java/net/dakotapride/garnished/effect/AugmentedMobEffect.java index cf6e765f..b1131294 100644 --- a/src/main/java/net/dakotapride/garnished/effect/AustralMobEffect.java +++ b/src/main/java/net/dakotapride/garnished/effect/AugmentedMobEffect.java @@ -3,8 +3,8 @@ import net.minecraft.world.effect.MobEffect; import net.minecraft.world.effect.MobEffectCategory; -public class AustralMobEffect extends MobEffect { - public AustralMobEffect() { +public class AugmentedMobEffect extends MobEffect { + public AugmentedMobEffect() { super(MobEffectCategory.NEUTRAL, 0xE38D52); } } diff --git a/src/main/java/net/dakotapride/garnished/enchantment/StrikingEnchantment.java b/src/main/java/net/dakotapride/garnished/enchantment/StrikingEnchantment.java index 131241f0..1d347f4d 100644 --- a/src/main/java/net/dakotapride/garnished/enchantment/StrikingEnchantment.java +++ b/src/main/java/net/dakotapride/garnished/enchantment/StrikingEnchantment.java @@ -23,7 +23,18 @@ public int getMaxCost(int level) { @Override public float getDamageBonus(int level, @NotNull MobType mobType) { - return 1.4F + (float)Math.max(0, level - 1) * 0.60F; + return 1.4F + (float)Math.max(0, level - 0.50) * 0.60F; + // 1.4 + ((if 0 is greater than (level - 0.50) = 0, otherwise (level - 0.50)) * 0.60) + + // 1.4 + (((level = 4) (level - 0.50)) * 0.60) + // 1.4 + (3.5 * 0.60) + // 1.4 + 2.1 + // 3.5 damage increase at level 4 + + // 1.4 + (((level = 1) (level - 0.50)) * 0.60) + // 1.4 + (0.50 * 0.60) + // 1.4 + 0.30 + // 1.7 damage increase at level 1 } @Override diff --git a/src/main/java/net/dakotapride/garnished/item/AchingTenebrousClumpFoodItem.java b/src/main/java/net/dakotapride/garnished/item/AchingTenebrousClumpFoodItem.java index cdd4f7c3..6ce97fff 100644 --- a/src/main/java/net/dakotapride/garnished/item/AchingTenebrousClumpFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/AchingTenebrousClumpFoodItem.java @@ -1,10 +1,10 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.world.item.Item; -public class AchingTenebrousClumpFoodItem extends Item implements IGarnishedItem { +public class AchingTenebrousClumpFoodItem extends Item implements IGarnishedUtilities { public AchingTenebrousClumpFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.ACHING_TENEBROUS_CLUMP).stacksTo(16)); + super(properties.food(GarnishedFoodValues.ACHING_TENEBROUS_CLUMP).stacksTo(16)); } } diff --git a/src/main/java/net/dakotapride/garnished/item/AlmondCheeseFoodItem.java b/src/main/java/net/dakotapride/garnished/item/AlmondCheeseFoodItem.java index 7d2c4bc2..d2b9f873 100644 --- a/src/main/java/net/dakotapride/garnished/item/AlmondCheeseFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/AlmondCheeseFoodItem.java @@ -1,10 +1,10 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.world.item.Item; -public class AlmondCheeseFoodItem extends Item implements IGarnishedItem { +public class AlmondCheeseFoodItem extends Item implements IGarnishedUtilities { public AlmondCheeseFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.ALMOND_CHEESE)); + super(properties.food(GarnishedFoodValues.ALMOND_CHEESE)); } } diff --git a/src/main/java/net/dakotapride/garnished/item/AnniversaryCakeSliceFoodItem.java b/src/main/java/net/dakotapride/garnished/item/AnniversaryCakeSliceFoodItem.java index 13441a35..9cfe1dab 100644 --- a/src/main/java/net/dakotapride/garnished/item/AnniversaryCakeSliceFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/AnniversaryCakeSliceFoodItem.java @@ -1,9 +1,9 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; public class AnniversaryCakeSliceFoodItem extends FarmersDelightItem { public AnniversaryCakeSliceFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.ANNIVERSARY_CAKE_SLICE)); + super(properties.food(GarnishedFoodValues.ANNIVERSARY_CAKE_SLICE)); } } diff --git a/src/main/java/net/dakotapride/garnished/item/AppleCiderFoodItem.java b/src/main/java/net/dakotapride/garnished/item/AppleCiderFoodItem.java index e7531eae..82079e5a 100644 --- a/src/main/java/net/dakotapride/garnished/item/AppleCiderFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/AppleCiderFoodItem.java @@ -5,7 +5,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.ChatFormatting; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.client.gui.screens.Screen; @@ -32,7 +32,7 @@ public class AppleCiderFoodItem extends Item { private static final int DRINK_DURATION = 40; public AppleCiderFoodItem(Properties properties) { - super(properties.stacksTo(8).food(GarnishedFoods.APPLE_CIDER)); + super(properties.stacksTo(8).food(GarnishedFoodValues.GENERIC_BOTTLED_FOOD_OR_DRINK_build)); } @Override diff --git a/src/main/java/net/dakotapride/garnished/item/BaklavaFoodItem.java b/src/main/java/net/dakotapride/garnished/item/BaklavaFoodItem.java index e614cd1d..0fee29bd 100644 --- a/src/main/java/net/dakotapride/garnished/item/BaklavaFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/BaklavaFoodItem.java @@ -1,10 +1,10 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.world.item.Item; public class BaklavaFoodItem extends Item { public BaklavaFoodItem(Properties properties) { - super(properties.stacksTo(16).food(GarnishedFoods.BAKLAVA)); + super(properties.stacksTo(16).food(GarnishedFoodValues.BAKLAVA)); } } diff --git a/src/main/java/net/dakotapride/garnished/item/BambooClodFoodItem.java b/src/main/java/net/dakotapride/garnished/item/BambooClodFoodItem.java index 3e012cf9..4d421455 100644 --- a/src/main/java/net/dakotapride/garnished/item/BambooClodFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/BambooClodFoodItem.java @@ -1,10 +1,10 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.world.item.Item; -public class BambooClodFoodItem extends Item implements IGarnishedItem { +public class BambooClodFoodItem extends Item implements IGarnishedUtilities { public BambooClodFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.BAMBOO_CLOD)); + super(properties.food(GarnishedFoodValues.BAMBOO_CLOD)); } } diff --git a/src/main/java/net/dakotapride/garnished/item/BewilderedPastryFoodItem.java b/src/main/java/net/dakotapride/garnished/item/BewilderedPastryFoodItem.java index 7a1ecd47..71f3194b 100644 --- a/src/main/java/net/dakotapride/garnished/item/BewilderedPastryFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/BewilderedPastryFoodItem.java @@ -1,10 +1,10 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.world.item.Item; -public class BewilderedPastryFoodItem extends Item implements IGarnishedItem { +public class BewilderedPastryFoodItem extends Item implements IGarnishedUtilities { public BewilderedPastryFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.BEWILDERED_PASTRY).stacksTo(16)); + super(properties.food(GarnishedFoodValues.BEWILDERED_PASTRY).stacksTo(16)); } } diff --git a/src/main/java/net/dakotapride/garnished/item/BitterAlmondFoodItem.java b/src/main/java/net/dakotapride/garnished/item/BitterAlmondFoodItem.java index d4c1226d..baa29476 100644 --- a/src/main/java/net/dakotapride/garnished/item/BitterAlmondFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/BitterAlmondFoodItem.java @@ -1,25 +1,25 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import java.util.List; + +import javax.annotation.Nullable; + +import org.jetbrains.annotations.NotNull; + +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.Style; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.Level; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.util.List; - -public class BitterAlmondFoodItem extends Item implements IGarnishedItem { +public class BitterAlmondFoodItem extends Item implements IGarnishedUtilities { public BitterAlmondFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.BITTER_ALMOND)); + super(properties.food(GarnishedFoodValues.BITTER_ALMOND)); } @Override public void appendHoverText(@NotNull ItemStack stack, @Nullable Level level, List tooltip, @NotNull TooltipFlag isAdvanced) { - tooltip.add(Component.translatable(garnishedText()).withStyle(getStandardColouring())); + tooltip.add(Component.translatable(garnishedText()).withStyle(standard())); } } diff --git a/src/main/java/net/dakotapride/garnished/item/BitterAppleCiderFoodItem.java b/src/main/java/net/dakotapride/garnished/item/BitterAppleCiderFoodItem.java index 4d13a3f2..6107a471 100644 --- a/src/main/java/net/dakotapride/garnished/item/BitterAppleCiderFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/BitterAppleCiderFoodItem.java @@ -6,7 +6,7 @@ import org.jetbrains.annotations.NotNull; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.ChatFormatting; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.client.gui.screens.Screen; @@ -18,7 +18,6 @@ import net.minecraft.stats.Stats; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResultHolder; -import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; @@ -30,11 +29,11 @@ import net.minecraft.world.item.UseAnim; import net.minecraft.world.level.Level; -public class BitterAppleCiderFoodItem extends Item implements IGarnishedItem { +public class BitterAppleCiderFoodItem extends Item implements IGarnishedUtilities { private static final int DRINK_DURATION = 40; public BitterAppleCiderFoodItem(Properties properties) { - super(properties.stacksTo(8).food(GarnishedFoods.APPLE_CIDER)); + super(properties.stacksTo(8).food(GarnishedFoodValues.BITTER_APPLE_CIDER)); } @Override @@ -64,9 +63,6 @@ public void appendHoverText(@NotNull ItemStack stack, @Nullable Level pLevel, @N if (!level.isClientSide) { livingEntity.removeEffect(MobEffects.WITHER); - - livingEntity.addEffect(new MobEffectInstance(MobEffects.MOVEMENT_SLOWDOWN, getBitterAppleCiderEffectDuration, 1)); - livingEntity.addEffect(new MobEffectInstance(MobEffects.DAMAGE_RESISTANCE, getBitterAppleCiderEffectDuration, 2)); } if (stack.isEmpty()) { diff --git a/src/main/java/net/dakotapride/garnished/item/BlazingDelightFoodItem.java b/src/main/java/net/dakotapride/garnished/item/BlazingDelightFoodItem.java index 8fbcdc0a..e5723b1c 100644 --- a/src/main/java/net/dakotapride/garnished/item/BlazingDelightFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/BlazingDelightFoodItem.java @@ -1,6 +1,8 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import org.jetbrains.annotations.NotNull; + +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.dakotapride.garnished.registry.GarnishedItems; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.server.level.ServerPlayer; @@ -9,23 +11,19 @@ import net.minecraft.stats.Stats; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResultHolder; -import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemUtils; -import net.minecraft.world.item.Items; import net.minecraft.world.item.UseAnim; import net.minecraft.world.level.Level; -import org.jetbrains.annotations.NotNull; - -public class BlazingDelightFoodItem extends Item implements IGarnishedItem { +public class BlazingDelightFoodItem extends Item implements IGarnishedUtilities { private static final int DRINK_DURATION = 60; public BlazingDelightFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.BLAZING_DELIGHT).stacksTo(16)); + super(properties.food(GarnishedFoodValues.BLAZING_DELIGHT).stacksTo(16)); } @Override diff --git a/src/main/java/net/dakotapride/garnished/item/BokChoyFoodItem.java b/src/main/java/net/dakotapride/garnished/item/BokChoyFoodItem.java index 98047308..9aa86eb5 100644 --- a/src/main/java/net/dakotapride/garnished/item/BokChoyFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/BokChoyFoodItem.java @@ -1,10 +1,10 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.world.item.Item; -public class BokChoyFoodItem extends Item implements IGarnishedItem { +public class BokChoyFoodItem extends Item implements IGarnishedUtilities { public BokChoyFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.BOK_CHOY)); + super(properties.food(GarnishedFoodValues.BOK_CHOY)); } } diff --git a/src/main/java/net/dakotapride/garnished/item/BottleOfCrestfallenFloraFoodItem.java b/src/main/java/net/dakotapride/garnished/item/BottleOfCrestfallenFloraFoodItem.java deleted file mode 100644 index f1b7b889..00000000 --- a/src/main/java/net/dakotapride/garnished/item/BottleOfCrestfallenFloraFoodItem.java +++ /dev/null @@ -1,44 +0,0 @@ -package net.dakotapride.garnished.item; - -import org.jetbrains.annotations.NotNull; - -import net.dakotapride.garnished.registry.GarnishedFoods; -import net.minecraft.advancements.CriteriaTriggers; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.stats.Stats; -import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Items; -import net.minecraft.world.level.Level; - -public class BottleOfCrestfallenFloraFoodItem extends Item implements IGarnishedItem { - public BottleOfCrestfallenFloraFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.BOTTLE_OF_CRESTFALLEN_FLORA).stacksTo(16)); - } - - @Override - public @NotNull ItemStack finishUsingItem(@NotNull ItemStack stack, @NotNull Level level, @NotNull LivingEntity livingEntity) { - super.finishUsingItem(stack, level, livingEntity); - if (livingEntity instanceof ServerPlayer serverPlayer) { - CriteriaTriggers.CONSUME_ITEM.trigger(serverPlayer, stack); - serverPlayer.awardStat(Stats.ITEM_USED.get(this)); - } - - if (stack.isEmpty()) { - return new ItemStack(Items.GLASS_BOTTLE); - } else { - if (livingEntity instanceof Player && !((Player)livingEntity).getAbilities().instabuild) { - ItemStack itemStack = new ItemStack(Items.GLASS_BOTTLE); - Player player = (Player)livingEntity; - if (!player.getInventory().add(itemStack)) { - player.drop(itemStack, false); - } - } - - return stack; - } - - } -} diff --git a/src/main/java/net/dakotapride/garnished/item/BottledEnderJellyFoodItem.java b/src/main/java/net/dakotapride/garnished/item/BottledEnderJellyFoodItem.java index 081af71f..37e2c0dd 100644 --- a/src/main/java/net/dakotapride/garnished/item/BottledEnderJellyFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/BottledEnderJellyFoodItem.java @@ -2,7 +2,7 @@ import org.jetbrains.annotations.NotNull; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.server.level.ServerPlayer; import net.minecraft.stats.Stats; @@ -16,9 +16,9 @@ import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; -public class BottledEnderJellyFoodItem extends Item implements IGarnishedItem { +public class BottledEnderJellyFoodItem extends Item implements IGarnishedUtilities { public BottledEnderJellyFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.BOTTLED_ENDER_JELLY).stacksTo(16)); + super(properties.food(GarnishedFoodValues.BOTTLED_ENDER_JELLY).stacksTo(16)); } @Override diff --git a/src/main/java/net/dakotapride/garnished/item/BottledMalodorousMixtureFoodItem.java b/src/main/java/net/dakotapride/garnished/item/BottledMalodorousMixtureFoodItem.java index cb8ff3b5..9a5e6158 100644 --- a/src/main/java/net/dakotapride/garnished/item/BottledMalodorousMixtureFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/BottledMalodorousMixtureFoodItem.java @@ -2,7 +2,7 @@ import org.jetbrains.annotations.NotNull; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.server.level.ServerPlayer; import net.minecraft.stats.Stats; @@ -13,9 +13,9 @@ import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; -public class BottledMalodorousMixtureFoodItem extends Item implements IGarnishedItem { +public class BottledMalodorousMixtureFoodItem extends Item implements IGarnishedUtilities { public BottledMalodorousMixtureFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.BOTTLED_MALODOROUS_MIXTURE).stacksTo(16)); + super(properties.food(GarnishedFoodValues.BOTTLED_MALODOROUS_MIXTURE).stacksTo(16)); } @Override diff --git a/src/main/java/net/dakotapride/garnished/item/BottledPeanutOilItem.java b/src/main/java/net/dakotapride/garnished/item/BottledPeanutOilItem.java index f5b89f44..c335a1f0 100644 --- a/src/main/java/net/dakotapride/garnished/item/BottledPeanutOilItem.java +++ b/src/main/java/net/dakotapride/garnished/item/BottledPeanutOilItem.java @@ -5,7 +5,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.ChatFormatting; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.client.gui.screens.Screen; @@ -32,7 +32,7 @@ public class BottledPeanutOilItem extends Item { private static final int DRINK_DURATION = 40; public BottledPeanutOilItem(Properties properties) { - super(properties.stacksTo(8).food(GarnishedFoods.PEANUT_OIL)); + super(properties.stacksTo(8).food(GarnishedFoodValues.GENERIC_BOTTLED_FOOD_OR_DRINK_build)); } @Override diff --git a/src/main/java/net/dakotapride/garnished/item/BrowniePieceFoodItem.java b/src/main/java/net/dakotapride/garnished/item/BrowniePieceFoodItem.java new file mode 100644 index 00000000..4ade6578 --- /dev/null +++ b/src/main/java/net/dakotapride/garnished/item/BrowniePieceFoodItem.java @@ -0,0 +1,9 @@ +package net.dakotapride.garnished.item; + +import net.dakotapride.garnished.registry.GarnishedFoodValues; + +public class BrowniePieceFoodItem extends FarmersDelightItem { + public BrowniePieceFoodItem(Properties properties) { + super(properties.food(GarnishedFoodValues.BROWNIE_PIECE)); + } +} diff --git a/src/main/java/net/dakotapride/garnished/item/CacklingPieFoodItem.java b/src/main/java/net/dakotapride/garnished/item/CacklingPieFoodItem.java index d637656f..0a5bfda1 100644 --- a/src/main/java/net/dakotapride/garnished/item/CacklingPieFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/CacklingPieFoodItem.java @@ -1,10 +1,10 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.world.item.Item; -public class CacklingPieFoodItem extends Item implements IGarnishedItem { +public class CacklingPieFoodItem extends Item implements IGarnishedUtilities { public CacklingPieFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.CACKLING_PIE)); + super(properties.food(GarnishedFoodValues.CACKLING_PIE)); } } diff --git a/src/main/java/net/dakotapride/garnished/item/CashewCookieFoodItem.java b/src/main/java/net/dakotapride/garnished/item/CashewCookieFoodItem.java index 3e11d844..1ab61c80 100644 --- a/src/main/java/net/dakotapride/garnished/item/CashewCookieFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/CashewCookieFoodItem.java @@ -1,10 +1,10 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.world.item.Item; -public class CashewCookieFoodItem extends Item implements IGarnishedItem { +public class CashewCookieFoodItem extends Item implements IGarnishedUtilities { public CashewCookieFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.CASHEW_COOKIE)); + super(properties.food(GarnishedFoodValues.CASHEW_COOKIE)); } } diff --git a/src/main/java/net/dakotapride/garnished/item/CashewFruitItem.java b/src/main/java/net/dakotapride/garnished/item/CashewFruitItem.java index b86302d1..bf6de455 100644 --- a/src/main/java/net/dakotapride/garnished/item/CashewFruitItem.java +++ b/src/main/java/net/dakotapride/garnished/item/CashewFruitItem.java @@ -5,7 +5,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerPlayer; @@ -16,9 +16,9 @@ import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.Level; -public class CashewFruitItem extends Item implements IGarnishedItem { +public class CashewFruitItem extends Item implements IGarnishedUtilities { public CashewFruitItem(Properties properties) { - super(properties.food(GarnishedFoods.CASHEW_FRUIT)); + super(properties.food(GarnishedFoodValues.CASHEW_APPLE)); } @Override diff --git a/src/main/java/net/dakotapride/garnished/item/CashewSorbetDelightFoodItem.java b/src/main/java/net/dakotapride/garnished/item/CashewSorbetDelightFoodItem.java index bc82d7e3..cf3b7d59 100644 --- a/src/main/java/net/dakotapride/garnished/item/CashewSorbetDelightFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/CashewSorbetDelightFoodItem.java @@ -1,6 +1,8 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import org.jetbrains.annotations.NotNull; + +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.server.level.ServerPlayer; import net.minecraft.stats.Stats; @@ -14,11 +16,9 @@ import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; -import org.jetbrains.annotations.NotNull; - -public class CashewSorbetDelightFoodItem extends Item implements IGarnishedItem { +public class CashewSorbetDelightFoodItem extends Item implements IGarnishedUtilities { public CashewSorbetDelightFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.CASHEW_SORBET_DELIGHT).stacksTo(1)); + super(properties.food(GarnishedFoodValues.CASHEW_SORBET_DELIGHT).stacksTo(1)); } @Override diff --git a/src/main/java/net/dakotapride/garnished/item/CashewSorbetScoopFoodItem.java b/src/main/java/net/dakotapride/garnished/item/CashewSorbetScoopFoodItem.java index 64312081..d36ff62e 100644 --- a/src/main/java/net/dakotapride/garnished/item/CashewSorbetScoopFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/CashewSorbetScoopFoodItem.java @@ -1,10 +1,10 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.world.item.Item; -public class CashewSorbetScoopFoodItem extends Item implements IGarnishedItem { +public class CashewSorbetScoopFoodItem extends Item implements IGarnishedUtilities { public CashewSorbetScoopFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.CASHEW_SORBET_SCOOP)); + super(properties.food(GarnishedFoodValues.CASHEW_SORBET_SCOOP)); } } diff --git a/src/main/java/net/dakotapride/garnished/item/ChampionsOmeletteFoodItem.java b/src/main/java/net/dakotapride/garnished/item/ChampionsOmeletteFoodItem.java index bb8fbe44..25f167c4 100644 --- a/src/main/java/net/dakotapride/garnished/item/ChampionsOmeletteFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/ChampionsOmeletteFoodItem.java @@ -1,10 +1,10 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.world.item.Item; -public class ChampionsOmeletteFoodItem extends Item implements IGarnishedItem { +public class ChampionsOmeletteFoodItem extends Item implements IGarnishedUtilities { public ChampionsOmeletteFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.CHAMPIONS_OMELETTE).stacksTo(16)); + super(properties.food(GarnishedFoodValues.CHAMPIONS_OMELETTE).stacksTo(16)); } } diff --git a/src/main/java/net/dakotapride/garnished/item/ChilledAppleFoodItem.java b/src/main/java/net/dakotapride/garnished/item/ChilledAppleFoodItem.java index 75274ba5..fbd7f59a 100644 --- a/src/main/java/net/dakotapride/garnished/item/ChilledAppleFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/ChilledAppleFoodItem.java @@ -1,10 +1,10 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.world.item.Item; -public class ChilledAppleFoodItem extends Item implements IGarnishedItem { +public class ChilledAppleFoodItem extends Item implements IGarnishedUtilities { public ChilledAppleFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.CHILLED_APPLE)); + super(properties.food(GarnishedFoodValues.CHILLED_APPLE)); } } diff --git a/src/main/java/net/dakotapride/garnished/item/ChocolateGlazedNutFoodItem.java b/src/main/java/net/dakotapride/garnished/item/ChocolateGlazedNutFoodItem.java index 82e3f9ba..c1b7e429 100644 --- a/src/main/java/net/dakotapride/garnished/item/ChocolateGlazedNutFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/ChocolateGlazedNutFoodItem.java @@ -1,24 +1,24 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import java.util.List; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.network.chat.Component; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.Level; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.util.List; - -public class ChocolateGlazedNutFoodItem extends Item implements IGarnishedItem { +public class ChocolateGlazedNutFoodItem extends Item implements IGarnishedUtilities { public ChocolateGlazedNutFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.CHOCOLATE_GLAZED_NUT)); + super(properties.food(GarnishedFoodValues.CHOCOLATE_GLAZED_NUT)); } @Override public void appendHoverText(@NotNull ItemStack stack, @Nullable Level level, List tooltip, @NotNull TooltipFlag isAdvanced) { - tooltip.add(Component.translatable(chocolateGlazedText()).setStyle(getChocolateGlazedColouring())); + tooltip.add(Component.translatable(chocolateGlazedText()).setStyle(chocolateGlazed())); } } diff --git a/src/main/java/net/dakotapride/garnished/item/ChocolateGlazedNutMixFoodItem.java b/src/main/java/net/dakotapride/garnished/item/ChocolateGlazedNutMixFoodItem.java index 4f10f52a..e77036dc 100644 --- a/src/main/java/net/dakotapride/garnished/item/ChocolateGlazedNutMixFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/ChocolateGlazedNutMixFoodItem.java @@ -5,20 +5,20 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.network.chat.Component; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.Level; -public class ChocolateGlazedNutMixFoodItem extends Item implements IGarnishedItem { +public class ChocolateGlazedNutMixFoodItem extends Item implements IGarnishedUtilities { public ChocolateGlazedNutMixFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.CHOCOLATE_GLAZED_NUT_MIX).stacksTo(16)); + super(properties.food(GarnishedFoodValues.CHOCOLATE_GLAZED_NUT_MIX).stacksTo(16)); } @Override public void appendHoverText(@NotNull ItemStack stack, @Nullable Level level, List tooltip, @NotNull TooltipFlag isAdvanced) { - tooltip.add(Component.translatable(chocolateGlazedText()).setStyle(getChocolateGlazedColouring())); + tooltip.add(Component.translatable(chocolateGlazedText()).setStyle(chocolateGlazed())); } } diff --git a/src/main/java/net/dakotapride/garnished/item/ChorusBowlFoodItem.java b/src/main/java/net/dakotapride/garnished/item/ChorusBowlFoodItem.java index 864edc9f..803aca6b 100644 --- a/src/main/java/net/dakotapride/garnished/item/ChorusBowlFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/ChorusBowlFoodItem.java @@ -2,7 +2,7 @@ import org.jetbrains.annotations.NotNull; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.dakotapride.garnished.registry.GarnishedItems; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.server.level.ServerPlayer; @@ -16,9 +16,9 @@ import net.minecraft.world.item.ItemUtils; import net.minecraft.world.level.Level; -public class ChorusBowlFoodItem extends Item implements IGarnishedItem { +public class ChorusBowlFoodItem extends Item implements IGarnishedUtilities { public ChorusBowlFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.CHORUS_BOWL).stacksTo(1)); + super(properties.food(GarnishedFoodValues.CHORUS_BOWL).stacksTo(1)); } @Override diff --git a/src/main/java/net/dakotapride/garnished/item/ChorusCocktailItem.java b/src/main/java/net/dakotapride/garnished/item/ChorusCocktailItem.java index 1e9391c0..a5476f9a 100644 --- a/src/main/java/net/dakotapride/garnished/item/ChorusCocktailItem.java +++ b/src/main/java/net/dakotapride/garnished/item/ChorusCocktailItem.java @@ -1,14 +1,12 @@ package net.dakotapride.garnished.item; -import net.minecraft.sounds.SoundEvent; -import net.minecraft.sounds.SoundEvents; -import net.minecraft.world.item.UseAnim; - import org.jetbrains.annotations.NotNull; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.server.level.ServerPlayer; +import net.minecraft.sounds.SoundEvent; +import net.minecraft.sounds.SoundEvents; import net.minecraft.stats.Stats; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResultHolder; @@ -18,12 +16,13 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemUtils; import net.minecraft.world.item.Items; +import net.minecraft.world.item.UseAnim; import net.minecraft.world.level.Level; -public class ChorusCocktailItem extends Item implements IGarnishedItem { +public class ChorusCocktailItem extends Item implements IGarnishedUtilities { private static final int DRINK_DURATION = 40; public ChorusCocktailItem(Properties properties) { - super(properties.food(GarnishedFoods.CHORUS_COCKTAIL).stacksTo(16)); + super(properties.food(GarnishedFoodValues.CHORUS_COCKTAIL).stacksTo(16)); } @Override diff --git a/src/main/java/net/dakotapride/garnished/item/ChorusCookieFoodItem.java b/src/main/java/net/dakotapride/garnished/item/ChorusCookieFoodItem.java index b1a1997a..72f5eebd 100644 --- a/src/main/java/net/dakotapride/garnished/item/ChorusCookieFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/ChorusCookieFoodItem.java @@ -1,10 +1,10 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.world.item.Item; -public class ChorusCookieFoodItem extends Item implements IGarnishedItem { +public class ChorusCookieFoodItem extends Item implements IGarnishedUtilities { public ChorusCookieFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.CHORUS_COOKIE)); + super(properties.food(GarnishedFoodValues.CHORUS_COOKIE)); } } diff --git a/src/main/java/net/dakotapride/garnished/item/CinderFlourNutFoodItem.java b/src/main/java/net/dakotapride/garnished/item/CinderFlourNutFoodItem.java index dbd971e2..5eb330e0 100644 --- a/src/main/java/net/dakotapride/garnished/item/CinderFlourNutFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/CinderFlourNutFoodItem.java @@ -1,24 +1,24 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import java.util.List; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.network.chat.Component; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.Level; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.util.List; - -public class CinderFlourNutFoodItem extends Item implements IGarnishedItem { +public class CinderFlourNutFoodItem extends Item implements IGarnishedUtilities { public CinderFlourNutFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.GARNISHED_NUT)); + super(properties.food(GarnishedFoodValues.GARNISHED_NUT)); } @Override public void appendHoverText(@NotNull ItemStack stack, @Nullable Level level, List tooltip, @NotNull TooltipFlag isAdvanced) { - tooltip.add(Component.translatable(cinderFlourText()).withStyle(getCinderFlourColouring())); + tooltip.add(Component.translatable(cinderFlourText()).withStyle(cinderFlour())); } } diff --git a/src/main/java/net/dakotapride/garnished/item/CinderRollFoodItem.java b/src/main/java/net/dakotapride/garnished/item/CinderRollFoodItem.java index 09aaec79..bb128daa 100644 --- a/src/main/java/net/dakotapride/garnished/item/CinderRollFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/CinderRollFoodItem.java @@ -1,10 +1,10 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.world.item.Item; -public class CinderRollFoodItem extends Item implements IGarnishedItem { +public class CinderRollFoodItem extends Item implements IGarnishedUtilities { public CinderRollFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.CINDER_ROLL).stacksTo(16)); + super(properties.food(GarnishedFoodValues.CINDER_ROLL).stacksTo(16)); } } diff --git a/src/main/java/net/dakotapride/garnished/item/CoalTruffleFoodItem.java b/src/main/java/net/dakotapride/garnished/item/CoalTruffleFoodItem.java index 181dca2d..adc86df2 100644 --- a/src/main/java/net/dakotapride/garnished/item/CoalTruffleFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/CoalTruffleFoodItem.java @@ -1,33 +1,11 @@ package net.dakotapride.garnished.item; -import org.jetbrains.annotations.NotNull; - -import net.dakotapride.garnished.registry.GarnishedEffects; -import net.dakotapride.garnished.registry.GarnishedFoods; -import net.minecraft.advancements.CriteriaTriggers; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.stats.Stats; -import net.minecraft.world.effect.MobEffectInstance; -import net.minecraft.world.effect.MobEffects; -import net.minecraft.world.entity.LivingEntity; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.Level; - -public class CoalTruffleFoodItem extends Item implements IGarnishedItem { - public CoalTruffleFoodItem(Properties properties) { - super(properties.stacksTo(16).food(GarnishedFoods.COAL_TRUFFLE)); - } - - @Override - public @NotNull ItemStack finishUsingItem(@NotNull ItemStack stack, @NotNull Level level, @NotNull LivingEntity livingEntity) { - if (livingEntity instanceof ServerPlayer serverPlayer && serverPlayer.hasEffect(GarnishedEffects.SUGAR_HIGH)) { - CriteriaTriggers.CONSUME_ITEM.trigger(serverPlayer, stack); - serverPlayer.awardStat(Stats.ITEM_USED.get(this)); - livingEntity.addEffect(new MobEffectInstance(MobEffects.REGENERATION, baseTick * 3, 1)); - } +public class CoalTruffleFoodItem extends Item implements IGarnishedUtilities { - return super.finishUsingItem(stack, level, livingEntity); + public CoalTruffleFoodItem(Properties properties) { + super(properties.stacksTo(16).food(GarnishedFoodValues.COAL_TRUFFLE)); } } diff --git a/src/main/java/net/dakotapride/garnished/item/CookedPolarBearMeatItem.java b/src/main/java/net/dakotapride/garnished/item/CookedPolarBearMeatItem.java index ead233f0..5a5cfa95 100644 --- a/src/main/java/net/dakotapride/garnished/item/CookedPolarBearMeatItem.java +++ b/src/main/java/net/dakotapride/garnished/item/CookedPolarBearMeatItem.java @@ -1,11 +1,11 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.world.item.Item; -public class CookedPolarBearMeatItem extends Item implements IGarnishedItem { +public class CookedPolarBearMeatItem extends Item implements IGarnishedUtilities { public CookedPolarBearMeatItem(Properties properties) { - super(properties.food(GarnishedFoods.COOKED_POLAR_BEAR_MEAT)); + super(properties.food(GarnishedFoodValues.COOKED_POLAR_BEAR_MEAT)); } } diff --git a/src/main/java/net/dakotapride/garnished/item/CookedTenebrousMeatFoodItem.java b/src/main/java/net/dakotapride/garnished/item/CookedTenebrousMeatFoodItem.java index cd66164f..de912aca 100644 --- a/src/main/java/net/dakotapride/garnished/item/CookedTenebrousMeatFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/CookedTenebrousMeatFoodItem.java @@ -1,10 +1,10 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.world.item.Item; -public class CookedTenebrousMeatFoodItem extends Item implements IGarnishedItem { +public class CookedTenebrousMeatFoodItem extends Item implements IGarnishedUtilities { public CookedTenebrousMeatFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.COOKED_TENEBROUS_MEAT)); + super(properties.food(GarnishedFoodValues.COOKED_TENEBROUS_MEAT)); } } diff --git a/src/main/java/net/dakotapride/garnished/item/CosmicBrewFoodItem.java b/src/main/java/net/dakotapride/garnished/item/CosmicBrewFoodItem.java index dd94ca2a..ac057e55 100644 --- a/src/main/java/net/dakotapride/garnished/item/CosmicBrewFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/CosmicBrewFoodItem.java @@ -2,7 +2,7 @@ import org.jetbrains.annotations.NotNull; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.server.level.ServerPlayer; import net.minecraft.stats.Stats; @@ -16,9 +16,9 @@ import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; -public class CosmicBrewFoodItem extends Item implements IGarnishedItem { +public class CosmicBrewFoodItem extends Item implements IGarnishedUtilities { public CosmicBrewFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.COSMIC_BREW).stacksTo(1)); + super(properties.food(GarnishedFoodValues.COSMIC_BREW).stacksTo(1)); } @Override diff --git a/src/main/java/net/dakotapride/garnished/item/CrypticAppleCiderFoodItem.java b/src/main/java/net/dakotapride/garnished/item/CrypticAppleCiderFoodItem.java index 35fd5f14..50cbd718 100644 --- a/src/main/java/net/dakotapride/garnished/item/CrypticAppleCiderFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/CrypticAppleCiderFoodItem.java @@ -5,7 +5,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.ChatFormatting; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.client.gui.screens.Screen; @@ -17,7 +17,6 @@ import net.minecraft.stats.Stats; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResultHolder; -import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; @@ -29,10 +28,10 @@ import net.minecraft.world.item.UseAnim; import net.minecraft.world.level.Level; -public class CrypticAppleCiderFoodItem extends Item implements IGarnishedItem { +public class CrypticAppleCiderFoodItem extends Item implements IGarnishedUtilities { private static final int DRINK_DURATION = 40; public CrypticAppleCiderFoodItem(Properties properties) { - super(properties.stacksTo(8).food(GarnishedFoods.CRYPTIC_APPLE_CIDER)); + super(properties.stacksTo(8).food(GarnishedFoodValues.CRYPTIC_APPLE_CIDER)); } @Override @@ -61,8 +60,6 @@ public void appendHoverText(@NotNull ItemStack stack, @Nullable Level level, @No if (livingEntity instanceof ServerPlayer serverPlayer) { CriteriaTriggers.CONSUME_ITEM.trigger(serverPlayer, stack); serverPlayer.awardStat(Stats.ITEM_USED.get(this)); - - livingEntity.addEffect(new MobEffectInstance(getCrypticAppleCiderEffect(), getCrypticAppleCiderEffectDuration, 2)); } if (!level.isClientSide) { diff --git a/src/main/java/net/dakotapride/garnished/item/DesolateStewFoodItem.java b/src/main/java/net/dakotapride/garnished/item/DesolateStewFoodItem.java index 882a684b..c3d8704f 100644 --- a/src/main/java/net/dakotapride/garnished/item/DesolateStewFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/DesolateStewFoodItem.java @@ -2,7 +2,7 @@ import org.jetbrains.annotations.NotNull; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.server.level.ServerPlayer; import net.minecraft.stats.Stats; @@ -16,9 +16,9 @@ import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; -public class DesolateStewFoodItem extends Item implements IGarnishedItem { +public class DesolateStewFoodItem extends Item implements IGarnishedUtilities { public DesolateStewFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.DESOLATE_STEW).stacksTo(1)); + super(properties.food(GarnishedFoodValues.DESOLATE_STEW).stacksTo(1)); } @Override diff --git a/src/main/java/net/dakotapride/garnished/item/DriedDulseKelpFoodItem.java b/src/main/java/net/dakotapride/garnished/item/DriedDulseKelpFoodItem.java index c31aad0c..524c3475 100644 --- a/src/main/java/net/dakotapride/garnished/item/DriedDulseKelpFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/DriedDulseKelpFoodItem.java @@ -1,10 +1,10 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.world.item.Item; -public class DriedDulseKelpFoodItem extends Item implements IGarnishedItem { +public class DriedDulseKelpFoodItem extends Item implements IGarnishedUtilities { public DriedDulseKelpFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.DRIED_DULSE_KELP)); + super(properties.food(GarnishedFoodValues.DRIED_DULSE_KELP)); } } diff --git a/src/main/java/net/dakotapride/garnished/item/DriedVermilionKelpFoodItem.java b/src/main/java/net/dakotapride/garnished/item/DriedVermilionKelpFoodItem.java index a3fb95ab..ba718cfd 100644 --- a/src/main/java/net/dakotapride/garnished/item/DriedVermilionKelpFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/DriedVermilionKelpFoodItem.java @@ -1,10 +1,10 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.world.item.Item; -public class DriedVermilionKelpFoodItem extends Item implements IGarnishedItem { +public class DriedVermilionKelpFoodItem extends Item implements IGarnishedUtilities { public DriedVermilionKelpFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.DRIED_VERMILION_KELP)); + super(properties.food(GarnishedFoodValues.GENERIC_DRIED_KELP)); } } diff --git a/src/main/java/net/dakotapride/garnished/item/DustyRegaleFoodItem.java b/src/main/java/net/dakotapride/garnished/item/DustyRegaleFoodItem.java index 3e17b94c..a1f03826 100644 --- a/src/main/java/net/dakotapride/garnished/item/DustyRegaleFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/DustyRegaleFoodItem.java @@ -2,7 +2,7 @@ import org.jetbrains.annotations.NotNull; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.server.level.ServerPlayer; import net.minecraft.stats.Stats; @@ -16,9 +16,9 @@ import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; -public class DustyRegaleFoodItem extends Item implements IGarnishedItem { +public class DustyRegaleFoodItem extends Item implements IGarnishedUtilities { public DustyRegaleFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.DUSTY_REGALE)); + super(properties.food(GarnishedFoodValues.DUSTY_REGALE)); } @Override diff --git a/src/main/java/net/dakotapride/garnished/item/EnderJellyFoodItem.java b/src/main/java/net/dakotapride/garnished/item/EnderJellyFoodItem.java index 9a8b50bf..3fe7aa0f 100644 --- a/src/main/java/net/dakotapride/garnished/item/EnderJellyFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/EnderJellyFoodItem.java @@ -1,10 +1,10 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.world.item.Item; -public class EnderJellyFoodItem extends Item implements IGarnishedItem { +public class EnderJellyFoodItem extends Item implements IGarnishedUtilities { public EnderJellyFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.ENDER_JELLY)); + super(properties.food(GarnishedFoodValues.ENDER_JELLY)); } } diff --git a/src/main/java/net/dakotapride/garnished/item/EtherealConcoctionFoodItem.java b/src/main/java/net/dakotapride/garnished/item/EtherealConcoctionFoodItem.java index d8cad24f..b4fcdfc1 100644 --- a/src/main/java/net/dakotapride/garnished/item/EtherealConcoctionFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/EtherealConcoctionFoodItem.java @@ -2,7 +2,7 @@ import org.jetbrains.annotations.NotNull; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.server.level.ServerPlayer; import net.minecraft.stats.Stats; @@ -16,9 +16,9 @@ import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; -public class EtherealConcoctionFoodItem extends Item implements IGarnishedItem { +public class EtherealConcoctionFoodItem extends Item implements IGarnishedUtilities { public EtherealConcoctionFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.ETHEREAL_CONCOCTION).stacksTo(1)); + super(properties.food(GarnishedFoodValues.ETHEREAL_CONCOCTION).stacksTo(1)); } @Override diff --git a/src/main/java/net/dakotapride/garnished/item/ExplorersConcoctionFoodItem.java b/src/main/java/net/dakotapride/garnished/item/ExplorersConcoctionFoodItem.java index 7d0a28c9..2a12912d 100644 --- a/src/main/java/net/dakotapride/garnished/item/ExplorersConcoctionFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/ExplorersConcoctionFoodItem.java @@ -2,7 +2,7 @@ import org.jetbrains.annotations.NotNull; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.server.level.ServerPlayer; import net.minecraft.stats.Stats; @@ -16,9 +16,9 @@ import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; -public class ExplorersConcoctionFoodItem extends Item implements IGarnishedItem { +public class ExplorersConcoctionFoodItem extends Item implements IGarnishedUtilities { public ExplorersConcoctionFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.EXPLORERS_CONCOCTION).stacksTo(1)); + super(properties.food(GarnishedFoodValues.EXPLORERS_CONCOCTION).stacksTo(1)); } @Override diff --git a/src/main/java/net/dakotapride/garnished/item/FarseerBrewFoodItem.java b/src/main/java/net/dakotapride/garnished/item/FarseerBrewFoodItem.java index c732fa0c..3846ba7a 100644 --- a/src/main/java/net/dakotapride/garnished/item/FarseerBrewFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/FarseerBrewFoodItem.java @@ -2,14 +2,12 @@ import org.jetbrains.annotations.NotNull; -import net.dakotapride.garnished.registry.GarnishedEffects; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.server.level.ServerPlayer; import net.minecraft.stats.Stats; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResultHolder; -import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; @@ -18,9 +16,9 @@ import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; -public class FarseerBrewFoodItem extends Item implements IGarnishedItem { +public class FarseerBrewFoodItem extends Item implements IGarnishedUtilities { public FarseerBrewFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.FARSEER_BREW).stacksTo(1)); + super(properties.food(GarnishedFoodValues.FARSEER_BREW).stacksTo(1)); } @Override @@ -31,8 +29,8 @@ public FarseerBrewFoodItem(Properties properties) { serverPlayer.awardStat(Stats.ITEM_USED.get(this)); } - if (!level.isClientSide) - livingEntity.addEffect(new MobEffectInstance(GarnishedEffects.TRUTH_SEEKER, 320, 1)); + //if (!level.isClientSide) + //livingEntity.addEffect(new MobEffectInstance(GarnishedEffects.TRUTH_SEEKER.get(), tick * 16, 1)); if (stack.isEmpty()) { return new ItemStack(Items.BOWL); diff --git a/src/main/java/net/dakotapride/garnished/item/FermentedCashewMixtureItem.java b/src/main/java/net/dakotapride/garnished/item/FermentedCashewMixtureItem.java index 84ae3722..d7fe2a3a 100644 --- a/src/main/java/net/dakotapride/garnished/item/FermentedCashewMixtureItem.java +++ b/src/main/java/net/dakotapride/garnished/item/FermentedCashewMixtureItem.java @@ -1,15 +1,12 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; -import net.minecraft.advancements.CriteriaTriggers; -import net.minecraft.server.level.ServerPlayer; +import org.jetbrains.annotations.NotNull; + +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.sounds.SoundEvent; import net.minecraft.sounds.SoundEvents; -import net.minecraft.stats.Stats; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResultHolder; -import net.minecraft.world.effect.MobEffectInstance; -import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; @@ -19,12 +16,10 @@ import net.minecraft.world.item.UseAnim; import net.minecraft.world.level.Level; -import org.jetbrains.annotations.NotNull; - -public class FermentedCashewMixtureItem extends Item implements IGarnishedItem { +public class FermentedCashewMixtureItem extends Item implements IGarnishedUtilities { private static final int DRINK_DURATION = 10; public FermentedCashewMixtureItem(Properties properties) { - super(properties.food(GarnishedFoods.FERMENTED_CASHEW_MIXTURE).stacksTo(16)); + super(properties.food(GarnishedFoodValues.FERMENTED_CASHEW_MIXTURE).stacksTo(16)); } @Override diff --git a/src/main/java/net/dakotapride/garnished/item/FishySurpriseFoodItem.java b/src/main/java/net/dakotapride/garnished/item/FishySurpriseFoodItem.java index a4375bae..bcd0d69a 100644 --- a/src/main/java/net/dakotapride/garnished/item/FishySurpriseFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/FishySurpriseFoodItem.java @@ -1,6 +1,8 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import org.jetbrains.annotations.NotNull; + +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.server.level.ServerPlayer; import net.minecraft.stats.Stats; @@ -14,11 +16,9 @@ import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; -import org.jetbrains.annotations.NotNull; - -public class FishySurpriseFoodItem extends Item implements IGarnishedItem { +public class FishySurpriseFoodItem extends Item implements IGarnishedUtilities { public FishySurpriseFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.FISHY_SURPRISE).stacksTo(1)); + super(properties.food(GarnishedFoodValues.FISHY_SURPRISE).stacksTo(1)); } @Override diff --git a/src/main/java/net/dakotapride/garnished/item/FrostedDessertFoodItem.java b/src/main/java/net/dakotapride/garnished/item/FrostedDessertFoodItem.java index f8e94952..0fedbd0f 100644 --- a/src/main/java/net/dakotapride/garnished/item/FrostedDessertFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/FrostedDessertFoodItem.java @@ -2,7 +2,7 @@ import org.jetbrains.annotations.NotNull; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.server.level.ServerPlayer; import net.minecraft.stats.Stats; @@ -16,9 +16,9 @@ import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; -public class FrostedDessertFoodItem extends Item implements IGarnishedItem { +public class FrostedDessertFoodItem extends Item implements IGarnishedUtilities { public FrostedDessertFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.FROSTED_DESSERT).stacksTo(1)); + super(properties.food(GarnishedFoodValues.FROSTED_DESSERT).stacksTo(1)); } @Override diff --git a/src/main/java/net/dakotapride/garnished/item/GalacticCaneFoodItem.java b/src/main/java/net/dakotapride/garnished/item/GalacticCaneFoodItem.java index cee1e690..ca824367 100644 --- a/src/main/java/net/dakotapride/garnished/item/GalacticCaneFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/GalacticCaneFoodItem.java @@ -1,32 +1,10 @@ package net.dakotapride.garnished.item; -import org.jetbrains.annotations.NotNull; - -import net.dakotapride.garnished.registry.GarnishedEffects; -import net.dakotapride.garnished.registry.GarnishedFoods; -import net.minecraft.advancements.CriteriaTriggers; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.stats.Stats; -import net.minecraft.world.effect.MobEffectInstance; -import net.minecraft.world.entity.LivingEntity; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.Level; -public class GalacticCaneFoodItem extends Item implements IGarnishedItem { +public class GalacticCaneFoodItem extends Item implements IGarnishedUtilities { public GalacticCaneFoodItem(Properties properties) { - super(properties.stacksTo(16).food(GarnishedFoods.GALACTIC_CANE)); - } - - @Override - public @NotNull ItemStack finishUsingItem(@NotNull ItemStack stack, @NotNull Level level, @NotNull LivingEntity livingEntity) { - if (livingEntity instanceof ServerPlayer serverPlayer) { - CriteriaTriggers.CONSUME_ITEM.trigger(serverPlayer, stack); - serverPlayer.awardStat(Stats.ITEM_USED.get(this)); - - livingEntity.addEffect(new MobEffectInstance(GarnishedEffects.COGNATE, getGalacticCaneEffectTick, 1)); - } - - return super.finishUsingItem(stack, level, livingEntity); + super(properties.stacksTo(16).food(GarnishedFoodValues.GALACTIC_CANE)); } } diff --git a/src/main/java/net/dakotapride/garnished/item/GalvanicHauntingFoodItem.java b/src/main/java/net/dakotapride/garnished/item/GalvanicHauntingFoodItem.java index 40680ce2..294ecfa7 100644 --- a/src/main/java/net/dakotapride/garnished/item/GalvanicHauntingFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/GalvanicHauntingFoodItem.java @@ -2,7 +2,7 @@ import org.jetbrains.annotations.NotNull; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.server.level.ServerPlayer; import net.minecraft.stats.Stats; @@ -16,9 +16,9 @@ import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; -public class GalvanicHauntingFoodItem extends Item implements IGarnishedItem { +public class GalvanicHauntingFoodItem extends Item implements IGarnishedUtilities { public GalvanicHauntingFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.GALVANIC_HAUNTING).stacksTo(1)); + super(properties.food(GarnishedFoodValues.GALVANIC_HAUNTING).stacksTo(1)); } @Override diff --git a/src/main/java/net/dakotapride/garnished/item/GarnishedMealFoodItem.java b/src/main/java/net/dakotapride/garnished/item/GarnishedMealFoodItem.java index b6c8e05c..c231efc5 100644 --- a/src/main/java/net/dakotapride/garnished/item/GarnishedMealFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/GarnishedMealFoodItem.java @@ -1,11 +1,11 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.world.item.Item; -public class GarnishedMealFoodItem extends Item implements IGarnishedItem { +public class GarnishedMealFoodItem extends Item implements IGarnishedUtilities { public GarnishedMealFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.GARNISHED_MEAL).stacksTo(16)); + super(properties.food(GarnishedFoodValues.GARNISHED_MEAL).stacksTo(16)); } } diff --git a/src/main/java/net/dakotapride/garnished/item/GarnishedNutFoodItem.java b/src/main/java/net/dakotapride/garnished/item/GarnishedNutFoodItem.java index 19b4edba..b195cde0 100644 --- a/src/main/java/net/dakotapride/garnished/item/GarnishedNutFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/GarnishedNutFoodItem.java @@ -5,20 +5,20 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.network.chat.Component; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.Level; -public class GarnishedNutFoodItem extends Item implements IGarnishedItem { +public class GarnishedNutFoodItem extends Item implements IGarnishedUtilities { public GarnishedNutFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.GARNISHED_NUT)); + super(properties.food(GarnishedFoodValues.GARNISHED_NUT)); } @Override public void appendHoverText(@NotNull ItemStack stack, @Nullable Level level, List tooltip, @NotNull TooltipFlag isAdvanced) { - tooltip.add(Component.translatable(garnishedText()).withStyle(getStandardColouring())); + tooltip.add(Component.translatable(garnishedText()).withStyle(standard())); } } diff --git a/src/main/java/net/dakotapride/garnished/item/GarnishedSweetBerriesFoodItem.java b/src/main/java/net/dakotapride/garnished/item/GarnishedSweetBerriesFoodItem.java index f1da2b87..d6bf06dd 100644 --- a/src/main/java/net/dakotapride/garnished/item/GarnishedSweetBerriesFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/GarnishedSweetBerriesFoodItem.java @@ -1,24 +1,24 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import java.util.List; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.network.chat.Component; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.Level; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.util.List; - -public class GarnishedSweetBerriesFoodItem extends Item implements IGarnishedItem { +public class GarnishedSweetBerriesFoodItem extends Item implements IGarnishedUtilities { public GarnishedSweetBerriesFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.GARNISHED_BERRIES)); + super(properties.food(GarnishedFoodValues.GARNISHED_BERRIES)); } @Override public void appendHoverText(@NotNull ItemStack stack, @Nullable Level level, List tooltip, @NotNull TooltipFlag isAdvanced) { - tooltip.add(Component.translatable(garnishedText()).withStyle(getStandardColouring())); + tooltip.add(Component.translatable(garnishedText()).withStyle(standard())); } } diff --git a/src/main/java/net/dakotapride/garnished/item/GhanderckenFoodItem.java b/src/main/java/net/dakotapride/garnished/item/GhanderckenFoodItem.java index c7ea1caa..781ea2e3 100644 --- a/src/main/java/net/dakotapride/garnished/item/GhanderckenFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/GhanderckenFoodItem.java @@ -1,6 +1,8 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import org.jetbrains.annotations.NotNull; + +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.server.level.ServerPlayer; import net.minecraft.stats.Stats; @@ -14,11 +16,9 @@ import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; -import org.jetbrains.annotations.NotNull; - -public class GhanderckenFoodItem extends Item implements IGarnishedItem { +public class GhanderckenFoodItem extends Item implements IGarnishedUtilities { public GhanderckenFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.GHANDERCKEN).stacksTo(1)); + super(properties.food(GarnishedFoodValues.GHANDERCKEN).stacksTo(1)); } @Override diff --git a/src/main/java/net/dakotapride/garnished/item/GloomyGatheringFoodItem.java b/src/main/java/net/dakotapride/garnished/item/GloomyGatheringFoodItem.java index 4a94d7d1..e27e7367 100644 --- a/src/main/java/net/dakotapride/garnished/item/GloomyGatheringFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/GloomyGatheringFoodItem.java @@ -1,6 +1,8 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import org.jetbrains.annotations.NotNull; + +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.server.level.ServerPlayer; import net.minecraft.stats.Stats; @@ -14,11 +16,9 @@ import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; -import org.jetbrains.annotations.NotNull; - -public class GloomyGatheringFoodItem extends Item implements IGarnishedItem { +public class GloomyGatheringFoodItem extends Item implements IGarnishedUtilities { public GloomyGatheringFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.GLOOMY_GATHERING).stacksTo(1)); + super(properties.food(GarnishedFoodValues.GLOOMY_GATHERING).stacksTo(1)); } @Override diff --git a/src/main/java/net/dakotapride/garnished/item/GlowInkRollFoodItem.java b/src/main/java/net/dakotapride/garnished/item/GlowInkRollFoodItem.java index bd61c91b..78bd0ca4 100644 --- a/src/main/java/net/dakotapride/garnished/item/GlowInkRollFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/GlowInkRollFoodItem.java @@ -1,9 +1,9 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; public class GlowInkRollFoodItem extends FarmersDelightItem { public GlowInkRollFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.GLOW_INK_ROLL)); + super(properties.food(GarnishedFoodValues.GLOW_INK_ROLL)); } } diff --git a/src/main/java/net/dakotapride/garnished/item/GlowInkRollSliceFoodItem.java b/src/main/java/net/dakotapride/garnished/item/GlowInkRollSliceFoodItem.java index 08af4c36..f660ea4f 100644 --- a/src/main/java/net/dakotapride/garnished/item/GlowInkRollSliceFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/GlowInkRollSliceFoodItem.java @@ -1,9 +1,9 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; public class GlowInkRollSliceFoodItem extends FarmersDelightItem { public GlowInkRollSliceFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.GLOW_INK_ROLL_SLICE)); + super(properties.food(GarnishedFoodValues.GLOW_INK_ROLL_SLICE)); } } diff --git a/src/main/java/net/dakotapride/garnished/item/GrimStewFoodItem.java b/src/main/java/net/dakotapride/garnished/item/GrimStewFoodItem.java index 393771fe..c8d2dabf 100644 --- a/src/main/java/net/dakotapride/garnished/item/GrimStewFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/GrimStewFoodItem.java @@ -1,6 +1,8 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import org.jetbrains.annotations.NotNull; + +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.server.level.ServerPlayer; import net.minecraft.stats.Stats; @@ -14,11 +16,9 @@ import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; -import org.jetbrains.annotations.NotNull; - -public class GrimStewFoodItem extends Item implements IGarnishedItem { +public class GrimStewFoodItem extends Item implements IGarnishedUtilities { public GrimStewFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.GRIM_STEW).stacksTo(1)); + super(properties.food(GarnishedFoodValues.GRIM_STEW).stacksTo(1)); } @Override diff --git a/src/main/java/net/dakotapride/garnished/item/HoneyedNutFoodItem.java b/src/main/java/net/dakotapride/garnished/item/HoneyedNutFoodItem.java index a48c124d..630a7bdd 100644 --- a/src/main/java/net/dakotapride/garnished/item/HoneyedNutFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/HoneyedNutFoodItem.java @@ -5,20 +5,20 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.network.chat.Component; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.Level; -public class HoneyedNutFoodItem extends Item implements IGarnishedItem { +public class HoneyedNutFoodItem extends Item implements IGarnishedUtilities { public HoneyedNutFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.HONEYED_NUT)); + super(properties.food(GarnishedFoodValues.HONEYED_NUT)); } @Override public void appendHoverText(@NotNull ItemStack stack, @Nullable Level level, List tooltip, @NotNull TooltipFlag isAdvanced) { - tooltip.add(Component.translatable(honeyedText()).setStyle(getHoneyedColouring())); + tooltip.add(Component.translatable(honeyedText()).setStyle(honeyed())); } } diff --git a/src/main/java/net/dakotapride/garnished/item/HoneyedNutMixFoodItem.java b/src/main/java/net/dakotapride/garnished/item/HoneyedNutMixFoodItem.java index d6dff412..f4ec798d 100644 --- a/src/main/java/net/dakotapride/garnished/item/HoneyedNutMixFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/HoneyedNutMixFoodItem.java @@ -1,24 +1,24 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import java.util.List; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.network.chat.Component; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.Level; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.util.List; - -public class HoneyedNutMixFoodItem extends Item implements IGarnishedItem { +public class HoneyedNutMixFoodItem extends Item implements IGarnishedUtilities { public HoneyedNutMixFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.HONEYED_NUT_MIX).stacksTo(16)); + super(properties.food(GarnishedFoodValues.HONEYED_NUT_MIX).stacksTo(16)); } @Override public void appendHoverText(@NotNull ItemStack stack, @Nullable Level level, List tooltip, @NotNull TooltipFlag isAdvanced) { - tooltip.add(Component.translatable(honeyedText()).setStyle(getHoneyedColouring())); + tooltip.add(Component.translatable(honeyedText()).setStyle(honeyed())); } } diff --git a/src/main/java/net/dakotapride/garnished/item/HoneyedSweetBerriesFoodItem.java b/src/main/java/net/dakotapride/garnished/item/HoneyedSweetBerriesFoodItem.java index e67debb0..ef8850f2 100644 --- a/src/main/java/net/dakotapride/garnished/item/HoneyedSweetBerriesFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/HoneyedSweetBerriesFoodItem.java @@ -1,24 +1,24 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import java.util.List; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.network.chat.Component; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.Level; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.util.List; - -public class HoneyedSweetBerriesFoodItem extends Item implements IGarnishedItem { +public class HoneyedSweetBerriesFoodItem extends Item implements IGarnishedUtilities { public HoneyedSweetBerriesFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.HONEYED_BERRIES)); + super(properties.food(GarnishedFoodValues.HONEYED_BERRIES)); } @Override public void appendHoverText(@NotNull ItemStack stack, @Nullable Level level, List tooltip, @NotNull TooltipFlag isAdvanced) { - tooltip.add(Component.translatable(honeyedText()).setStyle(getHoneyedColouring())); + tooltip.add(Component.translatable(honeyedText()).setStyle(honeyed())); } } diff --git a/src/main/java/net/dakotapride/garnished/item/IGarnishedItem.java b/src/main/java/net/dakotapride/garnished/item/IGarnishedItem.java deleted file mode 100644 index 8069f9e1..00000000 --- a/src/main/java/net/dakotapride/garnished/item/IGarnishedItem.java +++ /dev/null @@ -1,83 +0,0 @@ -package net.dakotapride.garnished.item; - -import java.util.Random; - -import net.minecraft.ChatFormatting; -import net.minecraft.network.chat.Style; -import net.minecraft.world.effect.MobEffect; -import net.minecraft.world.effect.MobEffects; - -public interface IGarnishedItem { - int baseTick = 20; - int getCinderEffectDuration = baseTick * 90; - int getCrypticAppleCiderEffectDuration = baseTick * 45; - int getBitterAppleCiderEffectDuration = baseTick * 40; - int getCashewFruitEffectDuration = baseTick * 50; - int getBitterAlmondEffectDuration = baseTick * 25; - int getWrappedTangleEffectDuration = baseTick * 45; - int getFermentedCashewMixtureEffectDuration = baseTick * 180; - int getCognateEffectBaseTick = baseTick * 60; - int getGalacticCaneEffectTick = baseTick * 10; - int getSugarHighEffectBaseTick = baseTick * 25; - - - default String garnishedText() { - return "text.garnished.nut.garnished"; - } - - default String ungarnishedText() { - return "text.garnished.nut.ungarnished"; - } - - default ChatFormatting getStandardColouring() { - return ChatFormatting.GRAY; - } - - default String sweetenedText() { - return "text.garnished.nut.sweetened"; - } - - default ChatFormatting getSweetenedColouring() { - return ChatFormatting.AQUA; - } - - default String honeyedText() { - return "text.garnished.nut.honeyed"; - } - - default Style getHoneyedColouring() { - return Style.EMPTY.withColor(0xEE890F); - } - - default String cinderFlourText() { - return "text.garnished.nut.cinder_flour"; - } - - default String meltedCinderFlourText() { - return "text.garnished.nut.cinder_flour.melted"; - } - - default ChatFormatting getCinderFlourColouring() { - return ChatFormatting.RED; - } - - default String chocolateGlazedText() { - return "text.garnished.nut.chocolate_glazed"; - } - - default Style getChocolateGlazedColouring() { - return Style.EMPTY.withColor(0xB1543E); - } - - default MobEffect getCrypticAppleCiderEffect() { - int random = new Random().nextInt(2); - - if (random == 1) { - return MobEffects.DAMAGE_BOOST; - } else { - return MobEffects.MOVEMENT_SLOWDOWN; - } - } - - -} diff --git a/src/main/java/net/dakotapride/garnished/item/IGarnishedUtilities.java b/src/main/java/net/dakotapride/garnished/item/IGarnishedUtilities.java new file mode 100644 index 00000000..f75f78c2 --- /dev/null +++ b/src/main/java/net/dakotapride/garnished/item/IGarnishedUtilities.java @@ -0,0 +1,69 @@ +package net.dakotapride.garnished.item; + +import net.minecraft.ChatFormatting; +import net.minecraft.network.chat.Style; + +public interface IGarnishedUtilities { + int tick = 20; + int cinder_dur = tick * 90; + int cr_cider_dur = tick * 45; + int bit_cider_dur = tick * 40; + int cashew_dur = tick * 50; + int almond_dur = tick * 25; + int tangle_dur = tick * 45; + int cashew_mix_dur = tick * 180; + int cognate_dur = tick * 60; + int cane_effect_dur = tick * 10; + int sugar_high_dur = tick * 25; + + + default String garnishedText() { + return "text.garnished.nut.garnished"; + } + + default String ungarnishedText() { + return "text.garnished.nut.ungarnished"; + } + + default ChatFormatting standard() { + return ChatFormatting.GRAY; + } + + default String sweetenedText() { + return "text.garnished.nut.sweetened"; + } + + default ChatFormatting sweetened() { + return ChatFormatting.AQUA; + } + + default String honeyedText() { + return "text.garnished.nut.honeyed"; + } + + default Style honeyed() { + return Style.EMPTY.withColor(0xEE890F); + } + + default String cinderFlourText() { + return "text.garnished.nut.cinder_flour"; + } + + default String meltedCinderFlourText() { + return "text.garnished.nut.cinder_flour.melted"; + } + + default ChatFormatting cinderFlour() { + return ChatFormatting.RED; + } + + default String chocolateGlazedText() { + return "text.garnished.nut.chocolate_glazed"; + } + + default Style chocolateGlazed() { + return Style.EMPTY.withColor(0xB1543E); + } + + +} diff --git a/src/main/java/net/dakotapride/garnished/item/IcyMasticChunkFoodItem.java b/src/main/java/net/dakotapride/garnished/item/IcyMasticChunkFoodItem.java index 62f9e8cc..65742932 100644 --- a/src/main/java/net/dakotapride/garnished/item/IcyMasticChunkFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/IcyMasticChunkFoodItem.java @@ -2,20 +2,18 @@ import org.jetbrains.annotations.NotNull; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.server.level.ServerPlayer; import net.minecraft.stats.Stats; -import net.minecraft.world.effect.MobEffectInstance; -import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; -public class IcyMasticChunkFoodItem extends Item implements IGarnishedItem { +public class IcyMasticChunkFoodItem extends Item implements IGarnishedUtilities { public IcyMasticChunkFoodItem(Properties properties) { - super(properties.stacksTo(16).food(GarnishedFoods.ICY_MASTIC_CHUNK)); + super(properties.stacksTo(16).food(GarnishedFoodValues.ICY_MASTIC_CHUNK)); } @Override @@ -24,9 +22,6 @@ public IcyMasticChunkFoodItem(Properties properties) { if (livingEntity instanceof ServerPlayer serverPlayer) { CriteriaTriggers.CONSUME_ITEM.trigger(serverPlayer, stack); serverPlayer.awardStat(Stats.ITEM_USED.get(this)); - - livingEntity.addEffect(new MobEffectInstance(MobEffects.MOVEMENT_SLOWDOWN, 100, 2)); - livingEntity.addEffect(new MobEffectInstance(MobEffects.REGENERATION, 160, 1)); } return super.finishUsingItem(stack, level, livingEntity); diff --git a/src/main/java/net/dakotapride/garnished/item/IlluminatingCocktailItem.java b/src/main/java/net/dakotapride/garnished/item/IlluminatingCocktailItem.java index 58e1b722..612a10dc 100644 --- a/src/main/java/net/dakotapride/garnished/item/IlluminatingCocktailItem.java +++ b/src/main/java/net/dakotapride/garnished/item/IlluminatingCocktailItem.java @@ -1,14 +1,12 @@ package net.dakotapride.garnished.item; -import net.minecraft.sounds.SoundEvent; -import net.minecraft.sounds.SoundEvents; -import net.minecraft.world.item.UseAnim; - import org.jetbrains.annotations.NotNull; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.server.level.ServerPlayer; +import net.minecraft.sounds.SoundEvent; +import net.minecraft.sounds.SoundEvents; import net.minecraft.stats.Stats; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResultHolder; @@ -18,12 +16,13 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemUtils; import net.minecraft.world.item.Items; +import net.minecraft.world.item.UseAnim; import net.minecraft.world.level.Level; -public class IlluminatingCocktailItem extends Item implements IGarnishedItem { +public class IlluminatingCocktailItem extends Item implements IGarnishedUtilities { private static final int DRINK_DURATION = 40; public IlluminatingCocktailItem(Properties properties) { - super(properties.food(GarnishedFoods.ILLUMINATING_COCKTAIL).stacksTo(16)); + super(properties.food(GarnishedFoodValues.ILLUMINATING_COCKTAIL).stacksTo(16)); } @Override diff --git a/src/main/java/net/dakotapride/garnished/item/IncendiaryStewFoodItem.java b/src/main/java/net/dakotapride/garnished/item/IncendiaryStewFoodItem.java index ef1d7f8d..c55c6a8d 100644 --- a/src/main/java/net/dakotapride/garnished/item/IncendiaryStewFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/IncendiaryStewFoodItem.java @@ -5,7 +5,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.LivingEntity; @@ -16,9 +16,9 @@ import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.Level; -public class IncendiaryStewFoodItem extends Item implements IGarnishedItem { +public class IncendiaryStewFoodItem extends Item implements IGarnishedUtilities { public IncendiaryStewFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.INDENDCIARY_STEW).stacksTo(1)); + super(properties.food(GarnishedFoodValues.INCENDIARY_STEW).stacksTo(1)); } @Override diff --git a/src/main/java/net/dakotapride/garnished/item/IniquitousBrewFoodItem.java b/src/main/java/net/dakotapride/garnished/item/IniquitousBrewFoodItem.java index 8ccaeb47..e0e6feb8 100644 --- a/src/main/java/net/dakotapride/garnished/item/IniquitousBrewFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/IniquitousBrewFoodItem.java @@ -2,7 +2,7 @@ import org.jetbrains.annotations.NotNull; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.server.level.ServerPlayer; import net.minecraft.stats.Stats; @@ -16,9 +16,9 @@ import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; -public class IniquitousBrewFoodItem extends Item implements IGarnishedItem { +public class IniquitousBrewFoodItem extends Item implements IGarnishedUtilities { public IniquitousBrewFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.INIQUITOUS_BREW).stacksTo(1)); + super(properties.food(GarnishedFoodValues.INIQUITOUS_BREW).stacksTo(1)); } @Override diff --git a/src/main/java/net/dakotapride/garnished/item/MasticCoveredSlimeDropFoodItem.java b/src/main/java/net/dakotapride/garnished/item/MasticCoveredSlimeDropFoodItem.java index b5bbabed..ef0e77ce 100644 --- a/src/main/java/net/dakotapride/garnished/item/MasticCoveredSlimeDropFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/MasticCoveredSlimeDropFoodItem.java @@ -1,10 +1,10 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.world.item.Item; public class MasticCoveredSlimeDropFoodItem extends Item { public MasticCoveredSlimeDropFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.MASTIC_COVERED_SLIME_DROP).stacksTo(16)); + super(properties.food(GarnishedFoodValues.MASTIC_COVERED_SLIME_DROP).stacksTo(16)); } } diff --git a/src/main/java/net/dakotapride/garnished/item/MasticPasteFoodItem.java b/src/main/java/net/dakotapride/garnished/item/MasticPasteFoodItem.java index d570d1f9..ebcd0a86 100644 --- a/src/main/java/net/dakotapride/garnished/item/MasticPasteFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/MasticPasteFoodItem.java @@ -1,10 +1,10 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.world.item.Item; public class MasticPasteFoodItem extends Item { public MasticPasteFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.MASTIC_PASTE)); + super(properties.food(GarnishedFoodValues.MASTIC_PASTE)); } } diff --git a/src/main/java/net/dakotapride/garnished/item/MeatScrapsFoodItem.java b/src/main/java/net/dakotapride/garnished/item/MeatScrapsFoodItem.java index fccdd47c..be8d1338 100644 --- a/src/main/java/net/dakotapride/garnished/item/MeatScrapsFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/MeatScrapsFoodItem.java @@ -1,10 +1,10 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.world.item.Item; -public class MeatScrapsFoodItem extends Item implements IGarnishedItem { +public class MeatScrapsFoodItem extends Item implements IGarnishedUtilities { public MeatScrapsFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.MEAT_SCRAPS)); + super(properties.food(GarnishedFoodValues.MEAT_SCRAPS)); } } diff --git a/src/main/java/net/dakotapride/garnished/item/MeltedCinderFlourNutFoodItem.java b/src/main/java/net/dakotapride/garnished/item/MeltedCinderFlourNutFoodItem.java index 292d34a2..3021ff3e 100644 --- a/src/main/java/net/dakotapride/garnished/item/MeltedCinderFlourNutFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/MeltedCinderFlourNutFoodItem.java @@ -2,31 +2,22 @@ import java.util.List; -import net.dakotapride.garnished.registry.GarnishedFoods; - -import net.dakotapride.garnished.registry.GarnishedItems; - -import net.minecraft.world.effect.MobEffects; - -import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.network.chat.Component; -import net.minecraft.world.effect.MobEffectInstance; -import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.food.FoodProperties; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.Level; -public class MeltedCinderFlourNutFoodItem extends Item implements IGarnishedItem { +public class MeltedCinderFlourNutFoodItem extends Item implements IGarnishedUtilities { public MeltedCinderFlourNutFoodItem(Properties properties) { - super(properties.food(new FoodProperties.Builder().saturationMod(GarnishedFoods.MELTED_CINDER_FLOUR_NUT.getSaturationModifier()).nutrition(7).build())); + super(properties.food(GarnishedFoodValues.MELTED_CINDER_FLOUR_NUT)); } @Override public void appendHoverText(ItemStack stack, @Nullable Level level, List tooltip, TooltipFlag isAdvanced) { - tooltip.add(Component.translatable(meltedCinderFlourText()).withStyle(getCinderFlourColouring())); + tooltip.add(Component.translatable(meltedCinderFlourText()).withStyle(cinderFlour())); } } diff --git a/src/main/java/net/dakotapride/garnished/item/MeltedCinderFlourNutWithEffectFoodItem.java b/src/main/java/net/dakotapride/garnished/item/MeltedCinderFlourNutWithEffectFoodItem.java index 73cc35f6..65d72818 100644 --- a/src/main/java/net/dakotapride/garnished/item/MeltedCinderFlourNutWithEffectFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/MeltedCinderFlourNutWithEffectFoodItem.java @@ -5,7 +5,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.dakotapride.garnished.registry.GarnishedItems; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.screens.Screen; @@ -17,60 +17,60 @@ import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.Level; -public class MeltedCinderFlourNutWithEffectFoodItem extends Item implements IGarnishedItem { +public class MeltedCinderFlourNutWithEffectFoodItem extends Item implements IGarnishedUtilities { public MeltedCinderFlourNutWithEffectFoodItem(FoodProperties foodProperties, Properties properties) { super(properties.food(foodProperties)); } public static class Peanut extends MeltedCinderFlourNutWithEffectFoodItem { public Peanut(Properties properties) { - super(GarnishedFoods.MELTED_CINDER_FLOUR_PEANUT, properties); + super(GarnishedFoodValues.MELTED_CINDER_FLOUR_PEANUT, properties); } } public static class Walnut extends MeltedCinderFlourNutWithEffectFoodItem { public Walnut(Properties properties) { - super(GarnishedFoods.MELTED_CINDER_FLOUR_WALNUT, properties); + super(GarnishedFoodValues.MELTED_CINDER_FLOUR_WALNUT, properties); } } public static class Chestnut extends MeltedCinderFlourNutWithEffectFoodItem { public Chestnut(Properties properties) { - super(GarnishedFoods.MELTED_CINDER_FLOUR_CHESTNUT, properties); + super(GarnishedFoodValues.MELTED_CINDER_FLOUR_CHESTNUT, properties); } } public static class Hazelnut extends MeltedCinderFlourNutWithEffectFoodItem { public Hazelnut(Properties properties) { - super(GarnishedFoods.MELTED_CINDER_FLOUR_HAZELNUT, properties); + super(GarnishedFoodValues.MELTED_CINDER_FLOUR_HAZELNUT, properties); } } public static class Macadamia extends MeltedCinderFlourNutWithEffectFoodItem { public Macadamia(Properties properties) { - super(GarnishedFoods.MELTED_CINDER_FLOUR_MACADAMIA, properties); + super(GarnishedFoodValues.MELTED_CINDER_FLOUR_MACADAMIA, properties); } } public static class Cashew extends MeltedCinderFlourNutWithEffectFoodItem { public Cashew(Properties properties) { - super(GarnishedFoods.MELTED_CINDER_FLOUR_CASHEW, properties); + super(GarnishedFoodValues.MELTED_CINDER_FLOUR_CASHEW, properties); } } public static class Pistachio extends MeltedCinderFlourNutWithEffectFoodItem { public Pistachio(Properties properties) { - super(GarnishedFoods.MELTED_CINDER_FLOUR_PISTACHIO, properties); + super(GarnishedFoodValues.MELTED_CINDER_FLOUR_PISTACHIO, properties); } } public static class Almond extends MeltedCinderFlourNutWithEffectFoodItem { public Almond(Properties properties) { - super(GarnishedFoods.MELTED_CINDER_FLOUR_ALMOND, properties); + super(GarnishedFoodValues.MELTED_CINDER_FLOUR_ALMOND, properties); } } public static class Pecan extends MeltedCinderFlourNutWithEffectFoodItem { public Pecan(Properties properties) { - super(GarnishedFoods.MELTED_CINDER_FLOUR_PECAN, properties); + super(GarnishedFoodValues.MELTED_CINDER_FLOUR_PECAN, properties); } } @Override public void appendHoverText(@NotNull ItemStack stack, @Nullable Level level, List tooltip, @NotNull TooltipFlag isAdvanced) { - tooltip.add(Component.translatable(meltedCinderFlourText()).withStyle(getCinderFlourColouring())); + tooltip.add(Component.translatable(meltedCinderFlourText()).withStyle(cinderFlour())); if (!Screen.hasShiftDown()) { tooltip.add(Component.literal("")); diff --git a/src/main/java/net/dakotapride/garnished/item/MerryTreatFoodItem.java b/src/main/java/net/dakotapride/garnished/item/MerryTreatFoodItem.java index c444b42e..8c166d0b 100644 --- a/src/main/java/net/dakotapride/garnished/item/MerryTreatFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/MerryTreatFoodItem.java @@ -2,20 +2,18 @@ import org.jetbrains.annotations.NotNull; -import net.dakotapride.garnished.registry.GarnishedEffects; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.server.level.ServerPlayer; import net.minecraft.stats.Stats; -import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; -public class MerryTreatFoodItem extends Item implements IGarnishedItem { +public class MerryTreatFoodItem extends Item implements IGarnishedUtilities { public MerryTreatFoodItem(Properties properties) { - super(properties.stacksTo(16).food(GarnishedFoods.MERRY_TREAT)); + super(properties.stacksTo(16).food(GarnishedFoodValues.MERRY_TREAT)); } @Override @@ -23,8 +21,6 @@ public MerryTreatFoodItem(Properties properties) { if (livingEntity instanceof ServerPlayer serverPlayer) { CriteriaTriggers.CONSUME_ITEM.trigger(serverPlayer, stack); serverPlayer.awardStat(Stats.ITEM_USED.get(this)); - - livingEntity.addEffect(new MobEffectInstance(GarnishedEffects.SUGAR_HIGH, getSugarHighEffectBaseTick, 1)); } return super.finishUsingItem(stack, level, livingEntity); diff --git a/src/main/java/net/dakotapride/garnished/item/MoltenStewFoodItem.java b/src/main/java/net/dakotapride/garnished/item/MoltenStewFoodItem.java index edee9b3c..a2dcf170 100644 --- a/src/main/java/net/dakotapride/garnished/item/MoltenStewFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/MoltenStewFoodItem.java @@ -1,6 +1,8 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import org.jetbrains.annotations.NotNull; + +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.server.level.ServerPlayer; import net.minecraft.stats.Stats; @@ -14,11 +16,9 @@ import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; -import org.jetbrains.annotations.NotNull; - -public class MoltenStewFoodItem extends Item implements IGarnishedItem { +public class MoltenStewFoodItem extends Item implements IGarnishedUtilities { public MoltenStewFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.MOLTEN_STEW).stacksTo(1)); + super(properties.food(GarnishedFoodValues.MOLTEN_STEW).stacksTo(1)); } @Override diff --git a/src/main/java/net/dakotapride/garnished/item/MudPieFoodItem.java b/src/main/java/net/dakotapride/garnished/item/MudPieFoodItem.java index 449a402e..dbc53d87 100644 --- a/src/main/java/net/dakotapride/garnished/item/MudPieFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/MudPieFoodItem.java @@ -1,6 +1,8 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import org.jetbrains.annotations.NotNull; + +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.server.level.ServerPlayer; import net.minecraft.stats.Stats; @@ -14,11 +16,9 @@ import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; -import org.jetbrains.annotations.NotNull; - -public class MudPieFoodItem extends Item implements IGarnishedItem { +public class MudPieFoodItem extends Item implements IGarnishedUtilities { public MudPieFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.MUD_PIE).stacksTo(1)); + super(properties.food(GarnishedFoodValues.MUD_PIE).stacksTo(1)); } @Override diff --git a/src/main/java/net/dakotapride/garnished/item/MuesliFoodItem.java b/src/main/java/net/dakotapride/garnished/item/MuesliFoodItem.java index 88d6868c..cafb6cdb 100644 --- a/src/main/java/net/dakotapride/garnished/item/MuesliFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/MuesliFoodItem.java @@ -2,7 +2,7 @@ import org.jetbrains.annotations.NotNull; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.server.level.ServerPlayer; import net.minecraft.stats.Stats; @@ -16,9 +16,9 @@ import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; -public class MuesliFoodItem extends Item implements IGarnishedItem { +public class MuesliFoodItem extends Item implements IGarnishedUtilities { public MuesliFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.MUESLI).stacksTo(1)); + super(properties.food(GarnishedFoodValues.MUESLI).stacksTo(1)); } @Override diff --git a/src/main/java/net/dakotapride/garnished/item/MulchItem.java b/src/main/java/net/dakotapride/garnished/item/MulchItem.java index dc0d4ba4..df2ee371 100644 --- a/src/main/java/net/dakotapride/garnished/item/MulchItem.java +++ b/src/main/java/net/dakotapride/garnished/item/MulchItem.java @@ -1,10 +1,10 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.world.item.Item; -public class MulchItem extends Item implements IGarnishedItem { +public class MulchItem extends Item implements IGarnishedUtilities { public MulchItem(Properties properties) { - super(properties.food(GarnishedFoods.MULCH)); + super(properties.food(GarnishedFoodValues.MULCH)); } } diff --git a/src/main/java/net/dakotapride/garnished/item/MurkyJellyFoodItem.java b/src/main/java/net/dakotapride/garnished/item/MurkyJellyFoodItem.java index b17f1758..c1169e56 100644 --- a/src/main/java/net/dakotapride/garnished/item/MurkyJellyFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/MurkyJellyFoodItem.java @@ -1,10 +1,10 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.world.item.Item; -public class MurkyJellyFoodItem extends Item implements IGarnishedItem { +public class MurkyJellyFoodItem extends Item implements IGarnishedUtilities { public MurkyJellyFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.MURKY_JELLY)); + super(properties.food(GarnishedFoodValues.MURKY_JELLY)); } } diff --git a/src/main/java/net/dakotapride/garnished/item/MurkyMacadamiaMaliceFoodItem.java b/src/main/java/net/dakotapride/garnished/item/MurkyMacadamiaMaliceFoodItem.java index 6b6e8908..0d95c5c7 100644 --- a/src/main/java/net/dakotapride/garnished/item/MurkyMacadamiaMaliceFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/MurkyMacadamiaMaliceFoodItem.java @@ -2,7 +2,7 @@ import org.jetbrains.annotations.NotNull; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.server.level.ServerPlayer; import net.minecraft.stats.Stats; @@ -16,9 +16,9 @@ import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; -public class MurkyMacadamiaMaliceFoodItem extends Item implements IGarnishedItem { +public class MurkyMacadamiaMaliceFoodItem extends Item implements IGarnishedUtilities { public MurkyMacadamiaMaliceFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.MURKY_MACADAMIA_MALICE).stacksTo(1)); + super(properties.food(GarnishedFoodValues.MURKY_MACADAMIA_MALICE).stacksTo(1)); } @Override diff --git a/src/main/java/net/dakotapride/garnished/item/NopalitoWrapFoodItem.java b/src/main/java/net/dakotapride/garnished/item/NopalitoWrapFoodItem.java index 0a407627..017e5fe7 100644 --- a/src/main/java/net/dakotapride/garnished/item/NopalitoWrapFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/NopalitoWrapFoodItem.java @@ -1,10 +1,10 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.world.item.Item; -public class NopalitoWrapFoodItem extends Item implements IGarnishedItem { +public class NopalitoWrapFoodItem extends Item implements IGarnishedUtilities { public NopalitoWrapFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.NOPALITO_WRAP).stacksTo(16)); + super(properties.food(GarnishedFoodValues.NOPALITO_WRAP).stacksTo(16)); } } diff --git a/src/main/java/net/dakotapride/garnished/item/NopalitoWrapSupremeFoodItem.java b/src/main/java/net/dakotapride/garnished/item/NopalitoWrapSupremeFoodItem.java index 286c78ea..a3d08ced 100644 --- a/src/main/java/net/dakotapride/garnished/item/NopalitoWrapSupremeFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/NopalitoWrapSupremeFoodItem.java @@ -1,10 +1,10 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.world.item.Item; -public class NopalitoWrapSupremeFoodItem extends Item implements IGarnishedItem { +public class NopalitoWrapSupremeFoodItem extends Item implements IGarnishedUtilities { public NopalitoWrapSupremeFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.NOPALITO_WRAP_SUPREME).stacksTo(16)); + super(properties.food(GarnishedFoodValues.NOPALITO_WRAP_SUPREME).stacksTo(16)); } } diff --git a/src/main/java/net/dakotapride/garnished/item/NutMixFoodItem.java b/src/main/java/net/dakotapride/garnished/item/NutMixFoodItem.java index 2fc61b69..8439aa4f 100644 --- a/src/main/java/net/dakotapride/garnished/item/NutMixFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/NutMixFoodItem.java @@ -1,24 +1,24 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import java.util.List; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.network.chat.Component; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.Level; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.util.List; - -public class NutMixFoodItem extends Item implements IGarnishedItem { +public class NutMixFoodItem extends Item implements IGarnishedUtilities { public NutMixFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.GARNISHED_NUT_MIX).stacksTo(16)); + super(properties.food(GarnishedFoodValues.GARNISHED_NUT_MIX).stacksTo(16)); } @Override public void appendHoverText(@NotNull ItemStack stack, @Nullable Level level, List tooltip, @NotNull TooltipFlag isAdvanced) { - tooltip.add(Component.translatable(garnishedText()).withStyle(getStandardColouring())); + tooltip.add(Component.translatable(garnishedText()).withStyle(standard())); } } diff --git a/src/main/java/net/dakotapride/garnished/item/NutNachoBowlFoodItem.java b/src/main/java/net/dakotapride/garnished/item/NutNachoBowlFoodItem.java index 293c3cee..3dbf3aee 100644 --- a/src/main/java/net/dakotapride/garnished/item/NutNachoBowlFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/NutNachoBowlFoodItem.java @@ -1,6 +1,8 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import org.jetbrains.annotations.NotNull; + +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.server.level.ServerPlayer; import net.minecraft.stats.Stats; @@ -14,11 +16,9 @@ import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; -import org.jetbrains.annotations.NotNull; - -public class NutNachoBowlFoodItem extends Item implements IGarnishedItem { +public class NutNachoBowlFoodItem extends Item implements IGarnishedUtilities { public NutNachoBowlFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.NUT_NACHO_BOWL).stacksTo(16)); + super(properties.food(GarnishedFoodValues.NUT_NACHO_BOWL).stacksTo(16)); } @Override diff --git a/src/main/java/net/dakotapride/garnished/item/NutNachoFoodItem.java b/src/main/java/net/dakotapride/garnished/item/NutNachoFoodItem.java index e05157c0..23e348b2 100644 --- a/src/main/java/net/dakotapride/garnished/item/NutNachoFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/NutNachoFoodItem.java @@ -1,10 +1,10 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.world.item.Item; -public class NutNachoFoodItem extends Item implements IGarnishedItem { +public class NutNachoFoodItem extends Item implements IGarnishedUtilities { public NutNachoFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.NUT_NACHO)); + super(properties.food(GarnishedFoodValues.NUT_NACHO)); } } diff --git a/src/main/java/net/dakotapride/garnished/item/NuttyMelodyFoodItem.java b/src/main/java/net/dakotapride/garnished/item/NuttyMelodyFoodItem.java index dd244772..e4382fcd 100644 --- a/src/main/java/net/dakotapride/garnished/item/NuttyMelodyFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/NuttyMelodyFoodItem.java @@ -1,10 +1,10 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.world.item.Item; -public class NuttyMelodyFoodItem extends Item implements IGarnishedItem { +public class NuttyMelodyFoodItem extends Item implements IGarnishedUtilities { public NuttyMelodyFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.NUTTY_MELODY).stacksTo(1)); + super(properties.food(GarnishedFoodValues.NUTTY_MELODY).stacksTo(1)); } } diff --git a/src/main/java/net/dakotapride/garnished/item/OmniscientStewFoodItem.java b/src/main/java/net/dakotapride/garnished/item/OmniscientStewFoodItem.java index cb9a006b..633228f2 100644 --- a/src/main/java/net/dakotapride/garnished/item/OmniscientStewFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/OmniscientStewFoodItem.java @@ -2,7 +2,7 @@ import org.jetbrains.annotations.NotNull; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.server.level.ServerPlayer; import net.minecraft.stats.Stats; @@ -16,9 +16,9 @@ import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; -public class OmniscientStewFoodItem extends Item implements IGarnishedItem { +public class OmniscientStewFoodItem extends Item implements IGarnishedUtilities { public OmniscientStewFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.OMNISCIENT_STEW).stacksTo(1)); + super(properties.food(GarnishedFoodValues.OMNISCIENT_STEW).stacksTo(1)); } @Override diff --git a/src/main/java/net/dakotapride/garnished/item/OvergrownBrewFoodItem.java b/src/main/java/net/dakotapride/garnished/item/OvergrownBrewFoodItem.java index 703b87ab..b2173043 100644 --- a/src/main/java/net/dakotapride/garnished/item/OvergrownBrewFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/OvergrownBrewFoodItem.java @@ -2,7 +2,7 @@ import org.jetbrains.annotations.NotNull; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.server.level.ServerPlayer; import net.minecraft.stats.Stats; @@ -16,9 +16,9 @@ import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; -public class OvergrownBrewFoodItem extends Item implements IGarnishedItem { +public class OvergrownBrewFoodItem extends Item implements IGarnishedUtilities { public OvergrownBrewFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.OVERGROWN_BREW).stacksTo(1)); + super(properties.food(GarnishedFoodValues.OVERGROWN_BREW).stacksTo(1)); } @Override diff --git a/src/main/java/net/dakotapride/garnished/item/PeanutOilAndCinderSandwichFoodItem.java b/src/main/java/net/dakotapride/garnished/item/PeanutOilAndCinderSandwichFoodItem.java index cd5f9cc6..bafe59e7 100644 --- a/src/main/java/net/dakotapride/garnished/item/PeanutOilAndCinderSandwichFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/PeanutOilAndCinderSandwichFoodItem.java @@ -1,11 +1,10 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; -import net.minecraft.world.food.FoodProperties; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.world.item.Item; -public class PeanutOilAndCinderSandwichFoodItem extends Item implements IGarnishedItem { +public class PeanutOilAndCinderSandwichFoodItem extends Item implements IGarnishedUtilities { public PeanutOilAndCinderSandwichFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.PEANUT_OIL_AND_CINDER_SANDWICH).stacksTo(16)); + super(properties.food(GarnishedFoodValues.PEANUT_OIL_AND_CINDER_SANDWICH).stacksTo(16)); } } diff --git a/src/main/java/net/dakotapride/garnished/item/PecanPieFoodItem.java b/src/main/java/net/dakotapride/garnished/item/PecanPieFoodItem.java index 55f03a3d..215e0d35 100644 --- a/src/main/java/net/dakotapride/garnished/item/PecanPieFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/PecanPieFoodItem.java @@ -1,10 +1,10 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.world.item.Item; -public class PecanPieFoodItem extends Item implements IGarnishedItem { +public class PecanPieFoodItem extends Item implements IGarnishedUtilities { public PecanPieFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.PECAN_PIE)); + super(properties.food(GarnishedFoodValues.PECAN_PIE)); } } diff --git a/src/main/java/net/dakotapride/garnished/item/PecanPieSliceFoodItem.java b/src/main/java/net/dakotapride/garnished/item/PecanPieSliceFoodItem.java index 828b5301..ed2f0127 100644 --- a/src/main/java/net/dakotapride/garnished/item/PecanPieSliceFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/PecanPieSliceFoodItem.java @@ -1,9 +1,9 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; public class PecanPieSliceFoodItem extends FarmersDelightItem { public PecanPieSliceFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.PECAN_PIE_SLICE)); + super(properties.food(GarnishedFoodValues.PECAN_PIE_SLICE)); } } diff --git a/src/main/java/net/dakotapride/garnished/item/PhantomBeefPattyFoodItem.java b/src/main/java/net/dakotapride/garnished/item/PhantomBeefPattyFoodItem.java index f500fab8..d8ae5d58 100644 --- a/src/main/java/net/dakotapride/garnished/item/PhantomBeefPattyFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/PhantomBeefPattyFoodItem.java @@ -1,9 +1,9 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; public class PhantomBeefPattyFoodItem extends FarmersDelightItem { public PhantomBeefPattyFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.PHANTOM_BEEF_PATTY)); + super(properties.food(GarnishedFoodValues.PHANTOM_BEEF_PATTY)); } } diff --git a/src/main/java/net/dakotapride/garnished/item/PhantomBurgerFoodItem.java b/src/main/java/net/dakotapride/garnished/item/PhantomBurgerFoodItem.java index f12dacfe..843af4d7 100644 --- a/src/main/java/net/dakotapride/garnished/item/PhantomBurgerFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/PhantomBurgerFoodItem.java @@ -1,9 +1,9 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; public class PhantomBurgerFoodItem extends FarmersDelightItem { public PhantomBurgerFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.PHANTOM_BURGER)); + super(properties.food(GarnishedFoodValues.PHANTOM_BURGER)); } } diff --git a/src/main/java/net/dakotapride/garnished/item/PhantomSteakFoodItem.java b/src/main/java/net/dakotapride/garnished/item/PhantomSteakFoodItem.java index 0c6f4ea8..d8e6092f 100644 --- a/src/main/java/net/dakotapride/garnished/item/PhantomSteakFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/PhantomSteakFoodItem.java @@ -4,20 +4,20 @@ import org.jetbrains.annotations.Nullable; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.network.chat.Component; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.Level; -public class PhantomSteakFoodItem extends Item implements IGarnishedItem { +public class PhantomSteakFoodItem extends Item implements IGarnishedUtilities { public PhantomSteakFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.PHANTOM_STEAK)); + super(properties.food(GarnishedFoodValues.PHANTOM_STEAK)); } @Override public void appendHoverText(ItemStack stack, @Nullable Level level, List tooltip, TooltipFlag isAdvanced) { - tooltip.add(Component.translatable("text.garnished.salted_food").withStyle(getStandardColouring())); + tooltip.add(Component.translatable("text.garnished.salted_food").withStyle(standard())); } } diff --git a/src/main/java/net/dakotapride/garnished/item/PiquantPretzelFoodItem.java b/src/main/java/net/dakotapride/garnished/item/PiquantPretzelFoodItem.java index ff279a9e..0e060f6e 100644 --- a/src/main/java/net/dakotapride/garnished/item/PiquantPretzelFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/PiquantPretzelFoodItem.java @@ -1,10 +1,10 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.world.item.Item; -public class PiquantPretzelFoodItem extends Item implements IGarnishedItem { +public class PiquantPretzelFoodItem extends Item implements IGarnishedUtilities { public PiquantPretzelFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.PIQUANT_PRETZEL).stacksTo(16)); + super(properties.food(GarnishedFoodValues.PIQUANT_PRETZEL).stacksTo(16)); } } diff --git a/src/main/java/net/dakotapride/garnished/item/PorkchopAndGrazeFoodItem.java b/src/main/java/net/dakotapride/garnished/item/PorkchopAndGrazeFoodItem.java index 188b10b6..3e64d74a 100644 --- a/src/main/java/net/dakotapride/garnished/item/PorkchopAndGrazeFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/PorkchopAndGrazeFoodItem.java @@ -1,10 +1,10 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.world.item.Item; -public class PorkchopAndGrazeFoodItem extends Item implements IGarnishedItem { +public class PorkchopAndGrazeFoodItem extends Item implements IGarnishedUtilities { public PorkchopAndGrazeFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.PORKCHOP_AND_GRAZE)); + super(properties.food(GarnishedFoodValues.PORKCHOP_AND_GRAZE)); } } diff --git a/src/main/java/net/dakotapride/garnished/item/PricklyPearFoodItem.java b/src/main/java/net/dakotapride/garnished/item/PricklyPearFoodItem.java index c47a41f4..b6d32b1f 100644 --- a/src/main/java/net/dakotapride/garnished/item/PricklyPearFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/PricklyPearFoodItem.java @@ -1,10 +1,10 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.world.item.Item; -public class PricklyPearFoodItem extends Item implements IGarnishedItem { +public class PricklyPearFoodItem extends Item implements IGarnishedUtilities { public PricklyPearFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.PRICKLY_PEAR)); + super(properties.food(GarnishedFoodValues.PRICKLY_PEAR)); } } diff --git a/src/main/java/net/dakotapride/garnished/item/PricklyPearStewFoodItem.java b/src/main/java/net/dakotapride/garnished/item/PricklyPearStewFoodItem.java index 405fd246..8efbd6a9 100644 --- a/src/main/java/net/dakotapride/garnished/item/PricklyPearStewFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/PricklyPearStewFoodItem.java @@ -2,7 +2,7 @@ import org.jetbrains.annotations.NotNull; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.server.level.ServerPlayer; import net.minecraft.stats.Stats; @@ -16,9 +16,9 @@ import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; -public class PricklyPearStewFoodItem extends Item implements IGarnishedItem { +public class PricklyPearStewFoodItem extends Item implements IGarnishedUtilities { public PricklyPearStewFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.PRICKLY_PEAR_STEW).stacksTo(1)); + super(properties.food(GarnishedFoodValues.PRICKLY_PEAR_STEW).stacksTo(1)); } @Override diff --git a/src/main/java/net/dakotapride/garnished/item/PutridStewFoodItem.java b/src/main/java/net/dakotapride/garnished/item/PutridStewFoodItem.java index 43c2e6ef..0144d14e 100644 --- a/src/main/java/net/dakotapride/garnished/item/PutridStewFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/PutridStewFoodItem.java @@ -1,7 +1,9 @@ package net.dakotapride.garnished.item; +import org.jetbrains.annotations.NotNull; + import net.dakotapride.garnished.registry.GarnishedEffects; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.server.level.ServerPlayer; import net.minecraft.stats.Stats; @@ -14,11 +16,10 @@ import net.minecraft.world.item.ItemUtils; import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; -import org.jetbrains.annotations.NotNull; -public class PutridStewFoodItem extends Item implements IGarnishedItem { +public class PutridStewFoodItem extends Item implements IGarnishedUtilities { public PutridStewFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.PUTRID_STEW).stacksTo(1)); + super(properties.food(GarnishedFoodValues.PUTRID_STEW).stacksTo(1)); } @Override diff --git a/src/main/java/net/dakotapride/garnished/item/RawPolarBearMeatItem.java b/src/main/java/net/dakotapride/garnished/item/RawPolarBearMeatItem.java index 9b34b73b..26ce597d 100644 --- a/src/main/java/net/dakotapride/garnished/item/RawPolarBearMeatItem.java +++ b/src/main/java/net/dakotapride/garnished/item/RawPolarBearMeatItem.java @@ -1,11 +1,11 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.world.item.Item; -public class RawPolarBearMeatItem extends Item implements IGarnishedItem { +public class RawPolarBearMeatItem extends Item implements IGarnishedUtilities { public RawPolarBearMeatItem(Properties properties) { - super(properties.food(GarnishedFoods.RAW_POLAR_BEAR_MEAT)); + super(properties.food(GarnishedFoodValues.RAW_POLAR_BEAR_MEAT)); } } diff --git a/src/main/java/net/dakotapride/garnished/item/RawTenebrousMeatFoodItem.java b/src/main/java/net/dakotapride/garnished/item/RawTenebrousMeatFoodItem.java index 35e44fb0..04426d00 100644 --- a/src/main/java/net/dakotapride/garnished/item/RawTenebrousMeatFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/RawTenebrousMeatFoodItem.java @@ -1,10 +1,10 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.world.item.Item; -public class RawTenebrousMeatFoodItem extends Item implements IGarnishedItem { +public class RawTenebrousMeatFoodItem extends Item implements IGarnishedUtilities { public RawTenebrousMeatFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.RAW_TENEBROUS_MEAT)); + super(properties.food(GarnishedFoodValues.RAW_TENEBROUS_MEAT)); } } diff --git a/src/main/java/net/dakotapride/garnished/item/RosyCocktailItem.java b/src/main/java/net/dakotapride/garnished/item/RosyCocktailItem.java index b45617aa..7f08772c 100644 --- a/src/main/java/net/dakotapride/garnished/item/RosyCocktailItem.java +++ b/src/main/java/net/dakotapride/garnished/item/RosyCocktailItem.java @@ -2,7 +2,7 @@ import org.jetbrains.annotations.NotNull; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.server.level.ServerPlayer; import net.minecraft.sounds.SoundEvent; @@ -19,10 +19,10 @@ import net.minecraft.world.item.UseAnim; import net.minecraft.world.level.Level; -public class RosyCocktailItem extends Item implements IGarnishedItem { +public class RosyCocktailItem extends Item implements IGarnishedUtilities { private static final int DRINK_DURATION = 40; public RosyCocktailItem(Properties properties) { - super(properties.food(GarnishedFoods.ROSY_COCKTAIL).stacksTo(8)); + super(properties.food(GarnishedFoodValues.ROSY_COCKTAIL).stacksTo(8)); } @Override diff --git a/src/main/java/net/dakotapride/garnished/item/SaladFoodItem.java b/src/main/java/net/dakotapride/garnished/item/SaladFoodItem.java index 3e04c605..9ae54a2d 100644 --- a/src/main/java/net/dakotapride/garnished/item/SaladFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/SaladFoodItem.java @@ -1,23 +1,23 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import java.util.List; + +import org.jetbrains.annotations.Nullable; + +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.network.chat.Component; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.Level; -import org.jetbrains.annotations.Nullable; - -import java.util.List; - -public class SaladFoodItem extends Item implements IGarnishedItem { +public class SaladFoodItem extends Item implements IGarnishedUtilities { public SaladFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.SALAD).stacksTo(16)); + super(properties.food(GarnishedFoodValues.SALAD)); } @Override public void appendHoverText(ItemStack stack, @Nullable Level level, List tooltip, TooltipFlag isAdvanced) { - tooltip.add(Component.translatable("text.garnished.salted_food").withStyle(getStandardColouring())); + tooltip.add(Component.translatable("text.garnished.salted_food").withStyle(standard())); } } diff --git a/src/main/java/net/dakotapride/garnished/item/SaltedFoodItem.java b/src/main/java/net/dakotapride/garnished/item/SaltedFoodItem.java index f4e49dfd..857db04a 100644 --- a/src/main/java/net/dakotapride/garnished/item/SaltedFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/SaltedFoodItem.java @@ -1,22 +1,22 @@ package net.dakotapride.garnished.item; +import java.util.List; + +import org.jetbrains.annotations.Nullable; + import net.minecraft.network.chat.Component; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.Level; -import org.jetbrains.annotations.Nullable; - -import java.util.List; - -public class SaltedFoodItem extends Item implements IGarnishedItem { +public class SaltedFoodItem extends Item implements IGarnishedUtilities { public SaltedFoodItem(Properties properties) { super(properties); } @Override public void appendHoverText(ItemStack stack, @Nullable Level level, List tooltip, TooltipFlag isAdvanced) { - tooltip.add(Component.translatable("text.garnished.salted_food").withStyle(getStandardColouring())); + tooltip.add(Component.translatable("text.garnished.salted_food").withStyle(standard())); } } diff --git a/src/main/java/net/dakotapride/garnished/item/SenileSweetFoodItem.java b/src/main/java/net/dakotapride/garnished/item/SenileSweetFoodItem.java index 090709ea..d5897b8a 100644 --- a/src/main/java/net/dakotapride/garnished/item/SenileSweetFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/SenileSweetFoodItem.java @@ -1,10 +1,10 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.world.item.Item; -public class SenileSweetFoodItem extends Item implements IGarnishedItem { +public class SenileSweetFoodItem extends Item implements IGarnishedUtilities { public SenileSweetFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.SENILE_SWEET)); + super(properties.food(GarnishedFoodValues.SENILE_SWEET)); } } diff --git a/src/main/java/net/dakotapride/garnished/item/ShelledDumplingFoodItem.java b/src/main/java/net/dakotapride/garnished/item/ShelledDumplingFoodItem.java index a2888107..31dfab0d 100644 --- a/src/main/java/net/dakotapride/garnished/item/ShelledDumplingFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/ShelledDumplingFoodItem.java @@ -1,10 +1,10 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.world.item.Item; -public class ShelledDumplingFoodItem extends Item implements IGarnishedItem { +public class ShelledDumplingFoodItem extends Item implements IGarnishedUtilities { public ShelledDumplingFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.SHELLED_DUMPLING).stacksTo(16)); + super(properties.food(GarnishedFoodValues.SHELLED_DUMPLING).stacksTo(16)); } } diff --git a/src/main/java/net/dakotapride/garnished/item/ShiningDishFoodItem.java b/src/main/java/net/dakotapride/garnished/item/ShiningDishFoodItem.java index 61114849..7634305a 100644 --- a/src/main/java/net/dakotapride/garnished/item/ShiningDishFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/ShiningDishFoodItem.java @@ -2,7 +2,7 @@ import org.jetbrains.annotations.NotNull; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.server.level.ServerPlayer; import net.minecraft.stats.Stats; @@ -16,9 +16,9 @@ import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; -public class ShiningDishFoodItem extends Item implements IGarnishedItem { +public class ShiningDishFoodItem extends Item implements IGarnishedUtilities { public ShiningDishFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.SHINING_DISH).stacksTo(1)); + super(properties.food(GarnishedFoodValues.SHINING_DISH).stacksTo(1)); } @Override diff --git a/src/main/java/net/dakotapride/garnished/item/SinopiaRockSweetFoodItem.java b/src/main/java/net/dakotapride/garnished/item/SinopiaRockSweetFoodItem.java index 2d7483f8..087339cf 100644 --- a/src/main/java/net/dakotapride/garnished/item/SinopiaRockSweetFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/SinopiaRockSweetFoodItem.java @@ -1,10 +1,10 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.world.item.Item; -public class SinopiaRockSweetFoodItem extends Item implements IGarnishedItem { +public class SinopiaRockSweetFoodItem extends Item implements IGarnishedUtilities { public SinopiaRockSweetFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.SINOPIA_ROCK_SWEET).stacksTo(16)); + super(properties.food(GarnishedFoodValues.SINOPIA_ROCK_SWEET).stacksTo(16)); } } diff --git a/src/main/java/net/dakotapride/garnished/item/SlimeDropFoodItem.java b/src/main/java/net/dakotapride/garnished/item/SlimeDropFoodItem.java index 196d0334..d86f1ba4 100644 --- a/src/main/java/net/dakotapride/garnished/item/SlimeDropFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/SlimeDropFoodItem.java @@ -1,10 +1,10 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.world.item.Item; public class SlimeDropFoodItem extends Item { public SlimeDropFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.SLIME_DROP).stacksTo(16)); + super(properties.food(GarnishedFoodValues.SLIME_DROP).stacksTo(16)); } } diff --git a/src/main/java/net/dakotapride/garnished/item/SoulKhanaFoodItem.java b/src/main/java/net/dakotapride/garnished/item/SoulKhanaFoodItem.java index dd791898..b8ced910 100644 --- a/src/main/java/net/dakotapride/garnished/item/SoulKhanaFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/SoulKhanaFoodItem.java @@ -2,7 +2,7 @@ import org.jetbrains.annotations.NotNull; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.server.level.ServerPlayer; import net.minecraft.stats.Stats; @@ -16,9 +16,9 @@ import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; -public class SoulKhanaFoodItem extends Item implements IGarnishedItem { +public class SoulKhanaFoodItem extends Item implements IGarnishedUtilities { public SoulKhanaFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.SOUL_KHANA).stacksTo(1)); + super(properties.food(GarnishedFoodValues.SOUL_KHANA).stacksTo(1)); } @Override diff --git a/src/main/java/net/dakotapride/garnished/item/SpiritedConcoctionFoodItem.java b/src/main/java/net/dakotapride/garnished/item/SpiritedConcoctionFoodItem.java index a38bae7a..f05698dc 100644 --- a/src/main/java/net/dakotapride/garnished/item/SpiritedConcoctionFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/SpiritedConcoctionFoodItem.java @@ -2,7 +2,7 @@ import org.jetbrains.annotations.NotNull; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.server.level.ServerPlayer; import net.minecraft.stats.Stats; @@ -16,9 +16,9 @@ import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; -public class SpiritedConcoctionFoodItem extends Item implements IGarnishedItem { +public class SpiritedConcoctionFoodItem extends Item implements IGarnishedUtilities { public SpiritedConcoctionFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.SPIRITED_CONCOCTION).stacksTo(1)); + super(properties.food(GarnishedFoodValues.SPIRITED_CONCOCTION).stacksTo(1)); } @Override diff --git a/src/main/java/net/dakotapride/garnished/item/StewOfTheDamnedFoodItem.java b/src/main/java/net/dakotapride/garnished/item/StewOfTheDamnedFoodItem.java index 1f776725..14d99bab 100644 --- a/src/main/java/net/dakotapride/garnished/item/StewOfTheDamnedFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/StewOfTheDamnedFoodItem.java @@ -2,7 +2,7 @@ import org.jetbrains.annotations.NotNull; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.server.level.ServerPlayer; import net.minecraft.stats.Stats; @@ -16,9 +16,9 @@ import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; -public class StewOfTheDamnedFoodItem extends Item implements IGarnishedItem { +public class StewOfTheDamnedFoodItem extends Item implements IGarnishedUtilities { public StewOfTheDamnedFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.STEW_OF_THE_DAMNED).stacksTo(1)); + super(properties.food(GarnishedFoodValues.STEW_OF_THE_DAMNED).stacksTo(1)); } @Override diff --git a/src/main/java/net/dakotapride/garnished/item/SturdyWaffleFoodItem.java b/src/main/java/net/dakotapride/garnished/item/SturdyWaffleFoodItem.java index 8df25ae2..049db58c 100644 --- a/src/main/java/net/dakotapride/garnished/item/SturdyWaffleFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/SturdyWaffleFoodItem.java @@ -1,10 +1,10 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.world.item.Item; public class SturdyWaffleFoodItem extends Item { public SturdyWaffleFoodItem(Properties properties) { - super(properties.stacksTo(16).food(GarnishedFoods.STURDY_WAFFLE)); + super(properties.stacksTo(16).food(GarnishedFoodValues.STURDY_WAFFLE)); } } diff --git a/src/main/java/net/dakotapride/garnished/item/SweetTeaItem.java b/src/main/java/net/dakotapride/garnished/item/SweetTeaItem.java index a1280e4f..030f6fc1 100644 --- a/src/main/java/net/dakotapride/garnished/item/SweetTeaItem.java +++ b/src/main/java/net/dakotapride/garnished/item/SweetTeaItem.java @@ -17,7 +17,7 @@ import net.minecraft.world.item.UseAnim; import net.minecraft.world.level.Level; -public class SweetTeaItem extends Item implements IGarnishedItem { +public class SweetTeaItem extends Item implements IGarnishedUtilities { public SweetTeaItem(Properties properties) { super(properties); } @@ -28,8 +28,9 @@ public SweetTeaItem(Properties properties) { if (playerentity instanceof ServerPlayer) CriteriaTriggers.CONSUME_ITEM.trigger((ServerPlayer) playerentity, stack); + // From the base BuildersTeaItem class from the Create mod if (!world.isClientSide) - entity.addEffect(new MobEffectInstance(GarnishedEffects.AUSTRAL, 3 * 60 * 20, 0, false, false, false)); + entity.addEffect(new MobEffectInstance(GarnishedEffects.AUGMENTED, 3 * 60 * 20, 0, false, false, false)); if (playerentity != null) { playerentity.awardStat(Stats.ITEM_USED.get(this)); diff --git a/src/main/java/net/dakotapride/garnished/item/SweetenedNutFoodItem.java b/src/main/java/net/dakotapride/garnished/item/SweetenedNutFoodItem.java index 46f64438..c074a10c 100644 --- a/src/main/java/net/dakotapride/garnished/item/SweetenedNutFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/SweetenedNutFoodItem.java @@ -1,24 +1,24 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import java.util.List; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.network.chat.Component; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.Level; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.util.List; - -public class SweetenedNutFoodItem extends Item implements IGarnishedItem { +public class SweetenedNutFoodItem extends Item implements IGarnishedUtilities { public SweetenedNutFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.SWEETENED_NUT)); + super(properties.food(GarnishedFoodValues.SWEETENED_NUT)); } @Override public void appendHoverText(@NotNull ItemStack stack, @Nullable Level level, List tooltip, @NotNull TooltipFlag isAdvanced) { - tooltip.add(Component.translatable(sweetenedText()).withStyle(getSweetenedColouring())); + tooltip.add(Component.translatable(sweetenedText()).withStyle(sweetened())); } } diff --git a/src/main/java/net/dakotapride/garnished/item/SweetenedNutMixFoodItem.java b/src/main/java/net/dakotapride/garnished/item/SweetenedNutMixFoodItem.java index 1b857cdc..8edda7f2 100644 --- a/src/main/java/net/dakotapride/garnished/item/SweetenedNutMixFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/SweetenedNutMixFoodItem.java @@ -1,24 +1,24 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import java.util.List; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.network.chat.Component; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.Level; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.util.List; - -public class SweetenedNutMixFoodItem extends Item implements IGarnishedItem { +public class SweetenedNutMixFoodItem extends Item implements IGarnishedUtilities { public SweetenedNutMixFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.SWEETENED_NUT_MIX).stacksTo(16)); + super(properties.food(GarnishedFoodValues.SWEETENED_NUT_MIX).stacksTo(16)); } @Override public void appendHoverText(@NotNull ItemStack stack, @Nullable Level level, List tooltip, @NotNull TooltipFlag isAdvanced) { - tooltip.add(Component.translatable(sweetenedText()).withStyle(getSweetenedColouring())); + tooltip.add(Component.translatable(sweetenedText()).withStyle(sweetened())); } } diff --git a/src/main/java/net/dakotapride/garnished/item/ThornOnAStickFoodItem.java b/src/main/java/net/dakotapride/garnished/item/ThornOnAStickFoodItem.java index 1c8a7a98..e55d7b67 100644 --- a/src/main/java/net/dakotapride/garnished/item/ThornOnAStickFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/ThornOnAStickFoodItem.java @@ -1,10 +1,10 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.world.item.Item; -public class ThornOnAStickFoodItem extends Item implements IGarnishedItem { +public class ThornOnAStickFoodItem extends Item implements IGarnishedUtilities { public ThornOnAStickFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.THORN_ON_A_STICK).stacksTo(16)); + super(properties.food(GarnishedFoodValues.THORN_ON_A_STICK).stacksTo(16)); } } diff --git a/src/main/java/net/dakotapride/garnished/item/TophetBrewFoodItem.java b/src/main/java/net/dakotapride/garnished/item/TophetBrewFoodItem.java index 4316209f..29335913 100644 --- a/src/main/java/net/dakotapride/garnished/item/TophetBrewFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/TophetBrewFoodItem.java @@ -1,7 +1,8 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedEffects; -import net.dakotapride.garnished.registry.GarnishedFoods; +import org.jetbrains.annotations.NotNull; + +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.server.level.ServerPlayer; import net.minecraft.stats.Stats; @@ -15,11 +16,9 @@ import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; -import org.jetbrains.annotations.NotNull; - -public class TophetBrewFoodItem extends Item implements IGarnishedItem { +public class TophetBrewFoodItem extends Item implements IGarnishedUtilities { public TophetBrewFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.TOPHET_BREW).stacksTo(1)); + super(properties.food(GarnishedFoodValues.TOPHET_BREW).stacksTo(1)); } @Override diff --git a/src/main/java/net/dakotapride/garnished/item/UngarnishedNutFoodItem.java b/src/main/java/net/dakotapride/garnished/item/UngarnishedNutFoodItem.java index db877be7..e0488e69 100644 --- a/src/main/java/net/dakotapride/garnished/item/UngarnishedNutFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/UngarnishedNutFoodItem.java @@ -1,24 +1,24 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import java.util.List; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.network.chat.Component; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.Level; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.util.List; - -public class UngarnishedNutFoodItem extends Item implements IGarnishedItem { +public class UngarnishedNutFoodItem extends Item implements IGarnishedUtilities { public UngarnishedNutFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.UNGARNISHED_NUT)); + super(properties.food(GarnishedFoodValues.UNGARNISHED_NUT)); } @Override public void appendHoverText(@NotNull ItemStack stack, @Nullable Level level, List tooltip, @NotNull TooltipFlag isAdvanced) { - tooltip.add(Component.translatable(ungarnishedText()).withStyle(getStandardColouring())); + tooltip.add(Component.translatable(ungarnishedText()).withStyle(standard())); } } diff --git a/src/main/java/net/dakotapride/garnished/item/VastBrewFoodItem.java b/src/main/java/net/dakotapride/garnished/item/VastBrewFoodItem.java index c7c6d5c2..95431847 100644 --- a/src/main/java/net/dakotapride/garnished/item/VastBrewFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/VastBrewFoodItem.java @@ -2,7 +2,7 @@ import org.jetbrains.annotations.NotNull; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.server.level.ServerPlayer; import net.minecraft.stats.Stats; @@ -16,9 +16,9 @@ import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; -public class VastBrewFoodItem extends Item implements IGarnishedItem { +public class VastBrewFoodItem extends Item implements IGarnishedUtilities { public VastBrewFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.VAST_BREW).stacksTo(1)); + super(properties.food(GarnishedFoodValues.VAST_BREW).stacksTo(1)); } @Override diff --git a/src/main/java/net/dakotapride/garnished/item/VenerableDelicacyFoodItem.java b/src/main/java/net/dakotapride/garnished/item/VenerableDelicacyFoodItem.java index 8f41f9e4..3588956d 100644 --- a/src/main/java/net/dakotapride/garnished/item/VenerableDelicacyFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/VenerableDelicacyFoodItem.java @@ -1,10 +1,10 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.world.item.Item; public class VenerableDelicacyFoodItem extends Item { public VenerableDelicacyFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.VENERABLE_DELICACY).stacksTo(16)); + super(properties.food(GarnishedFoodValues.VENERABLE_DELICACY).stacksTo(16)); } } diff --git a/src/main/java/net/dakotapride/garnished/item/VermilionStewFoodItem.java b/src/main/java/net/dakotapride/garnished/item/VermilionStewFoodItem.java index 5dc65d3f..f42484fc 100644 --- a/src/main/java/net/dakotapride/garnished/item/VermilionStewFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/VermilionStewFoodItem.java @@ -2,7 +2,7 @@ import org.jetbrains.annotations.NotNull; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.server.level.ServerPlayer; import net.minecraft.stats.Stats; @@ -16,9 +16,9 @@ import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; -public class VermilionStewFoodItem extends Item implements IGarnishedItem { +public class VermilionStewFoodItem extends Item implements IGarnishedUtilities { public VermilionStewFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.VERMILION_STEW).stacksTo(1)); + super(properties.food(GarnishedFoodValues.VERMILION_STEW).stacksTo(1)); } @Override diff --git a/src/main/java/net/dakotapride/garnished/item/VoidMixtureFoodItem.java b/src/main/java/net/dakotapride/garnished/item/VoidMixtureFoodItem.java index d82d3d0e..b375942f 100644 --- a/src/main/java/net/dakotapride/garnished/item/VoidMixtureFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/VoidMixtureFoodItem.java @@ -1,11 +1,8 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedEffects; -import net.minecraft.world.effect.MobEffectInstance; - import org.jetbrains.annotations.NotNull; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.server.level.ServerPlayer; import net.minecraft.stats.Stats; @@ -19,9 +16,9 @@ import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; -public class VoidMixtureFoodItem extends Item implements IGarnishedItem { +public class VoidMixtureFoodItem extends Item implements IGarnishedUtilities { public VoidMixtureFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.VOID_MIXTURE).stacksTo(1)); + super(properties.food(GarnishedFoodValues.VOID_MIXTURE).stacksTo(1)); } @Override diff --git a/src/main/java/net/dakotapride/garnished/item/VoidStroganoffFoodItem.java b/src/main/java/net/dakotapride/garnished/item/VoidStroganoffFoodItem.java index 87b2d4be..5912a2ea 100644 --- a/src/main/java/net/dakotapride/garnished/item/VoidStroganoffFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/VoidStroganoffFoodItem.java @@ -2,7 +2,7 @@ import org.jetbrains.annotations.NotNull; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.server.level.ServerPlayer; import net.minecraft.stats.Stats; @@ -16,9 +16,9 @@ import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; -public class VoidStroganoffFoodItem extends Item implements IGarnishedItem { +public class VoidStroganoffFoodItem extends Item implements IGarnishedUtilities { public VoidStroganoffFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.VOID_STROGANOFF).stacksTo(1)); + super(properties.food(GarnishedFoodValues.VOID_STROGANOFF).stacksTo(1)); } @Override diff --git a/src/main/java/net/dakotapride/garnished/item/WalnutBrownieFoodItem.java b/src/main/java/net/dakotapride/garnished/item/WalnutBrownieFoodItem.java index 07c2531b..c04e8728 100644 --- a/src/main/java/net/dakotapride/garnished/item/WalnutBrownieFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/WalnutBrownieFoodItem.java @@ -1,19 +1,10 @@ package net.dakotapride.garnished.item; -import java.util.List; - -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import net.dakotapride.garnished.registry.GarnishedFoods; -import net.minecraft.network.chat.Component; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.TooltipFlag; -import net.minecraft.world.level.Level; -public class WalnutBrownieFoodItem extends Item implements IGarnishedItem { +public class WalnutBrownieFoodItem extends Item implements IGarnishedUtilities { public WalnutBrownieFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.WALNUT_BROWNIE)); + super(properties.food(GarnishedFoodValues.WALNUT_BROWNIE)); } } diff --git a/src/main/java/net/dakotapride/garnished/item/WalnutGorgeCreamFoodItem.java b/src/main/java/net/dakotapride/garnished/item/WalnutGorgeCreamFoodItem.java index f771bc17..4e9738b6 100644 --- a/src/main/java/net/dakotapride/garnished/item/WalnutGorgeCreamFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/WalnutGorgeCreamFoodItem.java @@ -1,6 +1,8 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import org.jetbrains.annotations.NotNull; + +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.server.level.ServerPlayer; import net.minecraft.stats.Stats; @@ -14,11 +16,9 @@ import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; -import org.jetbrains.annotations.NotNull; - -public class WalnutGorgeCreamFoodItem extends Item implements IGarnishedItem { +public class WalnutGorgeCreamFoodItem extends Item implements IGarnishedUtilities { public WalnutGorgeCreamFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.WALNUT_GORGE_CREAM).stacksTo(1)); + super(properties.food(GarnishedFoodValues.WALNUT_GORGE_CREAM).stacksTo(1)); } @Override diff --git a/src/main/java/net/dakotapride/garnished/item/WarpedBrewFoodItem.java b/src/main/java/net/dakotapride/garnished/item/WarpedBrewFoodItem.java index 47335257..3ccdedae 100644 --- a/src/main/java/net/dakotapride/garnished/item/WarpedBrewFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/WarpedBrewFoodItem.java @@ -2,7 +2,7 @@ import org.jetbrains.annotations.NotNull; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.server.level.ServerPlayer; import net.minecraft.stats.Stats; @@ -16,9 +16,9 @@ import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; -public class WarpedBrewFoodItem extends Item implements IGarnishedItem { +public class WarpedBrewFoodItem extends Item implements IGarnishedUtilities { public WarpedBrewFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.WARPED_BREW).stacksTo(1)); + super(properties.food(GarnishedFoodValues.WARPED_BREW).stacksTo(1)); } @Override diff --git a/src/main/java/net/dakotapride/garnished/item/WeepingTangleFoodItem.java b/src/main/java/net/dakotapride/garnished/item/WeepingTangleFoodItem.java index 76b925f9..66e6f095 100644 --- a/src/main/java/net/dakotapride/garnished/item/WeepingTangleFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/WeepingTangleFoodItem.java @@ -1,10 +1,10 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.world.item.Item; -public class WeepingTangleFoodItem extends Item implements IGarnishedItem { +public class WeepingTangleFoodItem extends Item implements IGarnishedUtilities { public WeepingTangleFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.WEEPING_TANGLE).stacksTo(16)); + super(properties.food(GarnishedFoodValues.WEEPING_TANGLE).stacksTo(16)); } } diff --git a/src/main/java/net/dakotapride/garnished/item/WheatGrazeFoodItem.java b/src/main/java/net/dakotapride/garnished/item/WheatGrazeFoodItem.java index be212c1a..ece7207e 100644 --- a/src/main/java/net/dakotapride/garnished/item/WheatGrazeFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/WheatGrazeFoodItem.java @@ -1,10 +1,10 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.world.item.Item; -public class WheatGrazeFoodItem extends Item implements IGarnishedItem { +public class WheatGrazeFoodItem extends Item implements IGarnishedUtilities { public WheatGrazeFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.WHEAT_GRAZE)); + super(properties.food(GarnishedFoodValues.WHEAT_GRAZE)); } } diff --git a/src/main/java/net/dakotapride/garnished/item/WrappedCrimsonTangleFoodItem.java b/src/main/java/net/dakotapride/garnished/item/WrappedCrimsonTangleFoodItem.java index 065bd5a4..9b53fcfa 100644 --- a/src/main/java/net/dakotapride/garnished/item/WrappedCrimsonTangleFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/WrappedCrimsonTangleFoodItem.java @@ -2,7 +2,7 @@ import org.jetbrains.annotations.NotNull; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.dakotapride.garnished.registry.GarnishedItems; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.server.level.ServerPlayer; @@ -16,9 +16,9 @@ import net.minecraft.world.item.ItemUtils; import net.minecraft.world.level.Level; -public class WrappedCrimsonTangleFoodItem extends Item implements IGarnishedItem { +public class WrappedCrimsonTangleFoodItem extends Item implements IGarnishedUtilities { public WrappedCrimsonTangleFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.WRAPPED_CRIMSON_TANGLE).stacksTo(16)); + super(properties.food(GarnishedFoodValues.CRIMSON_TANGLE).stacksTo(16)); } @Override diff --git a/src/main/java/net/dakotapride/garnished/item/WrappedSepiaTangleFoodItem.java b/src/main/java/net/dakotapride/garnished/item/WrappedSepiaTangleFoodItem.java index 8bbcca3e..2c6f5cd4 100644 --- a/src/main/java/net/dakotapride/garnished/item/WrappedSepiaTangleFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/WrappedSepiaTangleFoodItem.java @@ -2,15 +2,13 @@ import org.jetbrains.annotations.NotNull; -import net.dakotapride.garnished.registry.GarnishedEffects; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.dakotapride.garnished.registry.GarnishedItems; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.server.level.ServerPlayer; import net.minecraft.stats.Stats; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResultHolder; -import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; @@ -18,9 +16,9 @@ import net.minecraft.world.item.ItemUtils; import net.minecraft.world.level.Level; -public class WrappedSepiaTangleFoodItem extends Item implements IGarnishedItem { +public class WrappedSepiaTangleFoodItem extends Item implements IGarnishedUtilities { public WrappedSepiaTangleFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.WRAPPED_SEPIA_TANGLE).stacksTo(16)); + super(properties.food(GarnishedFoodValues.SEPIA_TANGLE).stacksTo(16)); } @Override diff --git a/src/main/java/net/dakotapride/garnished/item/WrappedWarpedTangleFoodItem.java b/src/main/java/net/dakotapride/garnished/item/WrappedWarpedTangleFoodItem.java index 51d28b95..d7ccd23b 100644 --- a/src/main/java/net/dakotapride/garnished/item/WrappedWarpedTangleFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/WrappedWarpedTangleFoodItem.java @@ -2,7 +2,7 @@ import org.jetbrains.annotations.NotNull; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.dakotapride.garnished.registry.GarnishedItems; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.server.level.ServerPlayer; @@ -16,9 +16,9 @@ import net.minecraft.world.item.ItemUtils; import net.minecraft.world.level.Level; -public class WrappedWarpedTangleFoodItem extends Item implements IGarnishedItem { +public class WrappedWarpedTangleFoodItem extends Item implements IGarnishedUtilities { public WrappedWarpedTangleFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.WRAPPED_WARPED_TANGLE).stacksTo(16)); + super(properties.food(GarnishedFoodValues.WARPED_TANGLE).stacksTo(16)); } @Override diff --git a/src/main/java/net/dakotapride/garnished/item/YamOGlowPuffsFoodItem.java b/src/main/java/net/dakotapride/garnished/item/YamOGlowPuffsFoodItem.java index 0d137962..f285746f 100644 --- a/src/main/java/net/dakotapride/garnished/item/YamOGlowPuffsFoodItem.java +++ b/src/main/java/net/dakotapride/garnished/item/YamOGlowPuffsFoodItem.java @@ -1,10 +1,10 @@ package net.dakotapride.garnished.item; -import net.dakotapride.garnished.registry.GarnishedFoods; +import net.dakotapride.garnished.registry.GarnishedFoodValues; import net.minecraft.world.item.Item; -public class YamOGlowPuffsFoodItem extends Item implements IGarnishedItem { +public class YamOGlowPuffsFoodItem extends Item implements IGarnishedUtilities { public YamOGlowPuffsFoodItem(Properties properties) { - super(properties.food(GarnishedFoods.YAM_O_GLOW_PUFFS)); + super(properties.food(GarnishedFoodValues.YAM_O_GLOW_PUFFS)); } } diff --git a/src/main/java/net/dakotapride/garnished/item/cracked/CrackedAlmondItem.java b/src/main/java/net/dakotapride/garnished/item/cracked/CrackedAlmondItem.java index 96d14e94..c083025c 100644 --- a/src/main/java/net/dakotapride/garnished/item/cracked/CrackedAlmondItem.java +++ b/src/main/java/net/dakotapride/garnished/item/cracked/CrackedAlmondItem.java @@ -1,7 +1,6 @@ package net.dakotapride.garnished.item.cracked; import net.dakotapride.garnished.registry.GarnishedBlocks; -import net.minecraft.world.level.block.Blocks; public class CrackedAlmondItem extends CrackedNutItem { public CrackedAlmondItem(Properties properties) { diff --git a/src/main/java/net/dakotapride/garnished/item/cracked/CrackedBuhgItem.java b/src/main/java/net/dakotapride/garnished/item/cracked/CrackedBuhgItem.java index 2a00c8da..f6bfd9ff 100644 --- a/src/main/java/net/dakotapride/garnished/item/cracked/CrackedBuhgItem.java +++ b/src/main/java/net/dakotapride/garnished/item/cracked/CrackedBuhgItem.java @@ -1,7 +1,6 @@ package net.dakotapride.garnished.item.cracked; import net.dakotapride.garnished.registry.GarnishedBlocks; -import net.minecraft.world.level.block.Blocks; public class CrackedBuhgItem extends CrackedNutItem { public CrackedBuhgItem(Properties properties) { diff --git a/src/main/java/net/dakotapride/garnished/item/cracked/CrackedCashewItem.java b/src/main/java/net/dakotapride/garnished/item/cracked/CrackedCashewItem.java index 1989d18a..e29e60fd 100644 --- a/src/main/java/net/dakotapride/garnished/item/cracked/CrackedCashewItem.java +++ b/src/main/java/net/dakotapride/garnished/item/cracked/CrackedCashewItem.java @@ -1,7 +1,6 @@ package net.dakotapride.garnished.item.cracked; import net.dakotapride.garnished.registry.GarnishedBlocks; -import net.minecraft.world.level.block.Blocks; public class CrackedCashewItem extends CrackedNutItem { public CrackedCashewItem(Properties properties) { diff --git a/src/main/java/net/dakotapride/garnished/item/cracked/CrackedHazelnutItem.java b/src/main/java/net/dakotapride/garnished/item/cracked/CrackedHazelnutItem.java index 2da1fcf9..79ad10d0 100644 --- a/src/main/java/net/dakotapride/garnished/item/cracked/CrackedHazelnutItem.java +++ b/src/main/java/net/dakotapride/garnished/item/cracked/CrackedHazelnutItem.java @@ -1,7 +1,6 @@ package net.dakotapride.garnished.item.cracked; import net.dakotapride.garnished.registry.GarnishedBlocks; -import net.minecraft.world.level.block.Blocks; public class CrackedHazelnutItem extends CrackedNutItem { public CrackedHazelnutItem(Properties properties) { diff --git a/src/main/java/net/dakotapride/garnished/item/cracked/CrackedMacadamiaItem.java b/src/main/java/net/dakotapride/garnished/item/cracked/CrackedMacadamiaItem.java index 99aaac99..c4d925bc 100644 --- a/src/main/java/net/dakotapride/garnished/item/cracked/CrackedMacadamiaItem.java +++ b/src/main/java/net/dakotapride/garnished/item/cracked/CrackedMacadamiaItem.java @@ -1,7 +1,6 @@ package net.dakotapride.garnished.item.cracked; import net.dakotapride.garnished.registry.GarnishedBlocks; -import net.minecraft.world.level.block.Blocks; public class CrackedMacadamiaItem extends CrackedNutItem { public CrackedMacadamiaItem(Properties properties) { diff --git a/src/main/java/net/dakotapride/garnished/item/cracked/CrackedNutItem.java b/src/main/java/net/dakotapride/garnished/item/cracked/CrackedNutItem.java index ddf56cc3..e91f1444 100644 --- a/src/main/java/net/dakotapride/garnished/item/cracked/CrackedNutItem.java +++ b/src/main/java/net/dakotapride/garnished/item/cracked/CrackedNutItem.java @@ -1,7 +1,11 @@ package net.dakotapride.garnished.item.cracked; +import java.util.List; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + import net.minecraft.ChatFormatting; -import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.Component; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.ItemStack; @@ -9,18 +13,13 @@ import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.util.List; - public class CrackedNutItem extends BlockItem { public CrackedNutItem(Block block, Properties properties) { super(block, properties); } @Override - public void appendHoverText(@NotNull ItemStack stack, @Nullable Level level, List tooltip, @NotNull TooltipFlag isAdvanced) { + public void appendHoverText(@NotNull ItemStack stack, @Nullable Level level, @NotNull List tooltip, @NotNull TooltipFlag isAdvanced) { tooltip.add(Component.translatable("text.garnished.nut.cracked").withStyle(ChatFormatting.GRAY)); } } diff --git a/src/main/java/net/dakotapride/garnished/item/cracked/CrackedPecanItem.java b/src/main/java/net/dakotapride/garnished/item/cracked/CrackedPecanItem.java index a8f0116e..a8662bfd 100644 --- a/src/main/java/net/dakotapride/garnished/item/cracked/CrackedPecanItem.java +++ b/src/main/java/net/dakotapride/garnished/item/cracked/CrackedPecanItem.java @@ -1,7 +1,6 @@ package net.dakotapride.garnished.item.cracked; import net.dakotapride.garnished.registry.GarnishedBlocks; -import net.minecraft.world.level.block.Blocks; public class CrackedPecanItem extends CrackedNutItem { public CrackedPecanItem(Properties properties) { diff --git a/src/main/java/net/dakotapride/garnished/item/cracked/CrackedPistachioItem.java b/src/main/java/net/dakotapride/garnished/item/cracked/CrackedPistachioItem.java index bf74dfd5..59f6c0af 100644 --- a/src/main/java/net/dakotapride/garnished/item/cracked/CrackedPistachioItem.java +++ b/src/main/java/net/dakotapride/garnished/item/cracked/CrackedPistachioItem.java @@ -1,7 +1,6 @@ package net.dakotapride.garnished.item.cracked; import net.dakotapride.garnished.registry.GarnishedBlocks; -import net.minecraft.world.level.block.Blocks; public class CrackedPistachioItem extends CrackedNutItem { public CrackedPistachioItem(Properties properties) { diff --git a/src/main/java/net/dakotapride/garnished/item/cracked/CrackedWalnutItem.java b/src/main/java/net/dakotapride/garnished/item/cracked/CrackedWalnutItem.java index fe14a408..53eca7c4 100644 --- a/src/main/java/net/dakotapride/garnished/item/cracked/CrackedWalnutItem.java +++ b/src/main/java/net/dakotapride/garnished/item/cracked/CrackedWalnutItem.java @@ -1,7 +1,6 @@ package net.dakotapride.garnished.item.cracked; import net.dakotapride.garnished.registry.GarnishedBlocks; -import net.minecraft.world.level.block.Blocks; public class CrackedWalnutItem extends CrackedNutItem { public CrackedWalnutItem(Properties properties) { diff --git a/src/main/java/net/dakotapride/garnished/item/scratch_paper/PolarHideScratchPaperItem.java b/src/main/java/net/dakotapride/garnished/item/scratch_paper/PolarHideScratchPaperItem.java deleted file mode 100644 index b0ff12fb..00000000 --- a/src/main/java/net/dakotapride/garnished/item/scratch_paper/PolarHideScratchPaperItem.java +++ /dev/null @@ -1,158 +0,0 @@ -package net.dakotapride.garnished.item.scratch_paper; - -import javax.annotation.ParametersAreNonnullByDefault; - -import com.simibubi.create.AllSoundEvents; -import com.simibubi.create.foundation.item.CustomUseEffectsItem; -import com.simibubi.create.foundation.mixin.accessor.LivingEntityAccessor; -import com.simibubi.create.foundation.utility.VecHelper; - -import io.github.fabricators_of_create.porting_lib.util.NBTSerializer; -import net.dakotapride.garnished.registry.GarnishedEffects; -import net.dakotapride.garnished.registry.GarnishedItems; -import net.minecraft.MethodsReturnNonnullByDefault; -import net.minecraft.core.particles.ItemParticleOption; -import net.minecraft.core.particles.ParticleTypes; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.sounds.SoundEvent; -import net.minecraft.util.RandomSource; -import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResult; -import net.minecraft.world.InteractionResultHolder; -import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Items; -import net.minecraft.world.item.UseAnim; -import net.minecraft.world.level.Level; -import net.minecraft.world.phys.Vec3; - -@MethodsReturnNonnullByDefault -@ParametersAreNonnullByDefault -public class PolarHideScratchPaperItem extends Item implements CustomUseEffectsItem { - - public PolarHideScratchPaperItem(Properties properties) { - super(properties.defaultDurability(16)); - } - - @Override - public InteractionResultHolder use(Level worldIn, Player playerIn, InteractionHand handIn) { - ItemStack itemstack = playerIn.getItemInHand(handIn); - InteractionResultHolder FAIL = new InteractionResultHolder<>(InteractionResult.FAIL, itemstack); - - if (itemstack.getOrCreateTag() - .contains("ClearsEffect")) { - playerIn.startUsingItem(handIn); - return new InteractionResultHolder<>(InteractionResult.PASS, itemstack); - } - - InteractionHand otherHand = - handIn == InteractionHand.MAIN_HAND ? InteractionHand.OFF_HAND : InteractionHand.MAIN_HAND; - ItemStack itemInOtherHand = playerIn.getItemInHand(otherHand); - if ((playerIn.hasEffect(GarnishedEffects.FREEZING) || playerIn.isFreezing() || playerIn.getTicksFrozen() > 0) && itemInOtherHand.is(GarnishedItems.FROST.get())) { - ItemStack item = itemInOtherHand.copy(); - ItemStack toUtilize = item.split(1); - playerIn.startUsingItem(handIn); - itemstack.getOrCreateTag() - .put("ClearsEffect", NBTSerializer.serializeNBT(toUtilize)); - playerIn.setItemInHand(otherHand, item); - return new InteractionResultHolder<>(InteractionResult.SUCCESS, itemstack); - } - - return FAIL; - - } - - @Override - public ItemStack finishUsingItem(ItemStack stack, Level worldIn, LivingEntity living) { - if (!(living instanceof Player player)) - return stack; - CompoundTag tag = stack.getOrCreateTag(); - if (tag.contains("ClearsEffect")) { - - if (worldIn.isClientSide) { - spawnParticles(living.getEyePosition(1).add(living.getLookAngle().scale(.5f)), Items.BLUE_ICE.getDefaultInstance(), worldIn); - return stack; - } - - player.removeEffect(GarnishedEffects.FREEZING); - player.setTicksFrozen(0); - tag.remove("ClearsEffect"); - stack.hurtAndBreak(1, living, p -> p.broadcastBreakEvent(p.getUsedItemHand())); - } - - return stack; - } - - public static void spawnParticles(Vec3 location, ItemStack particleStack, Level world) { - for (int i = 0; i < 20; i++) { - Vec3 motion = VecHelper.offsetRandomly(Vec3.ZERO, world.random, 1 / 8f); - world.addParticle(new ItemParticleOption(ParticleTypes.ITEM, particleStack), location.x, location.y, - location.z, motion.x, motion.y, motion.z); - } - } - - @Override - public void releaseUsing(ItemStack stack, Level worldIn, LivingEntity entityLiving, int timeLeft) { - if (!(entityLiving instanceof Player)) - return; - Player player = (Player) entityLiving; - CompoundTag tag = stack.getOrCreateTag(); - if (tag.contains("ClearsEffect")) { - ItemStack toUtilize = ItemStack.of(tag.getCompound("ClearsEffect")); - player.getInventory() - .placeItemBackInInventory(toUtilize); - tag.remove("ClearsEffect"); - } - } - -// @Override -// public boolean canPerformAction(ItemStack stack, ToolAction toolAction) { -// return toolAction == ToolActions.AXE_SCRAPE || toolAction == ToolActions.AXE_WAX_OFF; -// } - - @Override - public Boolean shouldTriggerUseEffects(ItemStack stack, LivingEntity entity) { - // Trigger every tick so that we have more fine grain control over the animation - return true; - } - - @Override - public boolean triggerUseEffects(ItemStack stack, LivingEntity entity, int count, RandomSource random) { - CompoundTag tag = stack.getOrCreateTag(); - if (tag.contains("ClearsEffect")) { - ItemStack clearingEffect = ItemStack.of(tag.getCompound("ClearsEffect")); - ((LivingEntityAccessor) entity).create$callSpawnItemParticles(clearingEffect, 1); - } - - // After 6 ticks play the sound every 7th - if ((entity.getTicksUsingItem() - 6) % 7 == 0) - entity.playSound(entity.getEatingSound(stack), 0.9F + 0.2F * random.nextFloat(), - random.nextFloat() * 0.2F + 0.9F); - - return true; - } - - @Override - public SoundEvent getEatingSound() { - return AllSoundEvents.SANDING_SHORT.getMainEvent(); - } - - @Override - public UseAnim getUseAnimation(ItemStack stack) { - return UseAnim.EAT; - } - - @Override - public int getUseDuration(ItemStack stack) { - return 16; - } - - @Override - public int getEnchantmentValue() { - return 1; - } - -} - diff --git a/src/main/java/net/dakotapride/garnished/item/tab/GarnishedCreativeModeTab.java b/src/main/java/net/dakotapride/garnished/item/tab/GarnishedCreativeModeTab.java index 49d0c8e2..75d3a5d8 100644 --- a/src/main/java/net/dakotapride/garnished/item/tab/GarnishedCreativeModeTab.java +++ b/src/main/java/net/dakotapride/garnished/item/tab/GarnishedCreativeModeTab.java @@ -412,6 +412,8 @@ public void fillItemList(NonNullList output) { output.add(GarnishedBlocks.SEPIA_HYPHAE.asStack()); output.add(GarnishedBlocks.STRIPPED_SEPIA_HYPHAE.asStack()); output.add(GarnishedBlocks.SEPIA_PLANKS.asStack()); + output.add(GarnishedBlocks.SEPIA_WINDOW.asStack()); + output.add(GarnishedBlocks.SEPIA_WINDOW_PANE.asStack()); output.add(GarnishedBlocks.SEPIA_SLAB.asStack()); output.add(GarnishedBlocks.SEPIA_STAIRS.asStack()); output.add(GarnishedBlocks.SEPIA_TRAPDOOR.asStack()); @@ -424,6 +426,8 @@ public void fillItemList(NonNullList output) { output.add(GarnishedBlocks.NUT_WOOD.asStack()); output.add(GarnishedBlocks.STRIPPED_NUT_WOOD.asStack()); output.add(GarnishedBlocks.NUT_PLANKS.asStack()); + output.add(GarnishedBlocks.NUT_WINDOW.asStack()); + output.add(GarnishedBlocks.NUT_WINDOW_PANE.asStack()); output.add(GarnishedBlocks.NUT_SLAB.asStack()); output.add(GarnishedBlocks.NUT_STAIRS.asStack()); output.add(GarnishedBlocks.NUT_TRAPDOOR.asStack()); @@ -433,6 +437,28 @@ public void fillItemList(NonNullList output) { output.add(GarnishedItems.NUT_BOAT.asStack()); output.add(GarnishedItems.NUT_CHEST_BOAT.asStack()); + output.add(GarnishedBlocks.NUT_LEAVES.asStack()); + output.add(GarnishedBlocks.UNASSIGNED_NUT_LEAVES.asStack()); + output.add(GarnishedBlocks.CASHEW_LEAVES.asStack()); + output.add(GarnishedBlocks.WALNUT_LEAVES.asStack()); + output.add(GarnishedBlocks.ALMOND_LEAVES.asStack()); + output.add(GarnishedBlocks.PECAN_LEAVES.asStack()); + output.add(GarnishedBlocks.PISTACHIO_LEAVES.asStack()); + output.add(GarnishedBlocks.MACADAMIA_LEAVES.asStack()); + output.add(GarnishedBlocks.BUHG_LEAVES.asStack()); + output.add(GarnishedBlocks.HAZELNUT_LEAVES.asStack()); + output.add(GarnishedBlocks.CHESTNUT_LEAVES.asStack()); + + output.add(GarnishedBlocks.CASHEW_SACK.asStack()); + output.add(GarnishedBlocks.WALNUT_SACK.asStack()); + output.add(GarnishedBlocks.ALMOND_SACK.asStack()); + output.add(GarnishedBlocks.PECAN_SACK.asStack()); + output.add(GarnishedBlocks.PISTACHIO_SACK.asStack()); + output.add(GarnishedBlocks.MACADAMIA_SACK.asStack()); + output.add(GarnishedBlocks.BUHG_SACK.asStack()); + output.add(GarnishedBlocks.HAZELNUT_SACK.asStack()); + output.add(GarnishedBlocks.CHESTNUT_SACK.asStack()); + output.add(GarnishedBlocks.MASTIC_BLOCK.asStack()); output.add(GarnishedBlocks.RED_MASTIC_BLOCK.asStack()); output.add(GarnishedBlocks.ORANGE_MASTIC_BLOCK.asStack()); @@ -839,6 +865,9 @@ public void fillItemList(NonNullList output) { output.add(GarnishedBlocks.DRIED_DULSE_KELP_BLOCK.asStack()); output.add(GarnishedBlocks.VOLTAIC_SEA_GRASS.asStack()); + output.add(GarnishedBlocks.NUMBING_PARCHMENT_BLOCK.asStack()); + output.add(GarnishedBlocks.NUMBING_PARCHMENT_CARPET.asStack()); + output.add(GarnishedBlocks.SEPIA_FUNGUS.asStack()); output.add(GarnishedBlocks.SOUL_ROOTS.asStack()); output.add(GarnishedBlocks.INCANDESCENT_LILY.asStack()); diff --git a/src/main/java/net/dakotapride/garnished/mixin/ItemStackMixin.java b/src/main/java/net/dakotapride/garnished/mixin/ItemStackMixin.java index ad1a463f..40447c1f 100644 --- a/src/main/java/net/dakotapride/garnished/mixin/ItemStackMixin.java +++ b/src/main/java/net/dakotapride/garnished/mixin/ItemStackMixin.java @@ -1,5 +1,7 @@ package net.dakotapride.garnished.mixin; +import net.dakotapride.garnished.registry.GarnishedFoodValues; + import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; @@ -34,6 +36,19 @@ private void finishUsingItem(Level level, LivingEntity entity, CallbackInfoRetur entity.hurt(GarnishedDamageSource.MULCH_MUNCHING, 1.0F); } + // Sugar High functionality + GarnishedFoodValues.hasSugarHigh = entity.hasEffect(GarnishedEffects.SUGAR_HIGH); + // Freezing functionality + GarnishedFoodValues.hasFreezing = entity.hasEffect(GarnishedEffects.FREEZING); + // Hunger functionality + GarnishedFoodValues.hasHunger = entity.hasEffect(MobEffects.HUNGER); + // Levitation functionality + GarnishedFoodValues.hasLevitation = entity.hasEffect(MobEffects.LEVITATION); + // Bad Omen functionality + GarnishedFoodValues.hasBadOmen = entity.hasEffect(MobEffects.BAD_OMEN); + // Fire functionality + GarnishedFoodValues.isOnFire = entity.isOnFire() || !entity.fireImmune(); + } } diff --git a/src/main/java/net/dakotapride/garnished/registry/EMI/GarnishedEMI.java b/src/main/java/net/dakotapride/garnished/registry/EMI/GarnishedEMI.java index 10b4c857..c8849039 100644 --- a/src/main/java/net/dakotapride/garnished/registry/EMI/GarnishedEMI.java +++ b/src/main/java/net/dakotapride/garnished/registry/EMI/GarnishedEMI.java @@ -10,6 +10,7 @@ import com.simibubi.create.AllItems; import com.simibubi.create.AllMenuTypes; import com.simibubi.create.compat.emi.BlueprintTransferHandler; +import com.simibubi.create.compat.emi.CreateEmiPlugin; import com.simibubi.create.compat.emi.DoubleItemIcon; import com.simibubi.create.compat.emi.recipes.fan.FanEmiRecipe; import com.simibubi.create.content.decoration.palettes.AllPaletteStoneTypes; @@ -30,6 +31,7 @@ import net.dakotapride.garnished.recipe.MagentaDyeBlowingFanRecipe; import net.dakotapride.garnished.registry.GarnishedBlocks; import net.dakotapride.garnished.registry.GarnishedFluids; +import net.dakotapride.garnished.registry.GarnishedItems; import net.dakotapride.garnished.registry.GarnishedRecipeTypes; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Items; @@ -90,6 +92,8 @@ public void register(EmiRegistry registry) { ALL.forEach((id, category) -> registry.addCategory(category)); + registry.addWorkstation(CreateEmiPlugin.SANDPAPER_POLISHING, EmiStack.of(GarnishedItems.POLAR_HIDE_SCRATCH_PAPER.get())); + registry.addWorkstation(FAN_FREEZING, FanEmiRecipe.getFan("fan_freezing")); registry.addWorkstation(FAN_RED_DYEING, FanEmiRecipe.getFan("fan_red_dyeing")); registry.addWorkstation(FAN_ORANGE_DYEING, FanEmiRecipe.getFan("fan_orange_dyeing")); diff --git a/src/main/java/net/dakotapride/garnished/registry/GarnishedBlocks.java b/src/main/java/net/dakotapride/garnished/registry/GarnishedBlocks.java index bc067141..7f266510 100644 --- a/src/main/java/net/dakotapride/garnished/registry/GarnishedBlocks.java +++ b/src/main/java/net/dakotapride/garnished/registry/GarnishedBlocks.java @@ -1,5 +1,7 @@ package net.dakotapride.garnished.registry; +import com.simibubi.create.content.decoration.palettes.ConnectedGlassPaneBlock; +import com.simibubi.create.content.decoration.palettes.WindowBlock; import com.simibubi.create.foundation.data.AssetLookup; import com.simibubi.create.foundation.data.CreateRegistrate; import com.tterrag.registrate.util.entry.BlockEntry; @@ -14,11 +16,15 @@ import net.dakotapride.garnished.block.BokChoyPlantBlock; import net.dakotapride.garnished.block.CarnotiteStairsBlock; import net.dakotapride.garnished.block.DragonBreathFluidBlock; +import net.dakotapride.garnished.block.DragonStoneBlock; +import net.dakotapride.garnished.block.DragonStoneSlabBlock; import net.dakotapride.garnished.block.DragonStoneStairsBlock; +import net.dakotapride.garnished.block.DragonStoneWallBlock; import net.dakotapride.garnished.block.EnderJellyBlock; import net.dakotapride.garnished.block.MasticBlock; import net.dakotapride.garnished.block.NetherFlowerBlock; import net.dakotapride.garnished.block.NetherLichenBlock; +import net.dakotapride.garnished.block.NumbingParchmentBlock; import net.dakotapride.garnished.block.NutSackBlock; import net.dakotapride.garnished.block.RitualisticStoneStairsBlock; import net.dakotapride.garnished.block.SolidifiedGarnishBlock; @@ -82,6 +88,9 @@ import net.minecraft.world.level.material.MaterialColor; import net.minecraft.world.level.material.PushReaction; +import static net.dakotapride.garnished.registry.GarnishedCT.woodenWindowBlock; +import static net.dakotapride.garnished.registry.GarnishedCT.woodenWindowPaneBlock; + @SuppressWarnings({"unused"}) public class GarnishedBlocks { private static final CreateRegistrate REGISTRATE = CreateGarnished.registrate() @@ -212,6 +221,14 @@ public class GarnishedBlocks { .properties(p -> p.color(MaterialColor.GRASS).noCollission().instabreak().sound(SoundType.GRASS)) .register(); + public static final BlockEntry UNASSIGNED_NUT_LEAVES = + REGISTRATE.block("unassigned_nut_leaves", NutLeavesBlock::new) + .blockstate((ctx, pov) -> pov.simpleBlock(ctx.get(), AssetLookup.standardModel(ctx, pov))) + .initialProperties(() -> Blocks.OAK_LEAVES) + .simpleItem() + .properties(p -> p.color(MaterialColor.GRASS).noOcclusion().strength(0.2F).randomTicks()) + .register(); + public static final BlockEntry NUT_LEAVES = REGISTRATE.block("nut_leaves", NutLeavesBlock::new) .blockstate((ctx, pov) -> pov.simpleBlock(ctx.get(), AssetLookup.standardModel(ctx, pov))) @@ -510,6 +527,27 @@ public class GarnishedBlocks { .initialProperties(() -> Blocks.OAK_PRESSURE_PLATE) .properties(p -> p.color(MaterialColor.COLOR_LIGHT_GREEN)).register(); + // 2.0 - It took how many months for these windows to FINALLY be added? Damn. + public static final BlockEntry NUT_WINDOW = woodenWindowBlock("nut", () -> GarnishedCT.NUT_WINDOW, GarnishedBlocks.NUT_PLANKS); + public static final BlockEntry SEPIA_WINDOW = woodenWindowBlock("sepia", () -> GarnishedCT.SEPIA_WINDOW, GarnishedBlocks.SEPIA_PLANKS); + + public static final BlockEntry NUT_WINDOW_PANE = + woodenWindowPaneBlock("nut", () -> GarnishedCT.NUT_WINDOW_PANE, GarnishedBlocks.NUT_WINDOW); + public static final BlockEntry SEPIA_WINDOW_PANE = + woodenWindowPaneBlock("sepia", () -> GarnishedCT.SEPIA_WINDOW_PANE, GarnishedBlocks.SEPIA_WINDOW); + + // Other + public static final BlockEntry NUMBING_PARCHMENT_BLOCK = + REGISTRATE.block("numbing_parchment_block", NumbingParchmentBlock::new) + //.onRegister(connectedTextures(() -> new SimpleCTBehaviour(GarnishedCT.NUMBING_PARCHMENT))) + .initialProperties(() -> Blocks.WHITE_WOOL) + .simpleItem().register(); + public static final BlockEntry NUMBING_PARCHMENT_CARPET = + REGISTRATE.block("numbing_parchment_carpet", NumbingParchmentBlock.Carpet::new) + //.onRegister(connectedTextures(() -> new SimpleCTBehaviour(GarnishedCT.NUMBING_PARCHMENT))) + .initialProperties(() -> Blocks.WHITE_CARPET) + .simpleItem().register(); + public static BlockEntry masticResinRegistration(String colour0, String block0, NonNullFunction factory, Block block1) { return REGISTRATE.block((colour0 == "" ? colour0 : colour0 + "_") + block0, factory) .blockstate((ctx, pov) -> pov.simpleBlock(ctx.get(), AssetLookup.standardModel(ctx, pov))) @@ -1481,14 +1519,14 @@ public static BlockEntry masticsmoothwall(String colour0) { .initialProperties(() -> Blocks.POTTED_CRIMSON_FUNGUS).register(); - public static final BlockEntry DRAGON_STONE = - REGISTRATE.block("dragon_stone", Block::new) + public static final BlockEntry DRAGON_STONE = + REGISTRATE.block("dragon_stone", DragonStoneBlock::new) .blockstate((ctx, pov) -> pov.simpleBlock(ctx.get(), AssetLookup.standardModel(ctx, pov))) .simpleItem() .initialProperties(() -> Blocks.STONE) .properties(p -> p.explosionResistance(12.0F)).register(); - public static final BlockEntry DRAGON_STONE_SLAB = - REGISTRATE.block("dragon_stone_slab", SlabBlock::new) + public static final BlockEntry DRAGON_STONE_SLAB = + REGISTRATE.block("dragon_stone_slab", DragonStoneSlabBlock::new) .blockstate((ctx, pov) -> pov.simpleBlock(ctx.get(), AssetLookup.standardModel(ctx, pov))) .simpleItem() .initialProperties(() -> Blocks.STONE) @@ -1499,20 +1537,20 @@ public static BlockEntry masticsmoothwall(String colour0) { .simpleItem() .initialProperties(() -> Blocks.STONE) .properties(p -> p.explosionResistance(12.0F)).register(); - public static final BlockEntry DRAGON_STONE_WALL = - REGISTRATE.block("dragon_stone_wall", WallBlock::new) + public static final BlockEntry DRAGON_STONE_WALL = + REGISTRATE.block("dragon_stone_wall", DragonStoneWallBlock::new) .blockstate((ctx, pov) -> pov.simpleBlock(ctx.get(), AssetLookup.standardModel(ctx, pov))) .simpleItem() .initialProperties(() -> Blocks.STONE) .properties(p -> p.explosionResistance(12.0F)).register(); - public static final BlockEntry POLISHED_DRAGON_STONE = - REGISTRATE.block("polished_dragon_stone", Block::new) + public static final BlockEntry POLISHED_DRAGON_STONE = + REGISTRATE.block("polished_dragon_stone", DragonStoneBlock::new) .blockstate((ctx, pov) -> pov.simpleBlock(ctx.get(), AssetLookup.standardModel(ctx, pov))) .simpleItem() .initialProperties(() -> Blocks.STONE) .properties(p -> p.explosionResistance(12.0F)).register(); - public static final BlockEntry POLISHED_DRAGON_STONE_SLAB = - REGISTRATE.block("polished_dragon_stone_slab", SlabBlock::new) + public static final BlockEntry POLISHED_DRAGON_STONE_SLAB = + REGISTRATE.block("polished_dragon_stone_slab", DragonStoneSlabBlock::new) .blockstate((ctx, pov) -> pov.simpleBlock(ctx.get(), AssetLookup.standardModel(ctx, pov))) .simpleItem() .initialProperties(() -> Blocks.STONE) @@ -1523,20 +1561,20 @@ public static BlockEntry masticsmoothwall(String colour0) { .simpleItem() .initialProperties(() -> Blocks.STONE) .properties(p -> p.explosionResistance(12.0F)).register(); - public static final BlockEntry POLISHED_DRAGON_STONE_WALL = - REGISTRATE.block("polished_dragon_stone_wall", WallBlock::new) + public static final BlockEntry POLISHED_DRAGON_STONE_WALL = + REGISTRATE.block("polished_dragon_stone_wall", DragonStoneWallBlock::new) .blockstate((ctx, pov) -> pov.simpleBlock(ctx.get(), AssetLookup.standardModel(ctx, pov))) .simpleItem() .initialProperties(() -> Blocks.STONE) .properties(p -> p.explosionResistance(12.0F)).register(); - public static final BlockEntry DRAGON_STONE_BRICKS = - REGISTRATE.block("dragon_stone_bricks", Block::new) + public static final BlockEntry DRAGON_STONE_BRICKS = + REGISTRATE.block("dragon_stone_bricks", DragonStoneBlock::new) .blockstate((ctx, pov) -> pov.simpleBlock(ctx.get(), AssetLookup.standardModel(ctx, pov))) .simpleItem() .initialProperties(() -> Blocks.STONE) .properties(p -> p.explosionResistance(12.0F)).register(); - public static final BlockEntry DRAGON_STONE_BRICK_SLAB = - REGISTRATE.block("dragon_stone_brick_slab", SlabBlock::new) + public static final BlockEntry DRAGON_STONE_BRICK_SLAB = + REGISTRATE.block("dragon_stone_brick_slab", DragonStoneSlabBlock::new) .blockstate((ctx, pov) -> pov.simpleBlock(ctx.get(), AssetLookup.standardModel(ctx, pov))) .simpleItem() .initialProperties(() -> Blocks.STONE) @@ -1547,26 +1585,26 @@ public static BlockEntry masticsmoothwall(String colour0) { .simpleItem() .initialProperties(() -> Blocks.STONE) .properties(p -> p.explosionResistance(12.0F)).register(); - public static final BlockEntry DRAGON_STONE_BRICK_WALL = - REGISTRATE.block("dragon_stone_brick_wall", WallBlock::new) + public static final BlockEntry DRAGON_STONE_BRICK_WALL = + REGISTRATE.block("dragon_stone_brick_wall", DragonStoneWallBlock::new) .blockstate((ctx, pov) -> pov.simpleBlock(ctx.get(), AssetLookup.standardModel(ctx, pov))) .simpleItem() .initialProperties(() -> Blocks.STONE) .properties(p -> p.explosionResistance(12.0F)).register(); - public static final BlockEntry CHISELED_DRAGON_STONE_BRICKS = - REGISTRATE.block("chiseled_dragon_stone_bricks", Block::new) + public static final BlockEntry CHISELED_DRAGON_STONE_BRICKS = + REGISTRATE.block("chiseled_dragon_stone_bricks", DragonStoneBlock::new) .blockstate((ctx, pov) -> pov.simpleBlock(ctx.get(), AssetLookup.standardModel(ctx, pov))) .simpleItem() .initialProperties(() -> Blocks.STONE) .properties(p -> p.explosionResistance(12.0F)).register(); - public static final BlockEntry SMOOTH_DRAGON_STONE = - REGISTRATE.block("smooth_dragon_stone", Block::new) + public static final BlockEntry SMOOTH_DRAGON_STONE = + REGISTRATE.block("smooth_dragon_stone", DragonStoneBlock::new) .blockstate((ctx, pov) -> pov.simpleBlock(ctx.get(), AssetLookup.standardModel(ctx, pov))) .simpleItem() .initialProperties(() -> Blocks.STONE) .properties(p -> p.explosionResistance(12.0F)).register(); - public static final BlockEntry SMOOTH_DRAGON_STONE_SLAB = - REGISTRATE.block("smooth_dragon_stone_slab", SlabBlock::new) + public static final BlockEntry SMOOTH_DRAGON_STONE_SLAB = + REGISTRATE.block("smooth_dragon_stone_slab", DragonStoneSlabBlock::new) .blockstate((ctx, pov) -> pov.simpleBlock(ctx.get(), AssetLookup.standardModel(ctx, pov))) .simpleItem() .initialProperties(() -> Blocks.STONE) @@ -1577,8 +1615,8 @@ public static BlockEntry masticsmoothwall(String colour0) { .simpleItem() .initialProperties(() -> Blocks.STONE) .properties(p -> p.explosionResistance(12.0F)).register(); - public static final BlockEntry SMOOTH_DRAGON_STONE_WALL = - REGISTRATE.block("smooth_dragon_stone_wall", WallBlock::new) + public static final BlockEntry SMOOTH_DRAGON_STONE_WALL = + REGISTRATE.block("smooth_dragon_stone_wall", DragonStoneWallBlock::new) .blockstate((ctx, pov) -> pov.simpleBlock(ctx.get(), AssetLookup.standardModel(ctx, pov))) .simpleItem() .initialProperties(() -> Blocks.STONE) diff --git a/src/main/java/net/dakotapride/garnished/registry/GarnishedCT.java b/src/main/java/net/dakotapride/garnished/registry/GarnishedCT.java new file mode 100644 index 00000000..d61e5cbd --- /dev/null +++ b/src/main/java/net/dakotapride/garnished/registry/GarnishedCT.java @@ -0,0 +1,133 @@ +package net.dakotapride.garnished.registry; + +import static com.simibubi.create.foundation.data.CreateRegistrate.connectedTextures; + +import java.util.function.Supplier; + +import com.simibubi.create.content.decoration.palettes.ConnectedGlassPaneBlock; +import com.simibubi.create.content.decoration.palettes.WindowBlock; +import com.simibubi.create.foundation.block.connected.AllCTTypes; +import com.simibubi.create.foundation.block.connected.CTSpriteShiftEntry; +import com.simibubi.create.foundation.block.connected.CTSpriteShifter; +import com.simibubi.create.foundation.block.connected.CTType; +import com.simibubi.create.foundation.block.connected.HorizontalCTBehaviour; +import com.simibubi.create.foundation.block.render.SpriteShiftEntry; +import com.simibubi.create.foundation.block.render.SpriteShifter; +import com.simibubi.create.foundation.data.CreateRegistrate; +import com.tterrag.registrate.util.entry.BlockEntry; + +import net.dakotapride.garnished.CreateGarnished; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.core.BlockPos; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.level.BlockGetter; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.state.BlockBehaviour; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.material.MaterialColor; + + +public class GarnishedCT { + private static final CreateRegistrate REGISTRATE = CreateGarnished.registrate(); + + public static void setRegister() {} + + + /* Custom Window Gen */ + + + private static BlockBehaviour.Properties glassProperties(BlockBehaviour.Properties p) { + return p.isValidSpawn(GarnishedCT::never) + .isRedstoneConductor(GarnishedCT::never) + .isSuffocating(GarnishedCT::never) + .isViewBlocking(GarnishedCT::never); + } + + private static boolean never(BlockState state, BlockGetter getter, BlockPos pos) { + return false; + } + + private static Boolean never(BlockState state, BlockGetter getter, BlockPos pos, + EntityType entityType) { + return false; + } + + public static BlockEntry woodenWindowBlock(String name, Supplier entry, Supplier planksBlock) { + return woodenWindowBlock(name, entry, planksBlock, () -> RenderType::cutout, true); + } + + public static BlockEntry woodenWindowBlock(String name, Supplier entry, Supplier planksBlock, + Supplier> renderType, boolean translucent) { + return windowBlock(name, entry, renderType, + translucent, () -> planksBlock.get().defaultMaterialColor()); + } + + public static BlockEntry windowBlock(String name, + Supplier ct, Supplier> renderType, boolean translucent, + Supplier color) { + return REGISTRATE.block(name + "_window", p -> new WindowBlock(p, translucent)) + .onRegister(connectedTextures(() -> new HorizontalCTBehaviour(ct.get()))) + .addLayer(renderType) + .initialProperties(() -> Blocks.GLASS) + .properties(p -> p.color(color.get()).noOcclusion()) + .simpleItem() + .register(); + } + + + public static BlockEntry woodenWindowPaneBlock(String name, Supplier entry, Supplier windowsBlock) { + return woodenWindowPaneBlock(name, entry, windowsBlock, () -> RenderType::cutout); + } + + public static BlockEntry woodenWindowPaneBlock(String name, Supplier entry, Supplier windowsBlock, + Supplier> renderType) { + return windowPaneBlock(name, entry, renderType, () -> windowsBlock.get().defaultMaterialColor()); + } + + public static BlockEntry windowPaneBlock(String name, + Supplier ct, Supplier> renderType, + Supplier color) { + return REGISTRATE.block(name + "_window_pane", ConnectedGlassPaneBlock::new) + .onRegister(connectedTextures(() -> new HorizontalCTBehaviour(ct.get()))) + .addLayer(renderType) + .initialProperties(() -> Blocks.GLASS_PANE) + .properties(p -> p.color(color.get()).noOcclusion()) + .simpleItem() + .register(); + } + + + + private static CTSpriteShiftEntry omni(String name) { + return getCT(AllCTTypes.OMNIDIRECTIONAL, name); + } + + private static CTSpriteShiftEntry horizontal(String name) { + return getCT(AllCTTypes.HORIZONTAL, name); + } + + private static CTSpriteShiftEntry vertical(String name) { + return getCT(AllCTTypes.VERTICAL, name); + } + + public static final CTSpriteShiftEntry NUT_WINDOW = vertical("nut_window"); + public static final CTSpriteShiftEntry SEPIA_WINDOW = vertical("sepia_window"); + public static final CTSpriteShiftEntry NUT_WINDOW_PANE = vertical("nut_window"); + public static final CTSpriteShiftEntry SEPIA_WINDOW_PANE = vertical("sepia_window"); + //public static final CTSpriteShiftEntry NUMBING_PARCHMENT = omni("numbing_parchment_block"); + + private static SpriteShiftEntry get(String originalLocation, String targetLocation) { + return SpriteShifter.get(CreateGarnished.asResource(originalLocation), CreateGarnished.asResource(targetLocation)); + } + + private static CTSpriteShiftEntry getCT(CTType type, String blockTextureName, String connectedTextureName) { + return CTSpriteShifter.getCT(type, CreateGarnished.asResource("block/" + blockTextureName), + CreateGarnished.asResource("block/" + connectedTextureName + "_connected")); + } + + private static CTSpriteShiftEntry getCT(CTType type, String blockTextureName) { + return getCT(type, blockTextureName, blockTextureName); + } + +} diff --git a/src/main/java/net/dakotapride/garnished/registry/GarnishedEffects.java b/src/main/java/net/dakotapride/garnished/registry/GarnishedEffects.java index 8972c9fb..f7602384 100644 --- a/src/main/java/net/dakotapride/garnished/registry/GarnishedEffects.java +++ b/src/main/java/net/dakotapride/garnished/registry/GarnishedEffects.java @@ -1,7 +1,7 @@ package net.dakotapride.garnished.registry; import net.dakotapride.garnished.CreateGarnished; -import net.dakotapride.garnished.effect.AustralMobEffect; +import net.dakotapride.garnished.effect.AugmentedMobEffect; import net.dakotapride.garnished.effect.AversionMobEffect; import net.dakotapride.garnished.effect.CognateMobEffect; import net.dakotapride.garnished.effect.FlagrantMobEffect; @@ -12,7 +12,6 @@ import net.dakotapride.garnished.effect.SugarHighMobEffect; import net.dakotapride.garnished.effect.ThornsMobEffect; import net.dakotapride.garnished.effect.TruthSeekerMobEffect; -import net.fabricmc.fabric.api.registry.FabricBrewingRecipeRegistry; import net.minecraft.core.Registry; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.effect.MobEffect; @@ -20,11 +19,7 @@ import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.ai.attributes.AttributeModifier; import net.minecraft.world.entity.ai.attributes.Attributes; -import net.minecraft.world.item.Items; import net.minecraft.world.item.alchemy.Potion; -import net.minecraft.world.item.alchemy.PotionBrewing; -import net.minecraft.world.item.alchemy.Potions; -import net.minecraft.world.item.crafting.Ingredient; public class GarnishedEffects { @@ -56,7 +51,7 @@ public class GarnishedEffects { public static MobEffect TRUTH_SEEKER = effect("truth_seeker", new TruthSeekerMobEffect()); - public static MobEffect AUSTRAL = effect("austral", new AustralMobEffect() + public static MobEffect AUGMENTED = effect("augmented", new AugmentedMobEffect() .addAttributeModifier(Attributes.MOVEMENT_SPEED, "8e5b13bb-d71e-4e28-a4e2-b0e98eb4b9d3", 0.045, AttributeModifier.Operation.MULTIPLY_TOTAL) .addAttributeModifier(Attributes.ATTACK_DAMAGE, "b9d7efff-0199-457d-bcfb-190ef862d2b0", diff --git a/src/main/java/net/dakotapride/garnished/registry/GarnishedFluids.java b/src/main/java/net/dakotapride/garnished/registry/GarnishedFluids.java index 045285e4..c34f2c88 100644 --- a/src/main/java/net/dakotapride/garnished/registry/GarnishedFluids.java +++ b/src/main/java/net/dakotapride/garnished/registry/GarnishedFluids.java @@ -269,69 +269,70 @@ public static BlockState whenFluidsMeet(LevelAccessor world, BlockPos pos, Block @Nullable public static BlockState getLavaInteraction(FluidState fluidState) { + Fluid fluid = fluidState.getType(); // Fluids.lavaInteraction(fluidState, GARNISH.get(), AllPaletteStoneTypes.CALCITE.getBaseBlock().get()); - if (fluidState.is(GARNISH.get())) + if (fluid.isSame(GARNISH.get())) return AllPaletteStoneTypes.CALCITE.getBaseBlock().get().defaultBlockState(); // Fluids.lavaInteraction(fluidState, PEANUT_OIL.get(), AllPaletteStoneTypes.DRIPSTONE.getBaseBlock().get()); - if (fluidState.is(PEANUT_OIL.get())) + if (fluid.isSame(PEANUT_OIL.get())) return AllPaletteStoneTypes.DRIPSTONE.getBaseBlock().get().defaultBlockState(); // Fluids.lavaInteraction(fluidState, APPLE_CIDER.get(), GarnishedBlocks.CARNOTITE.get()); - if (fluidState.is(APPLE_CIDER.get())) + if (fluid.isSame(APPLE_CIDER.get())) return GarnishedBlocks.CARNOTITE.getDefaultState(); // Fluids.lavaInteraction(fluidState, CASHEW_MIXTURE.get(), Blocks.END_STONE); - if (fluidState.is(PEANUT_OIL.get())) + if (fluid.isSame(PEANUT_OIL.get())) return Blocks.END_STONE.defaultBlockState(); // Fluids.lavaInteraction(fluidState, MASTIC_RESIN.get(), GarnishedBlocks.ZULTANITE.get()); - if (fluidState.is(MASTIC_RESIN.get())) + if (fluid.isSame(MASTIC_RESIN.get())) return GarnishedBlocks.ZULTANITE.getDefaultState(); // Fluids.lavaInteraction(fluidState, RED_MASTIC_RESIN.get(), GarnishedBlocks.RED_ZULTANITE.get()); - if (fluidState.is(RED_MASTIC_RESIN.get())) + if (fluid.isSame(RED_MASTIC_RESIN.get())) return GarnishedBlocks.RED_ZULTANITE.getDefaultState(); // Fluids.lavaInteraction(fluidState, ORANGE_MASTIC_RESIN.get(), GarnishedBlocks.ORANGE_ZULTANITE.get()); - if (fluidState.is(ORANGE_MASTIC_RESIN.get())) + if (fluid.isSame(ORANGE_MASTIC_RESIN.get())) return GarnishedBlocks.ORANGE_ZULTANITE.getDefaultState(); // Fluids.lavaInteraction(fluidState, YELLOW_MASTIC_RESIN.get(), GarnishedBlocks.YELLOW_ZULTANITE.get()); - if (fluidState.is(YELLOW_MASTIC_RESIN.get())) + if (fluid.isSame(YELLOW_MASTIC_RESIN.get())) return GarnishedBlocks.YELLOW_ZULTANITE.getDefaultState(); // Fluids.lavaInteraction(fluidState, GREEN_MASTIC_RESIN.get(), GarnishedBlocks.GREEN_ZULTANITE.get()); - if (fluidState.is(GREEN_MASTIC_RESIN.get())) + if (fluid.isSame(GREEN_MASTIC_RESIN.get())) return GarnishedBlocks.GREEN_ZULTANITE.getDefaultState(); // Fluids.lavaInteraction(fluidState, LIME_MASTIC_RESIN.get(), GarnishedBlocks.LIME_ZULTANITE.get()); - if (fluidState.is(LIME_MASTIC_RESIN.get())) + if (fluid.isSame(LIME_MASTIC_RESIN.get())) return GarnishedBlocks.LIME_ZULTANITE.getDefaultState(); // Fluids.lavaInteraction(fluidState, BLUE_MASTIC_RESIN.get(), GarnishedBlocks.BLUE_ZULTANITE.get()); - if (fluidState.is(BLUE_MASTIC_RESIN.get())) + if (fluid.isSame(BLUE_MASTIC_RESIN.get())) return GarnishedBlocks.BLUE_ZULTANITE.getDefaultState(); // Fluids.lavaInteraction(fluidState, LIGHT_BLUE_MASTIC_RESIN.get(), GarnishedBlocks.LIGHT_BLUE_ZULTANITE.get()); - if (fluidState.is(LIGHT_BLUE_MASTIC_RESIN.get())) + if (fluid.isSame(LIGHT_BLUE_MASTIC_RESIN.get())) return GarnishedBlocks.LIGHT_BLUE_ZULTANITE.getDefaultState(); // Fluids.lavaInteraction(fluidState, CYAN_MASTIC_RESIN.get(), GarnishedBlocks.CYAN_ZULTANITE.get()); - if (fluidState.is(CYAN_MASTIC_RESIN.get())) + if (fluid.isSame(CYAN_MASTIC_RESIN.get())) return GarnishedBlocks.CYAN_ZULTANITE.getDefaultState(); // Fluids.lavaInteraction(fluidState, PURPLE_MASTIC_RESIN.get(), GarnishedBlocks.PURPLE_ZULTANITE.get()); - if (fluidState.is(PURPLE_MASTIC_RESIN.get())) + if (fluid.isSame(PURPLE_MASTIC_RESIN.get())) return GarnishedBlocks.PURPLE_ZULTANITE.getDefaultState(); // Fluids.lavaInteraction(fluidState, MAGENTA_MASTIC_RESIN.get(), GarnishedBlocks.MAGENTA_ZULTANITE.get()); - if (fluidState.is(MAGENTA_MASTIC_RESIN.get())) + if (fluid.isSame(MAGENTA_MASTIC_RESIN.get())) return GarnishedBlocks.MAGENTA_ZULTANITE.getDefaultState(); // Fluids.lavaInteraction(fluidState, PINK_MASTIC_RESIN.get(), GarnishedBlocks.PINK_ZULTANITE.get()); - if (fluidState.is(PINK_MASTIC_RESIN.get())) + if (fluid.isSame(PINK_MASTIC_RESIN.get())) return GarnishedBlocks.PINK_ZULTANITE.getDefaultState(); // Fluids.lavaInteraction(fluidState, BLACK_MASTIC_RESIN.get(), GarnishedBlocks.BLACK_ZULTANITE.get()); - if (fluidState.is(BLACK_MASTIC_RESIN.get())) + if (fluid.isSame(BLACK_MASTIC_RESIN.get())) return GarnishedBlocks.BLACK_ZULTANITE.getDefaultState(); // Fluids.lavaInteraction(fluidState, GRAY_MASTIC_RESIN.get(), GarnishedBlocks.GRAY_ZULTANITE.get()); - if (fluidState.is(GRAY_MASTIC_RESIN.get())) + if (fluid.isSame(GRAY_MASTIC_RESIN.get())) return GarnishedBlocks.GRAY_ZULTANITE.getDefaultState(); // Fluids.lavaInteraction(fluidState, LIGHT_GRAY_MASTIC_RESIN.get(), GarnishedBlocks.LIGHT_GRAY_ZULTANITE.get()); - if (fluidState.is(LIGHT_GRAY_MASTIC_RESIN.get())) + if (fluid.isSame(LIGHT_GRAY_MASTIC_RESIN.get())) return GarnishedBlocks.LIGHT_GRAY_ZULTANITE.getDefaultState(); // Fluids.lavaInteraction(fluidState, WHITE_MASTIC_RESIN.get(), GarnishedBlocks.WHITE_ZULTANITE.get()); - if (fluidState.is(WHITE_MASTIC_RESIN.get())) + if (fluid.isSame(WHITE_MASTIC_RESIN.get())) return GarnishedBlocks.WHITE_ZULTANITE.getDefaultState(); // Fluids.lavaInteraction(fluidState, BROWN_MASTIC_RESIN.get(), GarnishedBlocks.BROWN_ZULTANITE.get()); - if (fluidState.is(BROWN_MASTIC_RESIN.get())) + if (fluid.isSame(BROWN_MASTIC_RESIN.get())) return GarnishedBlocks.BROWN_ZULTANITE.getDefaultState(); return null; diff --git a/src/main/java/net/dakotapride/garnished/registry/GarnishedFoodValues.java b/src/main/java/net/dakotapride/garnished/registry/GarnishedFoodValues.java new file mode 100644 index 00000000..38706970 --- /dev/null +++ b/src/main/java/net/dakotapride/garnished/registry/GarnishedFoodValues.java @@ -0,0 +1,414 @@ +package net.dakotapride.garnished.registry; + +import java.util.Random; +import java.util.function.Supplier; + +import net.dakotapride.garnished.item.IGarnishedUtilities; +import net.minecraft.world.effect.MobEffect; +import net.minecraft.world.effect.MobEffectInstance; +import net.minecraft.world.effect.MobEffects; +import net.minecraft.world.food.FoodProperties; + +//@SuppressWarnings({"unused"}) +public enum GarnishedFoodValues implements IGarnishedUtilities { + // Capped values may intersect with other values from other regions + // + // Overworld + // Most overworld foods cannot be under 1 nutrition value + // Most overworld foods cannot be under 0.05 saturation value + // The absolute minimum stats are 1 and ((2 * 0.25) * 1) = (0.5 * 1) = 0.5 respectively. + // A hard limit on most overworld foods for nutrition is set at 8 + // A hard limit on most overworld foods for saturation is set at 0.65 (65% of the nutrition value) + OVERWORLD_MIN(1, 0.25f), + OVERWORLD_MAX(8, 0.65f), + // Nether + // Most nether foods cannot be under 6 nutrition value + // Most nether foods cannot be under 0.40 saturation value (40% of the nutrition value) + // A hard limit on most overworld foods for nutrition is set at 12 + // A hard limit on most overworld foods for saturation is set at 0.85 (85% of the nutrition value) + NETHER_MIN(6, 0.40f), + NETHER_MAX(12, 0.80f), + // End + // Most end foods cannot be under 10 nutrition value + // Most end foods cannot be under 0.55 saturation value (55% of the nutrition value) + // A hard limit on most overworld foods for nutrition is set at 16 + // A hard limit on most overworld foods for saturation is set at 1.00 (100% of the nutrition value) + END_MIN(10, 0.55f), + END_MAX(16, 1.00f); + + public final int nutrition; + public final float saturation; + + GarnishedFoodValues(int nutrition, float saturation) { + this.nutrition = nutrition; + this.saturation = saturation; + } + + private static int mod(float value, boolean isSaturation) { + if (isSaturation) + return (int) (value + 0.20f); + else return (int) (value + 2.0f); + } + + public static boolean hasSugarHigh; + public static boolean hasFreezing; + public static boolean hasHunger; + public static boolean hasLevitation; + public static boolean hasBadOmen; + public static boolean isOnFire; + + + public static final FoodProperties.Builder GENERIC_BOTTLED_FOOD_OR_DRINK = generic(3, 0.20f); + public static final FoodProperties GENERIC_BOTTLED_FOOD_OR_DRINK_build = generic(3, 0.20f).build(); + public static final FoodProperties.Builder GENERIC_STEW_OR_BREW = generic(8, 0.60f); + public static final FoodProperties GENERIC_STEW_OR_BREW_build = generic(8, 0.60f).build(); + public static final FoodProperties.Builder GENERIC_COOKIE = generic(4, 0.20f); + public static final FoodProperties GENERIC_COOKIE_build = generic(4, 0.20f).build(); + + // Overworld + public static final FoodProperties UNGARNISHED_NUT = ow_min().effect(new MobEffectInstance(MobEffects.CONFUSION, 240), 1.0f).build(); + public static final FoodProperties + GARNISHED_NUT = generic(4, 0.20f).build(), + SWEETENED_NUT = generic(mod(4, false), 0.20f).build(), + CHOCOLATE_GLAZED_NUT = generic(4, mod(0.20f, true)).build(), + HONEYED_NUT = generic(mod(4, false), mod(0.20f, true)).build(); + public static final FoodProperties + GARNISHED_NUT_MIX = generic(7, 0.40f).build(), + SWEETENED_NUT_MIX = generic(mod(7, false), 0.40f).build(), + CHOCOLATE_GLAZED_NUT_MIX = generic(7, mod(0.40f, true)).build(), + HONEYED_NUT_MIX = generic(mod(7, false), mod(0.40f, true)).build(); + public static final FoodProperties + GARNISHED_BERRIES = generic(5, 0.30f).build(), + HONEYED_BERRIES = generic(mod(5, false), mod(0.30f, true)).build(); + public static final FoodProperties MELTED_CINDER_FLOUR_NUT = meltedCinderFlourNut().build(); + public static final FoodProperties MELTED_CINDER_FLOUR_PEANUT = meltedCinderFlourNut() + .effect(new MobEffectInstance(MobEffects.MOVEMENT_SLOWDOWN, cinder_dur), 1.0f) // 100% chance of occurring + .effect(new MobEffectInstance(MobEffects.INVISIBILITY, cinder_dur), 1.0f).build(); // 100% chance of occurring + public static final FoodProperties MELTED_CINDER_FLOUR_WALNUT = meltedCinderFlourNut() + .effect(new MobEffectInstance(MobEffects.DAMAGE_BOOST, cinder_dur), 1.0f).build(); // 100% chance of occurring + public static final FoodProperties MELTED_CINDER_FLOUR_ALMOND = meltedCinderFlourNut() + .effect(new MobEffectInstance(MobEffects.DIG_SPEED, cinder_dur), 1.0f).build(); // 100% chance of occurring + public static final FoodProperties MELTED_CINDER_FLOUR_HAZELNUT = meltedCinderFlourNut() + .effect(new MobEffectInstance(MobEffects.MOVEMENT_SPEED, cinder_dur, 1), 1.0f).build(); // 100% chance of occurring + public static final FoodProperties MELTED_CINDER_FLOUR_CHESTNUT = meltedCinderFlourNut() + .effect(new MobEffectInstance(MobEffects.SLOW_FALLING, cinder_dur), 1.0f).build(); // 100% chance of occurring + public static final FoodProperties MELTED_CINDER_FLOUR_PISTACHIO = meltedCinderFlourNut() + .effect(new MobEffectInstance(MobEffects.NIGHT_VISION, cinder_dur), 1.0f).build(); // 100% chance of occurring + public static final FoodProperties MELTED_CINDER_FLOUR_MACADAMIA = meltedCinderFlourNut() + .effect(new MobEffectInstance(MobEffects.FIRE_RESISTANCE, cinder_dur), 1.0f).build(); // 100% chance of occurring + public static final FoodProperties MELTED_CINDER_FLOUR_PECAN = meltedCinderFlourNut() + .effect(new MobEffectInstance(MobEffects.DAMAGE_RESISTANCE, cinder_dur), 1.0f).build(); // 100% chance of occurring + public static final FoodProperties MELTED_CINDER_FLOUR_CASHEW = meltedCinderFlourNut() + .effect(new MobEffectInstance(MobEffects.MOVEMENT_SPEED, cinder_dur), 1.0f).build(); // 100% chance of occurring + public static final FoodProperties GARNISHED_MEAL = ow_max().build(); + public static final FoodProperties SALAD = generic(8, 0.40f).build(); + public static final FoodProperties CASHEW_APPLE = ow_min() + .effect(new MobEffectInstance(MobEffects.POISON, cashew_dur), 0.25f).fast().build(); // 100% chance of occurring + public static final FoodProperties BITTER_ALMOND = generic(4, 0.20f) + .effect(new MobEffectInstance(MobEffects.POISON, almond_dur), 1.0f).build(); // 100% chance of occurring + public static final FoodProperties WALNUT_BROWNIE = ow_max().build(); + public static final FoodProperties PECAN_PIE = ow_max().build(); + public static final FoodProperties CASHEW_COOKIE = generic(6, 0.20f).build(); + public static final FoodProperties ALMOND_CHEESE = generic(6, 0.40f).build(); + public static final FoodProperties PUTRID_STEW = GENERIC_STEW_OR_BREW + .effect(new MobEffectInstance(MobEffects.CONFUSION, 200), 1.0f).build(); // 100% chance of occurring + public static final FoodProperties NUT_NACHO = ow_min().fast().build(); + public static final FoodProperties NUT_NACHO_BOWL = ow_max().build(); + public static final FoodProperties ILLUMINATING_COCKTAIL = generic(4, 0.80f) + .effect(new MobEffectInstance(MobEffects.GLOWING, 600, 0), 1.0f).build(); // 100% chance of occurring + public static final FoodProperties BITTER_APPLE_CIDER = GENERIC_BOTTLED_FOOD_OR_DRINK + .effect(new MobEffectInstance(MobEffects.MOVEMENT_SLOWDOWN, bit_cider_dur, 1), 1.0f) // 100% chance of occurring + .effect(new MobEffectInstance(MobEffects.DAMAGE_RESISTANCE, bit_cider_dur, 2), 1.0f).build(); // 100% chance of occurring + public static final FoodProperties CRYPTIC_APPLE_CIDER = GENERIC_BOTTLED_FOOD_OR_DRINK + .effect(GarnishedFoodValues.triggerCrypticEffect(), 1.0f).build(); + public static final FoodProperties MULCH = ow_min().build(); + public static final FoodProperties MUD_PIE = generic(8, 0.15f).build(); + public static final FoodProperties BAKLAVA = ow_max().build(); + public static final FoodProperties RAW_TENEBROUS_MEAT = generic(4, OVERWORLD_MAX.saturation) + .effect(new MobEffectInstance(MobEffects.DARKNESS, 200), 1.0f).meat().build(); // 100% chance of occurring + public static final FoodProperties COOKED_TENEBROUS_MEAT = generic(6, OVERWORLD_MAX.saturation) + .effect(new MobEffectInstance(MobEffects.REGENERATION, 200), 0.85f).meat().build(); // 85% chance of occurring + public static final FoodProperties GLOOMY_GATHERING = ow_max() + .effect(new MobEffectInstance(MobEffects.REGENERATION, 600), 1.0f) // 100% chance of occurring + .effect(new MobEffectInstance(MobEffects.DAMAGE_RESISTANCE, 300), 1.0f).meat().build(); // 100% chance of occurring + public static final FoodProperties ACHING_TENEBROUS_CLUMP = generic(7, OVERWORLD_MAX.saturation).meat().build(); + public static final FoodProperties GHANDERCKEN = ow_max().build(); // Not marked as meat due to bowl being lost upon feeding to wolves or other pets that rely on meat + public static final FoodProperties FISHY_SURPRISE = new FoodProperties.Builder().nutrition(8).saturationMod(0.40f) + .effect(new MobEffectInstance(MobEffects.CONFUSION, 300), 1.0f) // 100% chance of occurring + .effect(new MobEffectInstance(MobEffects.POISON, 40), 0.15f).build(); // 15% chance of occurring // Not marked as meat due to bowl being lost upon feeding to wolves or other pets that rely on meat + public static final FoodProperties WHEAT_GRAZE = generic(3, 0.10f).build(); + public static final FoodProperties PORKCHOP_AND_GRAZE = ow_max().meat().build(); + public static final FoodProperties MURKY_JELLY = generic(4, 0.30f).build(); + public static final FoodProperties MURKY_MACADAMIA_MALICE = generic(6, 0.40f).build(); + public static final FoodProperties NUTTY_MELODY = end_min().build(); // Exception for being the most melodic of nutty meals + public static final FoodProperties YAM_O_GLOW_PUFFS = generic(OVERWORLD_MIN.nutrition, 0.20f).fast().build(); + public static final FoodProperties CACKLING_PIE = ow_max().build(); + public static final FoodProperties SHINING_DISH = generic(OVERWORLD_MAX.nutrition, 0.40f) + .effect(new MobEffectInstance(MobEffects.GLOWING), 0.45f).build(); // 45% chance of occurring + public static final FoodProperties MUESLI = generic(OVERWORLD_MAX.nutrition, 0.60f).build(); + public static final FoodProperties GENERIC_DRIED_KELP = generic(2, 0.30f).fast().build(); + public static final FoodProperties DRIED_DULSE_KELP = generic(4, GENERIC_DRIED_KELP.getSaturationModifier()).fast().build(); + public static final FoodProperties VAST_BREW = generic(4, 0.30f).fast().build(); + public static final FoodProperties VERMILION_STEW = generic(6, 0.40f).build(); + public static final FoodProperties GALVANIC_HAUNTING = ow_max().build(); + public static final FoodProperties BEWILDERED_PASTRY = generic(6, 0.40f) + .effect(new MobEffectInstance(MobEffects.DOLPHINS_GRACE, tick * 20, 0), 0.65f).build(); // 65% chance of occurring + public static final FoodProperties INCENDIARY_STEW = ow_max().build(); // Explodes on consumption - 100% chance of occurring + public static final FoodProperties BAMBOO_CLOD = generic(4, 0.20f).build(); + public static final FoodProperties OVERGROWN_BREW = ow_max().build(); + public static final FoodProperties MEAT_SCRAPS = ow_max() + .effect(GarnishedFoodValues.triggerResistanceOrWeaknessFromRaids(), 1.0f).build(); // 100% chance of occurring + public static final FoodProperties BOK_CHOY = ow_min().build(); + // Generic Sweets (other than honeyed foods) + public static final FoodProperties COAL_TRUFFLE = generic(2, 0.40f) + .effect(GarnishedFoodValues.triggerRegenerationFromSugarHigh(), 0.80f).build(); // 80% chance of occurring + public static final FoodProperties MASTIC_PASTE = ow_min() + .effect(GarnishedFoodValues.triggerRegenerationFromSugarHigh(), 0.15f).fast().build(); // 15% chance of occurring + public static final FoodProperties SLIME_DROP = generic(4, 0.30f) + .effect(GarnishedFoodValues.triggerRegenerationFromSugarHigh(), 0.45f).fast().build(); // 45% chance of occurring + public static final FoodProperties MASTIC_COVERED_SLIME_DROP = generic(6, 0.40f) + .effect(GarnishedFoodValues.triggerRegenerationFromSugarHigh(), 0.80f).fast().build(); // 80% chance of occurring + public static final FoodProperties VENERABLE_DELICACY = ow_max() + .effect(GarnishedFoodValues.triggerRegenerationFromSugarHigh(), 1.0f).build(); // 100% chance of occurring + public static final FoodProperties ICY_MASTIC_CHUNK = ow_min() + .effect(new MobEffectInstance(MobEffects.MOVEMENT_SLOWDOWN, 100, 2), 1.0f) + .effect(new MobEffectInstance(MobEffects.REGENERATION, 160, 1), 1.0f).fast().build(); + public static final FoodProperties CASHEW_SORBET_SCOOP = generic(2, 0.10f) + .effect(GarnishedFoodValues.triggerRegenerationFromSugarHigh(), 0.65f).fast().build(); // 65% chance of occurring + public static final FoodProperties CASHEW_SORBET_DELIGHT = generic(8, 0.40f) + .effect(GarnishedFoodValues.triggerRegenerationFromSugarHigh(), 0.80f).build(); // 80% chance of occurring + public static final FoodProperties WALNUT_GORGE_CREAM = GENERIC_STEW_OR_BREW + .effect(GarnishedFoodValues.triggerRegenerationFromSugarHigh(), 0.75f).build(); // 75% chance of occurring + // Exempt from regenerative effects from sugar high - provides the sugar high status effect + public static final FoodProperties MERRY_TREAT = generic(6, 0.40f) + .effect(new MobEffectInstance(GarnishedEffects.SUGAR_HIGH, sugar_high_dur, 1), 1.0f).build(); // 100% chance of occurring + // Generic "cold" Foods + public static final FoodProperties FROSTED_DESSERT = generic(6, 0.30f) + .effect(GarnishedFoodValues.triggerRegenerationFromFreezing(), 0.85f).build(); // 85% chance of occurring + public static final FoodProperties VOID_STROGANOFF = ow_max() + .effect(GarnishedFoodValues.triggerRegenerationFromFreezing(), 1.0f).build(); // 100% chance of occurring + public static final FoodProperties CHILLED_APPLE = generic(5, 0.40f) + .effect(GarnishedFoodValues.triggerRegenerationFromFreezing(), 0.50f).build(); // 50% chance of occurring + public static final FoodProperties RAW_POLAR_BEAR_MEAT = generic(5, 0.20f) + .effect(GarnishedFoodValues.triggerRegenerationFromFreezing(), 0.05f).meat().build(); // 5% chance of occurring + public static final FoodProperties COOKED_POLAR_BEAR_MEAT = ow_max().meat() + .effect(GarnishedFoodValues.triggerRegenerationFromFreezing(), 0.35f).build(); // 35% chance of occurring + // TECHNICALLY, does not qualify as they don't actually contain any ingredients from snowy biomes + public static final FoodProperties EXPLORERS_CONCOCTION = ow_max().build(); + // Generic "desert" foods - no not dessert you fuck + public static final FoodProperties PRICKLY_PEAR = generic(OVERWORLD_MIN.nutrition, 0.10f) + .effect(GarnishedFoodValues.triggerThornsFromHunger(), 0.15f).build(); // 15% chance of occurring + public static final FoodProperties NOPALITO_WRAP = generic(6, 0.65f) + .effect(GarnishedFoodValues.triggerThornsFromHunger(), 0.65f).build(); // 65% chance of occurring + public static final FoodProperties NOPALITO_WRAP_SUPREME = generic(8, 0.80f) + .effect(GarnishedFoodValues.triggerThornsFromHunger(), 1.0f).build(); // 100% chance of occurring + public static final FoodProperties PRICKLY_PEAR_STEW = generic(6, 0.35f) + .effect(GarnishedFoodValues.triggerThornsFromHunger(), 0.45f).build(); // 45% chance of occurring + public static final FoodProperties SINOPIA_ROCK_SWEET = generic(4, 0.20f) + .effect(GarnishedFoodValues.triggerThornsFromHunger(), 0.25f).build(); // 25% chance of occurring + public static final FoodProperties THORN_ON_A_STICK = generic(8, 0.40f) + .effect(GarnishedFoodValues.triggerThornsFromHunger(), 1.0f).build(); // 100% chance of occurring + public static final FoodProperties ROSY_COCKTAIL = ow_max() + .effect(GarnishedFoodValues.triggerThornsFromHunger(), 0.50f) // 50% chance of occurring + .effect(new MobEffectInstance(MobEffects.REGENERATION, 100, 4), 1.0F).build(); // 100% chance of occurring + public static final FoodProperties DUSTY_REGALE = generic(6, 0.20f) + .effect(GarnishedFoodValues.triggerThornsFromHunger(), 0.35f).build(); // 35% chance of occurring + // Is exempt or already provides Thorns upon consumption + public static final FoodProperties STEW_OF_THE_DAMNED = generic(OVERWORLD_MAX.nutrition, 0.40f) + .effect(new MobEffectInstance(GarnishedEffects.THORNS, 700, 4), 1.0F).build(); // 100% chance of occurring + + // Nether + public static final FoodProperties PEANUT_OIL_AND_CINDER_SANDWICH = generic(7, 0.70f) + .effect(GarnishedFoodValues.triggerFireResistanceFromBeingOnFire(), 0.15f).build(); // 15% chance of occurring + public static final FoodProperties TOPHET_BREW = generic(7, 0.60f) + .effect(GarnishedFoodValues.triggerFireResistanceFromBeingOnFire(), 0.90f).build(); // 90% chance of occurring + public static final FoodProperties GRIM_STEW = generic(9, 0.60f) + .effect(GarnishedFoodValues.triggerFireResistanceFromBeingOnFire(), 0.75f).build(); // 75% chance of occurring + public static final FoodProperties WEEPING_TANGLE = generic(8, 0.40f) + .effect(GarnishedFoodValues.triggerFireResistanceFromBeingOnFire(), 0.60f).build(); // 60% chance of occurring + public static final FoodProperties CINDER_ROLL = generic(6, 0.25f) + .effect(GarnishedFoodValues.triggerFireResistanceFromBeingOnFire(), 1.0f).build(); // 100% chance of occurring + public static final FoodProperties WARPED_BREW = generic(8, 0.70f) + .effect(GarnishedFoodValues.triggerFireResistanceFromBeingOnFire(), 0.55f).build(); // 55% chance of occurring + //public static final FoodProperties BOTTLE_OF_CRESTFALLEN_FLORA = GENERIC_BOTTLED_FOOD_OR_DRINK_build; // No longer a food + public static final FoodProperties BOTTLED_MALODOROUS_MIXTURE = nether_min() + .effect(GarnishedFoodValues.triggerFireResistanceFromBeingOnFire(), 0.15f).build(); // 15% chance of occurring + public static final FoodProperties PIQUANT_PRETZEL = nether_min() + .effect(GarnishedFoodValues.triggerFireResistanceFromBeingOnFire(), 1.0f).build(); // 100% chance of occurring + // Exempt due to already providing an effect - negative or positive + public static final FoodProperties INIQUITOUS_BREW = generic(8, 0.70f) + .effect(new MobEffectInstance(MobEffects.FIRE_RESISTANCE, tick * 60, 1), 0.80f).build(); // 80% chance of occurring + public static final FoodProperties OMNISCIENT_STEW = nether_max() + .effect(new MobEffectInstance(MobEffects.NIGHT_VISION, tick * 20, 0), 0.50f) // 50% chance of occurring + .effect(new MobEffectInstance(GarnishedEffects.COGNATE, cognate_dur, 0), 0.75f).build(); // 75% chance of occurring + public static final FoodProperties WARPED_TANGLE = wrappedTangle(() -> MobEffects.DAMAGE_RESISTANCE).build(); + public static final FoodProperties CRIMSON_TANGLE = wrappedTangle(() -> MobEffects.FIRE_RESISTANCE).build(); + public static final FoodProperties SEPIA_TANGLE = wrappedTangle(() -> GarnishedEffects.SPIRITED_RESISTANCE).build(); + public static final FoodProperties FERMENTED_CASHEW_MIXTURE = GENERIC_BOTTLED_FOOD_OR_DRINK + .effect(new MobEffectInstance(MobEffects.CONFUSION, cashew_mix_dur,2 ), 0.05f) // 5% chance of occurring + .effect(new MobEffectInstance(MobEffects.DAMAGE_BOOST, cashew_mix_dur, 2), 0.05f).build(); // 5% chance of occurring + public static final FoodProperties SOUL_KHANA = GENERIC_STEW_OR_BREW + .effect(new MobEffectInstance(MobEffects.INVISIBILITY, 2400), 1.0f) // 100% chance of occurring + .effect(new MobEffectInstance(MobEffects.MOVEMENT_SPEED, 3000), 1.0f).build(); // 100% chance of occurring + public static final FoodProperties SPIRITED_CONCOCTION = GENERIC_STEW_OR_BREW + .effect(new MobEffectInstance(GarnishedEffects.SPIRITED_RESISTANCE, 900), 1.0f).build(); // 100% chance of occurring + public static final FoodProperties MOLTEN_STEW = nether_min() + .effect(new MobEffectInstance(MobEffects.FIRE_RESISTANCE, tick * 20), 1.0f).build(); // 100% chance of occurring + public static final FoodProperties STURDY_WAFFLE = nether_min() + .effect(new MobEffectInstance(MobEffects.DAMAGE_RESISTANCE, tick * 20), 0.75f).build(); // 75% chance of occurring + public static final FoodProperties PHANTOM_STEAK = nether_max().meat().build(); + public static final FoodProperties BLAZING_DELIGHT = nether_max().build(); + // Generic Sweets (other than honeyed foods) + public static final FoodProperties SENILE_SWEET = senileSweet().fast().build(); + + // End + public static final FoodProperties CHORUS_COCKTAIL = end_min() + .effect(GarnishedFoodValues.triggerSlowFallingFromLevitation(), 1.0f).build(); // 100% chance of occurring + public static final FoodProperties CHAMPIONS_OMELETTE = end_max() + .effect(GarnishedFoodValues.triggerSlowFallingFromLevitation(), 1.0f).build(); // 100% chance of occurring + public static final FoodProperties FARSEER_BREW = generic(12, 0.80f) + .effect(GarnishedFoodValues.triggerSlowFallingFromLevitation(), 0.80f).build(); // 80% chance of occurring + public static final FoodProperties SHELLED_DUMPLING = end_min() + .effect(GarnishedFoodValues.triggerSlowFallingFromLevitation(), 0.50f).build(); // 50% chance of occurring + // Exempt due to already providing an effect - negative or positive + public static final FoodProperties BOTTLED_ENDER_JELLY = GENERIC_BOTTLED_FOOD_OR_DRINK + .effect(new MobEffectInstance(GarnishedEffects.COGNATE, cognate_dur / 2, 1), 0.50f).build(); // 50% chance of occurring + public static final FoodProperties COSMIC_BREW = end_min() + .effect(new MobEffectInstance(MobEffects.NIGHT_VISION, tick * 30, 0), 1.0f).build(); // 100% chance of occurring + public static final FoodProperties DESOLATE_STEW = end_min() + .effect(new MobEffectInstance(GarnishedEffects.COGNATE, cognate_dur, 1), 0.20f).build(); // 20% chance of occurring + public static final FoodProperties ETHEREAL_CONCOCTION = generic(12, 0.60f) + .effect(new MobEffectInstance(GarnishedEffects.COGNATE, cognate_dur, 1), 0.20f).build(); // 20% chance of occurring + public static final FoodProperties VOID_MIXTURE = end_min().build(); + public static final FoodProperties CHORUS_BOWL = end_max().build(); + public static final FoodProperties CHORUS_COOKIE = generic(GENERIC_COOKIE_build.getNutrition(), GENERIC_COOKIE_build.getSaturationModifier()) + .effect(new MobEffectInstance(MobEffects.MOVEMENT_SPEED, tick * 10, 1), 0.50f).build(); // 50% chance of occurring + // Generic Sweets (other than honeyed foods) + public static final FoodProperties GALACTIC_CANE = end_min() + .effect(new MobEffectInstance(GarnishedEffects.COGNATE, cane_effect_dur, 1), 1.0f) + .effect(GarnishedFoodValues.triggerRegenerationFromSugarHigh(), 0.35f).build(); // 35% chance of occurring + public static final FoodProperties ENDER_JELLY = generic(4, 0.30f) + .effect(GarnishedFoodValues.triggerRegenerationFromSugarHigh(), 1.0f).build(); // 100% chance of occurring + + // Farmer's Delight + public static final FoodProperties PECAN_PIE_SLICE = generic(3, 0.20f).build(); + public static final FoodProperties PHANTOM_BURGER = nether_max().meat().build(); + public static final FoodProperties PHANTOM_BEEF_PATTY = nether_min().meat().build(); + public static final FoodProperties GLOW_INK_ROLL = generic(10, 0.40f).fast().build(); + public static final FoodProperties GLOW_INK_ROLL_SLICE = generic(4, 0.30f).fast().build(); + // Generic Sweets (other than honeyed foods) + public static final FoodProperties ANNIVERSARY_CAKE_SLICE = generic(4, 0.20f) + .effect(GarnishedFoodValues.triggerRegenerationFromSugarHigh(), 1.0f).fast().build(); // 100% chance of occurring + public static final FoodProperties BROWNIE_PIECE = generic(3, 0.20f) + .effect(GarnishedFoodValues.triggerRegenerationFromSugarHigh(), 0.25f).fast().build(); // 25% chance of occurring + + public static FoodProperties.Builder ow_min() { + return new FoodProperties.Builder().nutrition(OVERWORLD_MIN.nutrition).saturationMod(OVERWORLD_MIN.saturation); + } + + public static FoodProperties.Builder ow_max() { + return new FoodProperties.Builder().nutrition(OVERWORLD_MAX.nutrition).saturationMod(OVERWORLD_MAX.saturation); + } + + public static FoodProperties.Builder nether_min() { + return new FoodProperties.Builder().nutrition(NETHER_MIN.nutrition).saturationMod(NETHER_MIN.saturation); + } + + public static FoodProperties.Builder nether_max() { + return new FoodProperties.Builder().nutrition(NETHER_MAX.nutrition).saturationMod(NETHER_MAX.saturation); + } + + public static FoodProperties.Builder end_min() { + return new FoodProperties.Builder().nutrition(END_MIN.nutrition).saturationMod(END_MIN.saturation); + } + + public static FoodProperties.Builder end_max() { + return new FoodProperties.Builder().nutrition(END_MAX.nutrition).saturationMod(END_MAX.saturation); + } + + public static FoodProperties.Builder generic(int nutrition, float saturation) { + return new FoodProperties.Builder().nutrition(nutrition).saturationMod(saturation); + } + + public static FoodProperties.Builder meltedCinderFlourNut() { + return generic(7, 0.40f); + } + + public static FoodProperties.Builder wrappedTangle(Supplier effect) { + return nether_min().effect(new MobEffectInstance(effect.get(), tangle_dur, 1), 0.80f); // 80% chance of occurring + } + + public static FoodProperties.Builder senileSweet() { + return new FoodProperties.Builder().nutrition(NETHER_MIN.nutrition - 2).saturationMod(NETHER_MIN.saturation - 0.20f) + .effect(GarnishedFoodValues.triggerRegenerationFromSugarHigh(), 1.0f); // 100% chance of occurring + } + + + + public static MobEffectInstance triggerRegenerationFromSugarHigh() { + if (hasSugarHigh) { + return new MobEffectInstance(MobEffects.REGENERATION, tick * 12, 1); + } else { + // Do not collect 200 dollars, do not pass GO + return null; + } + } + + public static MobEffectInstance triggerRegenerationFromFreezing() { + if (hasFreezing) { + return new MobEffectInstance(MobEffects.REGENERATION, tick * 12, 1); + } else { + // Do not collect 200 dollars, do not pass GO + return null; + } + } + + public static MobEffectInstance triggerThornsFromHunger() { + if (hasHunger) { + return new MobEffectInstance(GarnishedEffects.THORNS, tick * 24, 1); + } else { + // Do not collect 200 dollars, do not pass GO + return null; + } + } + + public static MobEffectInstance triggerSlowFallingFromLevitation() { + if (hasLevitation) { + return new MobEffectInstance(MobEffects.SLOW_FALLING, tick * 24, 1); + } else { + // Do not collect 200 dollars, do not pass GO + return null; + } + } + + public static MobEffectInstance triggerResistanceOrWeaknessFromRaids() { + if (hasBadOmen) { + return new MobEffectInstance(MobEffects.WEAKNESS, tick * 36, 1); + } else { + // Do collect 200 dollars, and do pass GO :) + return new MobEffectInstance(MobEffects.DAMAGE_RESISTANCE, tick * 36, 1); + } + } + + public static MobEffectInstance triggerFireResistanceFromBeingOnFire() { + if (isOnFire) { + return new MobEffectInstance(MobEffects.FIRE_RESISTANCE, tick * 24, 1); + } else { + // Do not collect 200 dollars, do not pass GO + return null; + } + } + + public static MobEffectInstance triggerCrypticEffect() { + int random = new Random().nextInt(2); + + if (random == 1) { + return new MobEffectInstance(MobEffects.DAMAGE_BOOST, cr_cider_dur, 2); + } else { + return new MobEffectInstance(MobEffects.MOVEMENT_SLOWDOWN, cr_cider_dur, 2); + } + } + + + public static void setRegister() {} +} diff --git a/src/main/java/net/dakotapride/garnished/registry/GarnishedFoods.java b/src/main/java/net/dakotapride/garnished/registry/GarnishedFoods.java deleted file mode 100644 index 8780afcd..00000000 --- a/src/main/java/net/dakotapride/garnished/registry/GarnishedFoods.java +++ /dev/null @@ -1,224 +0,0 @@ -package net.dakotapride.garnished.registry; - -import net.dakotapride.garnished.item.IGarnishedItem; -import net.minecraft.world.effect.MobEffectInstance; -import net.minecraft.world.effect.MobEffects; -import net.minecraft.world.food.FoodProperties; - -public class GarnishedFoods implements IGarnishedItem { - - // Ungarnished - public static final FoodProperties UNGARNISHED_NUT = new FoodProperties.Builder().nutrition(1).saturationMod(0.1F) - .effect(new MobEffectInstance(MobEffects.CONFUSION, 240), 1.0F).build(); - - // Garnished - public static final FoodProperties GARNISHED_NUT = new FoodProperties.Builder().nutrition(4).saturationMod(0.2F).build(); - public static final FoodProperties GARNISHED_NUT_MIX = new FoodProperties.Builder().nutrition(7).saturationMod(0.4F).build(); - public static final FoodProperties GARNISHED_BERRIES = new FoodProperties.Builder().nutrition(5).saturationMod(0.3F).build(); - - // Cinder Flour (Melted) - public static final FoodProperties MELTED_CINDER_FLOUR_PEANUT = new FoodProperties.Builder().nutrition(7).saturationMod(0.4F) - .effect(new MobEffectInstance(MobEffects.MOVEMENT_SLOWDOWN, getCinderEffectDuration), 1.0F) - .effect(new MobEffectInstance(MobEffects.INVISIBILITY, getCinderEffectDuration), 1.0F).build(); - public static final FoodProperties MELTED_CINDER_FLOUR_WALNUT = new FoodProperties.Builder().nutrition(7).saturationMod(0.4F) - .effect(new MobEffectInstance(MobEffects.DAMAGE_BOOST, getCinderEffectDuration), 1.0F).build(); - public static final FoodProperties MELTED_CINDER_FLOUR_ALMOND = new FoodProperties.Builder().nutrition(7).saturationMod(0.4F) - .effect(new MobEffectInstance(MobEffects.DIG_SPEED, getCinderEffectDuration), 1.0F).build(); - public static final FoodProperties MELTED_CINDER_FLOUR_HAZELNUT = new FoodProperties.Builder().nutrition(7).saturationMod(0.4F) - .effect(new MobEffectInstance(MobEffects.MOVEMENT_SPEED, getCinderEffectDuration, 1), 1.0F).build(); - public static final FoodProperties MELTED_CINDER_FLOUR_CHESTNUT = new FoodProperties.Builder().nutrition(7).saturationMod(0.4F) - .effect(new MobEffectInstance(MobEffects.SLOW_FALLING, getCinderEffectDuration), 1.0F).build(); - public static final FoodProperties MELTED_CINDER_FLOUR_PISTACHIO = new FoodProperties.Builder().nutrition(7).saturationMod(0.4F) - .effect(new MobEffectInstance(MobEffects.NIGHT_VISION, getCinderEffectDuration), 1.0F).build(); - public static final FoodProperties MELTED_CINDER_FLOUR_MACADAMIA = new FoodProperties.Builder().nutrition(7).saturationMod(0.4F) - .effect(new MobEffectInstance(MobEffects.FIRE_RESISTANCE, getCinderEffectDuration), 1.0F).build(); - public static final FoodProperties MELTED_CINDER_FLOUR_PECAN = new FoodProperties.Builder().nutrition(7).saturationMod(0.4F) - .effect(new MobEffectInstance(MobEffects.DAMAGE_RESISTANCE, getCinderEffectDuration), 1.0F).build(); - public static final FoodProperties MELTED_CINDER_FLOUR_CASHEW = new FoodProperties.Builder().nutrition(7).saturationMod(0.4F) - .effect(new MobEffectInstance(MobEffects.MOVEMENT_SPEED, getCinderEffectDuration), 1.0F).build(); - - public static final FoodProperties MELTED_CINDER_FLOUR_NUT = new FoodProperties.Builder().nutrition(7).saturationMod(0.4F).build(); - - // Sweetened - public static final FoodProperties SWEETENED_NUT = new FoodProperties.Builder().nutrition(6).saturationMod(0.2F).build(); - public static final FoodProperties SWEETENED_NUT_MIX = new FoodProperties.Builder().nutrition(9).saturationMod(0.4F).build(); - - // Chocolate Glazed - public static final FoodProperties CHOCOLATE_GLAZED_NUT = new FoodProperties.Builder().nutrition(4).saturationMod(0.4F).build(); - public static final FoodProperties CHOCOLATE_GLAZED_NUT_MIX = new FoodProperties.Builder().nutrition(7).saturationMod(0.6F).build(); - - // Honeyed - public static final FoodProperties HONEYED_NUT = new FoodProperties.Builder().nutrition(6).saturationMod(0.4F).build(); - public static final FoodProperties HONEYED_NUT_MIX = new FoodProperties.Builder().nutrition(9).saturationMod(0.6F).build(); - public static final FoodProperties HONEYED_BERRIES = new FoodProperties.Builder().nutrition(7).saturationMod(0.5F).build(); - - // Apple Cider - public static final FoodProperties APPLE_CIDER = new FoodProperties.Builder().nutrition(3).saturationMod(0.3F).build(); - public static final FoodProperties CRYPTIC_APPLE_CIDER = new FoodProperties.Builder().nutrition(4).saturationMod(0.3F).build(); - - // Misc - public static final FoodProperties GARNISHED_MEAL = new FoodProperties.Builder().nutrition(10).saturationMod(0.7F).build(); - public static final FoodProperties SALAD = new FoodProperties.Builder().nutrition(6).saturationMod(0.6F).build(); - public static final FoodProperties PHANTOM_STEAK = new FoodProperties.Builder().nutrition(10).saturationMod(0.9F).meat().build(); - public static final FoodProperties PEANUT_OIL = new FoodProperties.Builder().nutrition(3).saturationMod(0.2F).build(); - public static final FoodProperties CASHEW_FRUIT = new FoodProperties.Builder().nutrition(4).saturationMod(0.2F) - .effect(new MobEffectInstance(MobEffects.POISON, getCashewFruitEffectDuration), 0.25F).fast().build(); - public static final FoodProperties BITTER_ALMOND = new FoodProperties.Builder().nutrition(4).saturationMod(0.1F) - .effect(new MobEffectInstance(MobEffects.POISON, getBitterAlmondEffectDuration), 1.0F).build(); - public static final FoodProperties WALNUT_BROWNIE = new FoodProperties.Builder().nutrition(6).saturationMod(0.4F).build(); - public static final FoodProperties PECAN_PIE = new FoodProperties.Builder().nutrition(9).saturationMod(0.4F).build(); - public static final FoodProperties CASHEW_COOKIE = new FoodProperties.Builder().nutrition(5).saturationMod(0.3F).build(); - public static final FoodProperties ALMOND_CHEESE = new FoodProperties.Builder().nutrition(6).saturationMod(0.4F).build(); - - // Incineration - public static final FoodProperties PEANUT_OIL_AND_CINDER_SANDWICH = new FoodProperties.Builder().nutrition(6).saturationMod(0.3F).build(); - public static final FoodProperties TOPHET_BREW = new FoodProperties.Builder().nutrition(8).saturationMod(0.4F).build(); - public static final FoodProperties GRIM_STEW = new FoodProperties.Builder().nutrition(9).saturationMod(0.4F).build(); - public static final FoodProperties WRAPPED_WARPED_TANGLE = new FoodProperties.Builder().nutrition(5).saturationMod(0.3F) - .effect(new MobEffectInstance(MobEffects.DAMAGE_RESISTANCE, getWrappedTangleEffectDuration, 1), 0.8F).build(); - public static final FoodProperties WRAPPED_CRIMSON_TANGLE = new FoodProperties.Builder().nutrition(5).saturationMod(0.3F) - .effect(new MobEffectInstance(MobEffects.FIRE_RESISTANCE, getWrappedTangleEffectDuration, 1), 0.8F).build(); - public static final FoodProperties WRAPPED_SEPIA_TANGLE = new FoodProperties.Builder().nutrition(5).saturationMod(0.3F) - .effect(new MobEffectInstance(GarnishedEffects.SPIRITED_RESISTANCE, getWrappedTangleEffectDuration, 1), 0.8F) - .build(); - public static final FoodProperties CINDER_ROLL = new FoodProperties.Builder().nutrition(4).saturationMod(0.3F).build(); - public static final FoodProperties WEEPING_TANGLE = new FoodProperties.Builder().nutrition(7).saturationMod(0.4F).build(); - public static final FoodProperties BLAZING_DELIGHT = new FoodProperties.Builder().nutrition(12).saturationMod(0.6F).build(); - public static final FoodProperties FERMENTED_CASHEW_MIXTURE = new FoodProperties.Builder().nutrition(3).saturationMod(0.2F) - .effect(new MobEffectInstance(MobEffects.CONFUSION, getFermentedCashewMixtureEffectDuration,2 ), 0.05F) - .effect(new MobEffectInstance(MobEffects.DAMAGE_BOOST, getFermentedCashewMixtureEffectDuration, 2), 0.05F).build(); - public static final FoodProperties PUTRID_STEW = new FoodProperties.Builder().nutrition(5).saturationMod(0.2F) - .effect(new MobEffectInstance(MobEffects.CONFUSION, 200), 1.0F).build(); - public static final FoodProperties SOUL_KHANA = new FoodProperties.Builder().nutrition(8).saturationMod(0.5F) - .effect(new MobEffectInstance(MobEffects.INVISIBILITY, 2400), 1.0F) - .effect(new MobEffectInstance(MobEffects.MOVEMENT_SPEED, 3000), 1.0F).build(); - public static final FoodProperties SPIRITED_CONCOCTION = new FoodProperties.Builder().nutrition(6).saturationMod(0.5F) - .effect(new MobEffectInstance(GarnishedEffects.SPIRITED_RESISTANCE, 900), 1.0F) - .build(); - public static final FoodProperties SENILE_SWEET = new FoodProperties.Builder().nutrition(4).saturationMod(0.3F).build(); - public static final FoodProperties NUT_NACHO = new FoodProperties.Builder().nutrition(2).saturationMod(0.1F).build(); - public static final FoodProperties NUT_NACHO_BOWL = new FoodProperties.Builder().nutrition(9).saturationMod(0.4F).build(); - - // Desolation - public static final FoodProperties BOTTLED_ENDER_JELLY = new FoodProperties.Builder().nutrition(5).saturationMod(0.2F).build(); - public static final FoodProperties CHORUS_COCKTAIL = new FoodProperties.Builder().nutrition(8).saturationMod(0.3F).build(); - public static final FoodProperties COSMIC_BREW = new FoodProperties.Builder().nutrition(10).saturationMod(0.4F).build(); - public static final FoodProperties DESOLATE_STEW = new FoodProperties.Builder().nutrition(8).saturationMod(0.6F) - .effect(new MobEffectInstance(GarnishedEffects.COGNATE, getCognateEffectBaseTick, 1), 0.20F).build(); - public static final FoodProperties ETHEREAL_CONCOCTION = new FoodProperties.Builder().nutrition(10).saturationMod(0.6F) - .effect(new MobEffectInstance(GarnishedEffects.COGNATE, getCognateEffectBaseTick, 1), 0.20F).build(); - public static final FoodProperties VOID_MIXTURE = new FoodProperties.Builder().nutrition(8).saturationMod(0.3F).build(); - public static final FoodProperties CHORUS_BOWL = new FoodProperties.Builder().nutrition(12).saturationMod(0.8F).build(); - public static final FoodProperties CHORUS_COOKIE = new FoodProperties.Builder().nutrition(4).saturationMod(0.1F).build(); - public static final FoodProperties ENDER_JELLY = new FoodProperties.Builder().nutrition(3).saturationMod(0.1F).build(); - public static final FoodProperties ILLUMINATING_COCKTAIL = new FoodProperties.Builder().nutrition(10).saturationMod(0.4F) - .effect(new MobEffectInstance(MobEffects.GLOWING, 600, 0), 1.0F).build(); - public static final FoodProperties MULCH = new FoodProperties.Builder().nutrition(3).saturationMod(0.1F).build(); - public static final FoodProperties MUD_PIE = new FoodProperties.Builder().nutrition(6).saturationMod(0.2F).build(); - - // Snare & Tear - public static final FoodProperties MOLTEN_STEW = new FoodProperties.Builder().nutrition(8).saturationMod(0.4F).build(); - - // Sugarcoated - public static final FoodProperties BAKLAVA = new FoodProperties.Builder().nutrition(10).saturationMod(0.5F).build(); - public static final FoodProperties MASTIC_PASTE = new FoodProperties.Builder().nutrition(3).saturationMod(0.1F).fast().build(); - public static final FoodProperties SLIME_DROP = new FoodProperties.Builder().nutrition(5).saturationMod(0.3F).fast().build(); - public static final FoodProperties MASTIC_COVERED_SLIME_DROP = new FoodProperties.Builder().nutrition(7).saturationMod(0.4F).fast().build(); - public static final FoodProperties VENERABLE_DELICACY = new FoodProperties.Builder().nutrition(8).saturationMod(0.4F).build(); - public static final FoodProperties GALACTIC_CANE = new FoodProperties.Builder().nutrition(7).saturationMod(0.3F).build(); - public static final FoodProperties MERRY_TREAT = new FoodProperties.Builder().nutrition(8).saturationMod(0.4F) - .effect(new MobEffectInstance(GarnishedEffects.SUGAR_HIGH, getSugarHighEffectBaseTick, 1), 1.0F).build(); - public static final FoodProperties ICY_MASTIC_CHUNK = new FoodProperties.Builder().nutrition(3).saturationMod(0.1F) - .effect(new MobEffectInstance(MobEffects.MOVEMENT_SLOWDOWN, 100, 2), 1.0F) - .effect(new MobEffectInstance(MobEffects.REGENERATION, 160, 1), 1.0F).fast().build(); - public static final FoodProperties COAL_TRUFFLE = new FoodProperties.Builder().nutrition(5).saturationMod(0.2F).fast().build(); - public static final FoodProperties STURDY_WAFFLE = new FoodProperties.Builder().nutrition(6).saturationMod(0.4F) - .effect(new MobEffectInstance(MobEffects.FIRE_RESISTANCE, 400), 1.0F).build(); - - // Gloomy Meats - public static final FoodProperties RAW_TENEBROUS_MEAT = new FoodProperties.Builder().nutrition(7).saturationMod(0.2F) - .effect(new MobEffectInstance(MobEffects.DARKNESS, 200), 1.0F).meat().build(); - public static final FoodProperties COOKED_TENEBROUS_MEAT = new FoodProperties.Builder().nutrition(10).saturationMod(0.7F) - .effect(new MobEffectInstance(MobEffects.REGENERATION, 200), 1.0F).meat().build(); - public static final FoodProperties GLOOMY_GATHERING = new FoodProperties.Builder().nutrition(14).saturationMod(0.9F) - .effect(new MobEffectInstance(MobEffects.REGENERATION, 600), 1.0F) - .effect(new MobEffectInstance(MobEffects.DAMAGE_RESISTANCE, 300), 1.0F).build(); - public static final FoodProperties ACHING_TENEBROUS_CLUMP = new FoodProperties.Builder().nutrition(10).saturationMod(0.4F).meat().build(); - public static final FoodProperties GHANDERCKEN = new FoodProperties.Builder().nutrition(10).saturationMod(0.6F).build(); - public static final FoodProperties FISHY_SURPRISE = new FoodProperties.Builder().nutrition(8).saturationMod(0.4F) - .effect(new MobEffectInstance(MobEffects.CONFUSION, 300), 1.0F) - .effect(new MobEffectInstance(MobEffects.POISON, 40), 0.15F).build(); - public static final FoodProperties WHEAT_GRAZE = new FoodProperties.Builder().nutrition(4).saturationMod(0.2F).build(); - public static final FoodProperties PORKCHOP_AND_GRAZE = new FoodProperties.Builder().nutrition(10).saturationMod(0.8F).meat().build(); - public static final FoodProperties CASHEW_SORBET_SCOOP = new FoodProperties.Builder().nutrition(3).saturationMod(0.2F).fast().build(); - public static final FoodProperties CASHEW_SORBET_DELIGHT = new FoodProperties.Builder().nutrition(10).saturationMod(0.6F).build(); - public static final FoodProperties WALNUT_GORGE_CREAM = new FoodProperties.Builder().nutrition(8).saturationMod(0.4F).build(); - - // Boundless Sea - public static final FoodProperties MURKY_JELLY = new FoodProperties.Builder().nutrition(4).saturationMod(0.3F).build(); - public static final FoodProperties MURKY_MACADAMIA_MALICE = new FoodProperties.Builder().nutrition(6).saturationMod(0.4F).build(); - public static final FoodProperties NUTTY_MELODY = new FoodProperties.Builder().nutrition(12).saturationMod(0.5F).build(); - public static final FoodProperties YAM_O_GLOW_PUFFS = new FoodProperties.Builder().nutrition(3).saturationMod(0.2F).build(); - public static final FoodProperties CACKLING_PIE = new FoodProperties.Builder().nutrition(8).saturationMod(0.4F).build(); - public static final FoodProperties SHINING_DISH = new FoodProperties.Builder().nutrition(7).saturationMod(0.3F).build(); - public static final FoodProperties MUESLI = new FoodProperties.Builder().nutrition(6).saturationMod(0.2F).build(); - - public static final FoodProperties DRIED_VERMILION_KELP = new FoodProperties.Builder().nutrition(2).saturationMod(0.3F).fast().build(); - public static final FoodProperties DRIED_DULSE_KELP = new FoodProperties.Builder().nutrition(4).saturationMod(0.3F).build(); - public static final FoodProperties VAST_BREW = new FoodProperties.Builder().nutrition(8).saturationMod(0.4F).build(); - public static final FoodProperties VERMILION_STEW = new FoodProperties.Builder().nutrition(6).saturationMod(0.4F).build(); - public static final FoodProperties GALVANIC_HAUNTING = new FoodProperties.Builder().nutrition(8).saturationMod(0.4F).build(); - public static final FoodProperties BEWILDERED_PASTRY = new FoodProperties.Builder().nutrition(6).saturationMod(0.4F).build(); - public static final FoodProperties DUSTY_REGALE = new FoodProperties.Builder().nutrition(4).saturationMod(0.2F).build(); - public static final FoodProperties INDENDCIARY_STEW = new FoodProperties.Builder().nutrition(10).saturationMod(0.8F).build(); - - // Befouled - public static final FoodProperties STEW_OF_THE_DAMNED = new FoodProperties.Builder().nutrition(8).saturationMod(0.4F) - .effect(new MobEffectInstance(GarnishedEffects.THORNS, 700, 4), 1.0F).build(); - public static final FoodProperties PRICKLY_PEAR = new FoodProperties.Builder().nutrition(2).saturationMod(0.1F).build(); - public static final FoodProperties BAMBOO_CLOD = new FoodProperties.Builder().nutrition(4).saturationMod(0.3F).build(); - public static final FoodProperties NOPALITO_WRAP = new FoodProperties.Builder().nutrition(8).saturationMod(0.6F).build(); - public static final FoodProperties NOPALITO_WRAP_SUPREME = new FoodProperties.Builder().nutrition(12).saturationMod(0.9F).build(); - public static final FoodProperties PRICKLY_PEAR_STEW = new FoodProperties.Builder().nutrition(7).saturationMod(0.4F).build(); - public static final FoodProperties SINOPIA_ROCK_SWEET = new FoodProperties.Builder().nutrition(6).saturationMod(0.2F).build(); - public static final FoodProperties THORN_ON_A_STICK = new FoodProperties.Builder().nutrition(10).saturationMod(0.4F).build(); - public static final FoodProperties OVERGROWN_BREW = new FoodProperties.Builder().nutrition(8).saturationMod(0.6F).build(); - public static final FoodProperties ROSY_COCKTAIL = new FoodProperties.Builder().nutrition(8).saturationMod(0.4F) - .effect(new MobEffectInstance(MobEffects.REGENERATION, 100, 4), 1.0F).build(); - - // Glacial Edge - public static final FoodProperties RAW_POLAR_BEAR_MEAT = new FoodProperties.Builder().nutrition(5).saturationMod(0.3F).meat().build(); - public static final FoodProperties COOKED_POLAR_BEAR_MEAT = new FoodProperties.Builder().nutrition(10).saturationMod(0.8F).meat().build(); - public static final FoodProperties FROSTED_DESSERT = new FoodProperties.Builder().nutrition(6).saturationMod(0.2F).build(); - public static final FoodProperties VOID_STROGANOFF = new FoodProperties.Builder().nutrition(14).saturationMod(0.8F).build(); - public static final FoodProperties EXPLORERS_CONCOCTION = new FoodProperties.Builder().nutrition(10).saturationMod(0.6F).build(); - public static final FoodProperties CHILLED_APPLE = new FoodProperties.Builder().nutrition(4).saturationMod(0.2F).build(); - - // Refurbished - public static final FoodProperties OMNISCIENT_STEW = new FoodProperties.Builder().nutrition(10).saturationMod(0.6F).build(); - public static final FoodProperties WARPED_BREW = new FoodProperties.Builder().nutrition(8).saturationMod(0.4F).build(); - public static final FoodProperties INIQUITOUS_BREW = new FoodProperties.Builder().nutrition(8).saturationMod(0.4F).build(); - public static final FoodProperties BOTTLE_OF_CRESTFALLEN_FLORA = new FoodProperties.Builder().nutrition(8).saturationMod(0.8F).build(); - public static final FoodProperties BOTTLED_MALODOROUS_MIXTURE = new FoodProperties.Builder().nutrition(6).saturationMod(0.4F).build(); - public static final FoodProperties PIQUANT_PRETZEL = new FoodProperties.Builder().nutrition(4).saturationMod(0.2F).build(); - public static final FoodProperties CHAMPIONS_OMELETTE = new FoodProperties.Builder().nutrition(14).saturationMod(1.0F).build(); - public static final FoodProperties FARSEER_BREW = new FoodProperties.Builder().nutrition(8).saturationMod(0.4F).build(); - public static final FoodProperties SHELLED_DUMPLING = new FoodProperties.Builder().nutrition(6).saturationMod(0.3F).build(); - public static final FoodProperties MEAT_SCRAPS = new FoodProperties.Builder().nutrition(6).saturationMod(0.4F).build(); - public static final FoodProperties BOK_CHOY = new FoodProperties.Builder().nutrition(2).saturationMod(0.1F).build(); - public static final FoodProperties SWEET_TEA = new FoodProperties.Builder().nutrition(4).saturationMod(0.2F).build(); - - - // Farmer's Delight Foods - public static final FoodProperties PECAN_PIE_SLICE = new FoodProperties.Builder().nutrition(3).saturationMod(0.2F).build(); - public static final FoodProperties PHANTOM_BURGER = new FoodProperties.Builder().nutrition(8).saturationMod(0.6F).meat().build(); - public static final FoodProperties PHANTOM_BEEF_PATTY = new FoodProperties.Builder().nutrition(3).saturationMod(0.2F).meat().build(); - public static final FoodProperties GLOW_INK_ROLL = new FoodProperties.Builder().nutrition(7).saturationMod(0.3F).build(); - public static final FoodProperties GLOW_INK_ROLL_SLICE = new FoodProperties.Builder().nutrition(3).saturationMod(0.1F).build(); - public static final FoodProperties ANNIVERSARY_CAKE_SLICE = new FoodProperties.Builder().nutrition(4).saturationMod(0.2F).build(); - - - - public static void setRegister() {} - -} diff --git a/src/main/java/net/dakotapride/garnished/registry/GarnishedItems.java b/src/main/java/net/dakotapride/garnished/registry/GarnishedItems.java index 17f9c7c6..12267294 100644 --- a/src/main/java/net/dakotapride/garnished/registry/GarnishedItems.java +++ b/src/main/java/net/dakotapride/garnished/registry/GarnishedItems.java @@ -1,19 +1,29 @@ package net.dakotapride.garnished.registry; +import com.simibubi.create.AllItems; +import com.simibubi.create.content.equipment.sandPaper.SandPaperItem; import com.simibubi.create.content.processing.sequenced.SequencedAssemblyItem; import com.simibubi.create.foundation.data.CreateRegistrate; +import com.simibubi.create.foundation.item.ItemDescription; import com.tterrag.registrate.util.entry.ItemEntry; import net.dakotapride.garnished.CreateGarnished; import net.dakotapride.garnished.item.*; -import net.dakotapride.garnished.item.cracked.*; +import net.dakotapride.garnished.item.cracked.CrackedAlmondItem; +import net.dakotapride.garnished.item.cracked.CrackedBuhgItem; +import net.dakotapride.garnished.item.cracked.CrackedCashewItem; +import net.dakotapride.garnished.item.cracked.CrackedChestnutItem; +import net.dakotapride.garnished.item.cracked.CrackedHazelnutItem; +import net.dakotapride.garnished.item.cracked.CrackedMacadamiaItem; +import net.dakotapride.garnished.item.cracked.CrackedPecanItem; +import net.dakotapride.garnished.item.cracked.CrackedPistachioItem; +import net.dakotapride.garnished.item.cracked.CrackedWalnutItem; import net.dakotapride.garnished.item.hatchet.tier.DiamondHatchetToolItem; import net.dakotapride.garnished.item.hatchet.tier.GoldHatchetToolItem; import net.dakotapride.garnished.item.hatchet.tier.IronHatchetToolItem; import net.dakotapride.garnished.item.hatchet.tier.NetheriteHatchetToolItem; import net.dakotapride.garnished.item.hatchet.tier.StoneHatchetToolItem; import net.dakotapride.garnished.item.hatchet.tier.WoodenHatchetToolItem; -import net.dakotapride.garnished.item.scratch_paper.PolarHideScratchPaperItem; import net.dakotapride.garnished.item.wood.NutBoatItem; import net.dakotapride.garnished.item.wood.NutChestBoatItem; import net.dakotapride.garnished.item.wood.NutSignItem; @@ -693,8 +703,10 @@ public class GarnishedItems { public static final ItemEntry CHILLED_APPLE = REGISTRATE.item("chilled_apple", ChilledAppleFoodItem::new).register(); - public static final ItemEntry POLAR_HIDE_SCRATCH_PAPER = - REGISTRATE.item("polar_hide_scratch_paper", PolarHideScratchPaperItem::new).register(); + public static final ItemEntry POLAR_HIDE_SCRATCH_PAPER = + REGISTRATE.item("polar_hide_scratch_paper", SandPaperItem::new) + .onRegister(s -> ItemDescription.referKey(s, AllItems.SAND_PAPER)) + .properties(p -> p.defaultDurability(32)).register(); public static final ItemEntry FROST = REGISTRATE.item("frost", Item::new).register(); @@ -710,8 +722,8 @@ public class GarnishedItems { REGISTRATE.item("warped_brew", WarpedBrewFoodItem::new).register(); public static final ItemEntry INIQUITOUS_BREW = REGISTRATE.item("iniquitous_brew", IniquitousBrewFoodItem::new).register(); - public static final ItemEntry BOTTLE_OF_CRESTFALLEN_FLORA = - REGISTRATE.item("crestfallen_flora", BottleOfCrestfallenFloraFoodItem::new).register(); + public static final ItemEntry BOTTLE_OF_CRESTFALLEN_FLORA = + REGISTRATE.item("crestfallen_flora", Item::new).register(); public static final ItemEntry BOTTLED_MALODOROUS_MIXTURE = REGISTRATE.item("bottled_malodorous_mixture", BottledMalodorousMixtureFoodItem::new).register(); public static final ItemEntry PIQUANT_PRETZEL = @@ -784,6 +796,9 @@ public class GarnishedItems { public static final ItemEntry GLOW_INK_ROLL_SLICE = REGISTRATE.item("glow_ink_roll_slice", GlowInkRollSliceFoodItem::new).register(); + public static final ItemEntry BROWNIE_PIECE = + REGISTRATE.item("brownie_walnuts_piece", BrowniePieceFoodItem::new).register(); + public static void setRegister() {} } diff --git a/src/main/java/net/dakotapride/garnished/registry/JEI/GarnishedJEI.java b/src/main/java/net/dakotapride/garnished/registry/JEI/GarnishedJEI.java index eb43cfba..2c987bd3 100644 --- a/src/main/java/net/dakotapride/garnished/registry/JEI/GarnishedJEI.java +++ b/src/main/java/net/dakotapride/garnished/registry/JEI/GarnishedJEI.java @@ -120,6 +120,11 @@ public void registerRecipes(IRecipeRegistration registration) { @Override public void registerRecipeCatalysts(IRecipeCatalystRegistration registration) { + + registration.getJeiHelpers().getRecipeType(new ResourceLocation("create", "sandpaper_polishing")).ifPresent(type -> { + registration.addRecipeCatalyst(new ItemStack(GarnishedItems.POLAR_HIDE_SCRATCH_PAPER.get()), type); + }); + allCategories.forEach(c -> c.registerCatalysts(registration)); } diff --git a/src/main/resources/assets/garnished/blockstates/numbing_parchment_block.json b/src/main/resources/assets/garnished/blockstates/numbing_parchment_block.json new file mode 100644 index 00000000..18c4bdb4 --- /dev/null +++ b/src/main/resources/assets/garnished/blockstates/numbing_parchment_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "garnished:block/numbing_parchment_block" + } + } +} diff --git a/src/main/resources/assets/garnished/blockstates/numbing_parchment_carpet.json b/src/main/resources/assets/garnished/blockstates/numbing_parchment_carpet.json new file mode 100644 index 00000000..5bdbef8f --- /dev/null +++ b/src/main/resources/assets/garnished/blockstates/numbing_parchment_carpet.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "garnished:block/numbing_parchment_carpet" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/garnished/blockstates/nut_window.json b/src/main/resources/assets/garnished/blockstates/nut_window.json new file mode 100644 index 00000000..5c2f4002 --- /dev/null +++ b/src/main/resources/assets/garnished/blockstates/nut_window.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "garnished:block/nut_window" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/garnished/blockstates/nut_window_pane.json b/src/main/resources/assets/garnished/blockstates/nut_window_pane.json new file mode 100644 index 00000000..4e06d848 --- /dev/null +++ b/src/main/resources/assets/garnished/blockstates/nut_window_pane.json @@ -0,0 +1,77 @@ +{ + "multipart": [ + { + "apply": { + "model": "garnished:block/nut_window_pane_post" + } + }, + { + "apply": { + "model": "garnished:block/nut_window_pane_side" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "garnished:block/nut_window_pane_noside" + }, + "when": { + "north": "false" + } + }, + { + "apply": { + "model": "garnished:block/nut_window_pane_side_alt" + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "garnished:block/nut_window_pane_noside_alt", + "y": 90 + }, + "when": { + "south": "false" + } + }, + { + "apply": { + "model": "garnished:block/nut_window_pane_side_alt", + "y": 90 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "garnished:block/nut_window_pane_noside", + "y": 270 + }, + "when": { + "west": "false" + } + }, + { + "apply": { + "model": "garnished:block/nut_window_pane_side", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "garnished:block/nut_window_pane_noside_alt" + }, + "when": { + "east": "false" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/garnished/blockstates/sepia_window.json b/src/main/resources/assets/garnished/blockstates/sepia_window.json new file mode 100644 index 00000000..00f6682f --- /dev/null +++ b/src/main/resources/assets/garnished/blockstates/sepia_window.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "garnished:block/sepia_window" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/garnished/blockstates/sepia_window_pane.json b/src/main/resources/assets/garnished/blockstates/sepia_window_pane.json new file mode 100644 index 00000000..558e4ead --- /dev/null +++ b/src/main/resources/assets/garnished/blockstates/sepia_window_pane.json @@ -0,0 +1,77 @@ +{ + "multipart": [ + { + "apply": { + "model": "garnished:block/sepia_window_pane_post" + } + }, + { + "apply": { + "model": "garnished:block/sepia_window_pane_side" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "garnished:block/sepia_window_pane_noside" + }, + "when": { + "north": "false" + } + }, + { + "apply": { + "model": "garnished:block/sepia_window_pane_side_alt" + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "garnished:block/sepia_window_pane_noside_alt", + "y": 90 + }, + "when": { + "south": "false" + } + }, + { + "apply": { + "model": "garnished:block/sepia_window_pane_side_alt", + "y": 90 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "garnished:block/sepia_window_pane_noside", + "y": 270 + }, + "when": { + "west": "false" + } + }, + { + "apply": { + "model": "garnished:block/sepia_window_pane_side", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "garnished:block/sepia_window_pane_noside_alt" + }, + "when": { + "east": "false" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/garnished/blockstates/unassigned_nut_leaves.json b/src/main/resources/assets/garnished/blockstates/unassigned_nut_leaves.json new file mode 100644 index 00000000..79795fe4 --- /dev/null +++ b/src/main/resources/assets/garnished/blockstates/unassigned_nut_leaves.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "garnished:block/unassigned_nut_leaves" + } + } +} diff --git a/src/main/resources/assets/garnished/lang/en_ca.json b/src/main/resources/assets/garnished/lang/en_ca.json index 33249eee..75bbb4ed 100644 --- a/src/main/resources/assets/garnished/lang/en_ca.json +++ b/src/main/resources/assets/garnished/lang/en_ca.json @@ -299,6 +299,8 @@ "block.garnished.nut_fence_gate": "Nut Fence Gate", "block.garnished.nut_button": "Nut Button", "block.garnished.nut_pressure_plate": "Nut Pressure Plate", + "block.garnished.nut_window": "Nut Window", + "block.garnished.nut_window_pane": "Nut Window Pane", "block.garnished.nut_sign": "Nut Sign", "item.garnished.nut_boat": "Nut Boat", "item.garnished.nut_chest_boat": "Nut Boat With Chest", @@ -310,6 +312,11 @@ "block.garnished.sepia_button": "Sepia Button", "block.garnished.sepia_pressure_plate": "Sepia Pressure Plate", "block.garnished.sepia_sign": "Sepia Sign", + "block.garnished.sepia_window": "Sepia Window", + "block.garnished.sepia_window_pane": "Sepia Window Pane", + + "block.garnished.numbing_parchment_block": "Block of Numbing Parchment", + "block.garnished.numbing_parchment_carpet": "Numbing Clothe", "item.garnished.baklava": "Baklava", "item.garnished.slime_drop": "Slime Drop", @@ -639,8 +646,8 @@ "block.garnished.magenta_zultanite": "Magenta Zultanite", "block.garnished.pink_zultanite": "Pink Zultanite", "block.garnished.black_zultanite": "Black Zultanite", - "block.garnished.gray_zultanite": "Gray Zultanite", - "block.garnished.light_gray_zultanite": "Light Gray Zultanite", + "block.garnished.gray_zultanite": "Grey Zultanite", + "block.garnished.light_gray_zultanite": "Light Grey Zultanite", "block.garnished.white_zultanite": "White Zultanite", "block.garnished.brown_zultanite": "Brown Zultanite", "block.garnished.zultanite_bricks": "Zultanite Bricks", @@ -656,8 +663,8 @@ "block.garnished.magenta_zultanite_bricks": "Magenta Zultanite Bricks", "block.garnished.pink_zultanite_bricks": "Pink Zultanite Bricks", "block.garnished.black_zultanite_bricks": "Black Zultanite Bricks", - "block.garnished.gray_zultanite_bricks": "Gray Zultanite Bricks", - "block.garnished.light_gray_zultanite_bricks": "Light Gray Zultanite Bricks", + "block.garnished.gray_zultanite_bricks": "Grey Zultanite Bricks", + "block.garnished.light_gray_zultanite_bricks": "Light Grey Zultanite Bricks", "block.garnished.white_zultanite_bricks": "White Zultanite Bricks", "block.garnished.brown_zultanite_bricks": "Brown Zultanite Bricks", "block.garnished.polished_zultanite": "Polished Zultanite", @@ -673,8 +680,8 @@ "block.garnished.polished_magenta_zultanite": "Polished Magenta Zultanite", "block.garnished.polished_pink_zultanite": "Polished Pink Zultanite", "block.garnished.polished_black_zultanite": "Polished Black Zultanite", - "block.garnished.polished_gray_zultanite": "Polished Gray Zultanite", - "block.garnished.polished_light_gray_zultanite": "Polished Light Gray Zultanite", + "block.garnished.polished_gray_zultanite": "Polished Grey Zultanite", + "block.garnished.polished_light_gray_zultanite": "Polished Light Grey Zultanite", "block.garnished.polished_white_zultanite": "Polished White Zultanite", "block.garnished.polished_brown_zultanite": "Polished Brown Zultanite", "block.garnished.smooth_zultanite": "Smooth Zultanite", @@ -690,8 +697,8 @@ "block.garnished.smooth_magenta_zultanite": "Smooth Magenta Zultanite", "block.garnished.smooth_pink_zultanite": "Smooth Pink Zultanite", "block.garnished.smooth_black_zultanite": "Smooth Black Zultanite", - "block.garnished.smooth_gray_zultanite": "Smooth Gray Zultanite", - "block.garnished.smooth_light_gray_zultanite": "Smooth Light Gray Zultanite", + "block.garnished.smooth_gray_zultanite": "Smooth Grey Zultanite", + "block.garnished.smooth_light_gray_zultanite": "Smooth Light Grey Zultanite", "block.garnished.smooth_white_zultanite": "Smooth White Zultanite", "block.garnished.smooth_brown_zultanite": "Smooth Brown Zultanite", "block.garnished.chiseled_zultanite_bricks": "Chiseled Zultanite Bricks", @@ -707,8 +714,8 @@ "block.garnished.chiseled_magenta_zultanite_bricks": "Chiseled Magenta Zultanite Bricks", "block.garnished.chiseled_pink_zultanite_bricks": "Chiseled Pink Zultanite Bricks", "block.garnished.chiseled_black_zultanite_bricks": "Chiseled Black Zultanite Bricks", - "block.garnished.chiseled_gray_zultanite_bricks": "Chiseled Gray Zultanite Bricks", - "block.garnished.chiseled_light_gray_zultanite_bricks": "Chiseled Light Gray Zultanite Bricks", + "block.garnished.chiseled_gray_zultanite_bricks": "Chiseled Grey Zultanite Bricks", + "block.garnished.chiseled_light_gray_zultanite_bricks": "Chiseled Light Grey Zultanite Bricks", "block.garnished.chiseled_white_zultanite_bricks": "Chiseled White Zultanite Bricks", "block.garnished.chiseled_brown_zultanite_bricks": "Chiseled Brown Zultanite Bricks", "block.garnished.zultanite_stairs": "Zultanite Stairs", @@ -724,8 +731,8 @@ "block.garnished.magenta_zultanite_stairs": "Magenta Zultanite Stairs", "block.garnished.pink_zultanite_stairs": "Pink Zultanite Stairs", "block.garnished.black_zultanite_stairs": "Black Zultanite Stairs", - "block.garnished.gray_zultanite_stairs": "Gray Zultanite Stairs", - "block.garnished.light_gray_zultanite_stairs": "Light Gray Zultanite Stairs", + "block.garnished.gray_zultanite_stairs": "Grey Zultanite Stairs", + "block.garnished.light_gray_zultanite_stairs": "Light Grey Zultanite Stairs", "block.garnished.white_zultanite_stairs": "White Zultanite Stairs", "block.garnished.brown_zultanite_stairs": "Brown Zultanite Stairs", "block.garnished.zultanite_brick_stairs": "Zultanite Brick Stairs", @@ -741,8 +748,8 @@ "block.garnished.magenta_zultanite_brick_stairs": "Magenta Zultanite Brick Stairs", "block.garnished.pink_zultanite_brick_stairs": "Pink Zultanite Brick Stairs", "block.garnished.black_zultanite_brick_stairs": "Black Zultanite Brick Stairs", - "block.garnished.gray_zultanite_brick_stairs": "Gray Zultanite Brick Stairs", - "block.garnished.light_gray_zultanite_brick_stairs": "Light Gray Zultanite Brick Stairs", + "block.garnished.gray_zultanite_brick_stairs": "Grey Zultanite Brick Stairs", + "block.garnished.light_gray_zultanite_brick_stairs": "Light Grey Zultanite Brick Stairs", "block.garnished.white_zultanite_brick_stairs": "White Zultanite Brick Stairs", "block.garnished.brown_zultanite_brick_stairs": "Brown Zultanite Brick Stairs", "block.garnished.polished_zultanite_stairs": "Polished Zultanite Stairs", @@ -758,8 +765,8 @@ "block.garnished.polished_magenta_zultanite_stairs": "Polished Magenta Zultanite Stairs", "block.garnished.polished_pink_zultanite_stairs": "Polished Pink Zultanite Stairs", "block.garnished.polished_black_zultanite_stairs": "Polished Black Zultanite Stairs", - "block.garnished.polished_gray_zultanite_stairs": "Polished Gray Zultanite Stairs", - "block.garnished.polished_light_gray_zultanite_stairs": "Polished Light Gray Zultanite Stairs", + "block.garnished.polished_gray_zultanite_stairs": "Polished Grey Zultanite Stairs", + "block.garnished.polished_light_gray_zultanite_stairs": "Polished Light Grey Zultanite Stairs", "block.garnished.polished_white_zultanite_stairs": "Polished White Zultanite Stairs", "block.garnished.polished_brown_zultanite_stairs": "Polished Brown Zultanite Stairs", "block.garnished.smooth_zultanite_stairs": "Smooth Zultanite Stairs", @@ -775,8 +782,8 @@ "block.garnished.smooth_magenta_zultanite_stairs": "Smooth Magenta Zultanite Stairs", "block.garnished.smooth_pink_zultanite_stairs": "Smooth Pink Zultanite Stairs", "block.garnished.smooth_black_zultanite_stairs": "Smooth Black Zultanite Stairs", - "block.garnished.smooth_gray_zultanite_stairs": "Smooth Gray Zultanite Stairs", - "block.garnished.smooth_light_gray_zultanite_stairs": "Smooth Light Gray Zultanite Stairs", + "block.garnished.smooth_gray_zultanite_stairs": "Smooth Grey Zultanite Stairs", + "block.garnished.smooth_light_gray_zultanite_stairs": "Smooth Light Grey Zultanite Stairs", "block.garnished.smooth_white_zultanite_stairs": "Smooth White Zultanite Stairs", "block.garnished.smooth_brown_zultanite_stairs": "Smooth Brown Zultanite Stairs", "block.garnished.zultanite_slab": "Zultanite Slab", @@ -792,8 +799,8 @@ "block.garnished.magenta_zultanite_slab": "Magenta Zultanite Slab", "block.garnished.pink_zultanite_slab": "Pink Zultanite Slab", "block.garnished.black_zultanite_slab": "Black Zultanite Slab", - "block.garnished.gray_zultanite_slab": "Gray Zultanite Slab", - "block.garnished.light_gray_zultanite_slab": "Light Gray Zultanite Slab", + "block.garnished.gray_zultanite_slab": "Grey Zultanite Slab", + "block.garnished.light_gray_zultanite_slab": "Light Grey Zultanite Slab", "block.garnished.white_zultanite_slab": "White Zultanite Slab", "block.garnished.brown_zultanite_slab": "Brown Zultanite Slab", "block.garnished.zultanite_brick_slab": "Zultanite Brick Slab", @@ -809,8 +816,8 @@ "block.garnished.magenta_zultanite_brick_slab": "Magenta Zultanite Brick Slab", "block.garnished.pink_zultanite_brick_slab": "Pink Zultanite Brick Slab", "block.garnished.black_zultanite_brick_slab": "Black Zultanite Brick Slab", - "block.garnished.gray_zultanite_brick_slab": "Gray Zultanite Brick Slab", - "block.garnished.light_gray_zultanite_brick_slab": "Light Gray Zultanite Brick Slab", + "block.garnished.gray_zultanite_brick_slab": "Grey Zultanite Brick Slab", + "block.garnished.light_gray_zultanite_brick_slab": "Light Grey Zultanite Brick Slab", "block.garnished.white_zultanite_brick_slab": "White Zultanite Brick Slab", "block.garnished.brown_zultanite_brick_slab": "Brown Zultanite Brick Slab", "block.garnished.polished_zultanite_slab": "Polished Zultanite Slab", @@ -826,8 +833,8 @@ "block.garnished.polished_magenta_zultanite_slab": "Polished Magenta Zultanite Slab", "block.garnished.polished_pink_zultanite_slab": "Polished Pink Zultanite Slab", "block.garnished.polished_black_zultanite_slab": "Polished Black Zultanite Slab", - "block.garnished.polished_gray_zultanite_slab": "Polished Gray Zultanite Slab", - "block.garnished.polished_light_gray_zultanite_slab": "Polished Light Gray Zultanite Slab", + "block.garnished.polished_gray_zultanite_slab": "Polished Grey Zultanite Slab", + "block.garnished.polished_light_gray_zultanite_slab": "Polished Light Grey Zultanite Slab", "block.garnished.polished_white_zultanite_slab": "Polished White Zultanite Slab", "block.garnished.polished_brown_zultanite_slab": "Polished Brown Zultanite Slab", "block.garnished.smooth_zultanite_slab": "Smooth Zultanite Slab", @@ -843,8 +850,8 @@ "block.garnished.smooth_magenta_zultanite_slab": "Smooth Magenta Zultanite Slab", "block.garnished.smooth_pink_zultanite_slab": "Smooth Pink Zultanite Slab", "block.garnished.smooth_black_zultanite_slab": "Smooth Black Zultanite Slab", - "block.garnished.smooth_gray_zultanite_slab": "Smooth Gray Zultanite Slab", - "block.garnished.smooth_light_gray_zultanite_slab": "Smooth Light Gray Zultanite Slab", + "block.garnished.smooth_gray_zultanite_slab": "Smooth Grey Zultanite Slab", + "block.garnished.smooth_light_gray_zultanite_slab": "Smooth Light Grey Zultanite Slab", "block.garnished.smooth_white_zultanite_slab": "Smooth White Zultanite Slab", "block.garnished.smooth_brown_zultanite_slab": "Smooth Brown Zultanite Slab", "block.garnished.zultanite_wall": "Zultanite Wall", @@ -860,8 +867,8 @@ "block.garnished.magenta_zultanite_wall": "Magenta Zultanite Wall", "block.garnished.pink_zultanite_wall": "Pink Zultanite Wall", "block.garnished.black_zultanite_wall": "Black Zultanite Wall", - "block.garnished.gray_zultanite_wall": "Gray Zultanite Wall", - "block.garnished.light_gray_zultanite_wall": "Light Gray Zultanite Wall", + "block.garnished.gray_zultanite_wall": "Grey Zultanite Wall", + "block.garnished.light_gray_zultanite_wall": "Light Grey Zultanite Wall", "block.garnished.white_zultanite_wall": "White Zultanite Wall", "block.garnished.brown_zultanite_wall": "Brown Zultanite Wall", "block.garnished.zultanite_brick_wall": "Zultanite Brick Wall", @@ -877,8 +884,8 @@ "block.garnished.magenta_zultanite_brick_wall": "Magenta Zultanite Brick Wall", "block.garnished.pink_zultanite_brick_wall": "Pink Zultanite Brick Wall", "block.garnished.black_zultanite_brick_wall": "Black Zultanite Brick Wall", - "block.garnished.gray_zultanite_brick_wall": "Gray Zultanite Brick Wall", - "block.garnished.light_gray_zultanite_brick_wall": "Light Gray Zultanite Brick Wall", + "block.garnished.gray_zultanite_brick_wall": "Grey Zultanite Brick Wall", + "block.garnished.light_gray_zultanite_brick_wall": "Light Grey Zultanite Brick Wall", "block.garnished.white_zultanite_brick_wall": "White Zultanite Brick Wall", "block.garnished.brown_zultanite_brick_wall": "Brown Zultanite Brick Wall", "block.garnished.polished_zultanite_wall": "Polished Zultanite Wall", @@ -894,8 +901,8 @@ "block.garnished.polished_magenta_zultanite_wall": "Polished Magenta Zultanite Wall", "block.garnished.polished_pink_zultanite_wall": "Polished Pink Zultanite Wall", "block.garnished.polished_black_zultanite_wall": "Polished Black Zultanite Wall", - "block.garnished.polished_gray_zultanite_wall": "Polished Gray Zultanite Wall", - "block.garnished.polished_light_gray_zultanite_wall": "Polished Light Gray Zultanite Wall", + "block.garnished.polished_gray_zultanite_wall": "Polished Grey Zultanite Wall", + "block.garnished.polished_light_gray_zultanite_wall": "Polished Light Grey Zultanite Wall", "block.garnished.polished_white_zultanite_wall": "Polished White Zultanite Wall", "block.garnished.polished_brown_zultanite_wall": "Polished Brown Zultanite Wall", "block.garnished.smooth_zultanite_wall": "Smooth Zultanite Wall", @@ -911,8 +918,8 @@ "block.garnished.smooth_magenta_zultanite_wall": "Smooth Magenta Zultanite Wall", "block.garnished.smooth_pink_zultanite_wall": "Smooth Pink Zultanite Wall", "block.garnished.smooth_black_zultanite_wall": "Smooth Black Zultanite Wall", - "block.garnished.smooth_gray_zultanite_wall": "Smooth Gray Zultanite Wall", - "block.garnished.smooth_light_gray_zultanite_wall": "Smooth Light Gray Zultanite Wall", + "block.garnished.smooth_gray_zultanite_wall": "Smooth Grey Zultanite Wall", + "block.garnished.smooth_light_gray_zultanite_wall": "Smooth Light Grey Zultanite Wall", "block.garnished.smooth_white_zultanite_wall": "Smooth White Zultanite Wall", "block.garnished.smooth_brown_zultanite_wall": "Smooth Brown Zultanite Wall", "item.garnished.mastic_resin_lime": "Lime Mastic Resin", @@ -953,11 +960,75 @@ "tag.item.c.buckets.mastic_resin": "Liquefied Mastic Resin Buckets", "tag.item.c.cheese": "Cheese", "tag.item.c.coral_fans": "Coral Fans", - "tag.item.c.crops.peanut": "Peanut Crops", "tag.item.c.ender_dusts": "Ender Dusts", "tag.item.c.pumpkins": "Pumpkins", "tag.item.c.tools.hatchets": "Hatchets", "tag.item.c.tools.knives": "Knives", + "tag.item.c.pecan": "Pecans", + "tag.item.c.almond": "Almonds", + "tag.item.c.cashew": "Cashews", + "tag.item.c.walnut": "Walnuts", + "tag.item.c.peanut": "Peanuts", + "tag.item.c.chestnut": "Chestnuts", + "tag.item.c.hazelnut": "Hazelnuts", + "tag.item.c.pistachio": "Pistachios", + "tag.item.c.macadamia": "Macadamias", + "tag.item.c.crops.pecan": "Pecan Crops", + "tag.item.c.crops.almond": "Almonds Crops", + "tag.item.c.crops.cashew": "Cashews Crops", + "tag.item.c.crops.walnut": "Walnuts Crops", + "tag.item.c.crops.peanut": "Peanuts Crops", + "tag.item.c.crops.chestnut": "Chestnuts Crops", + "tag.item.c.crops.hazelnut": "Hazelnuts Crops", + "tag.item.c.crops.pistachio": "Pistachios Crops", + "tag.item.c.crops.macadamia": "Macadamias Crops", + "tag.item.c.nuts.pecan": "Pecan Nuts", + "tag.item.c.nuts.almond": "Almonds Nuts", + "tag.item.c.nuts.cashew": "Cashews Nuts", + "tag.item.c.nuts.walnut": "Walnuts Nuts", + "tag.item.c.nuts.peanut": "Peanuts Nuts", + "tag.item.c.nuts.chestnut": "Chestnuts Nuts", + "tag.item.c.nuts.hazelnut": "Hazelnuts Nuts", + "tag.item.c.nuts.pistachio": "Pistachios Nuts", + "tag.item.c.nuts.macadamia": "Macadamias Nuts", + "tag.item.c.vegetables.pecan": "Pecan Vegetables", + "tag.item.c.vegetables.almond": "Almonds Vegetables", + "tag.item.c.vegetables.cashew": "Cashews Vegetables", + "tag.item.c.vegetables.walnut": "Walnuts Vegetables", + "tag.item.c.vegetables.peanut": "Peanuts Vegetables", + "tag.item.c.vegetables.chestnut": "Chestnuts Vegetables", + "tag.item.c.vegetables.hazelnut": "Hazelnuts Vegetables", + "tag.item.c.vegetables.pistachio": "Pistachios Vegetables", + "tag.item.c.vegetables.macadamia": "Macadamias Vegetables", + "tag.item.c.vegetables": "Vegetables", + "tag.item.c.salt": "Salt", + "tag.item.c.nuts": "Nuts", + "tag.item.c.doors": "Doors", + "tag.item.c.trapdoors": "Trapdoors", + "tag.item.c.wooden_buttons": "Wooden Buttons", + "tag.item.c.wooden_doors": "Wooden Doors", + "tag.item.c.wooden_trapdoors": "Wooden Trapdoors", + "tag.item.c.wooden_slabs": "Wooden Slabs", + "tag.item.c.wooden_stairs": "Wooden Stairs", + "tag.item.garnished.quartz_hatchet": "Quartz Hatchets", + "tag.item.garnished.stone_types.zultanite": "All Zultanite Stone Types", + "tag.item.garnished.stone_types.zultanite.basic": "Zultanite Stone Type", + "tag.item.garnished.stone_types.zultanite.red": "Red Zultanite Stone Type", + "tag.item.garnished.stone_types.zultanite.orange": "Orange Zultanite Stone Type", + "tag.item.garnished.stone_types.zultanite.yellow": "Yellow Zultanite Stone Type", + "tag.item.garnished.stone_types.zultanite.green": "Green Zultanite Stone Type", + "tag.item.garnished.stone_types.zultanite.lime": "Lime Zultanite Stone Type", + "tag.item.garnished.stone_types.zultanite.blue": "Blue Zultanite Stone Type", + "tag.item.garnished.stone_types.zultanite.light_blue": "Light Blue Zultanite Stone Type", + "tag.item.garnished.stone_types.zultanite.cyan": "Cyan Zultanite Stone Type", + "tag.item.garnished.stone_types.zultanite.purple": "Purple Zultanite Stone Type", + "tag.item.garnished.stone_types.zultanite.magenta": "Magenta Zultanite Stone Type", + "tag.item.garnished.stone_types.zultanite.pink": "Pink Zultanite Stone Type", + "tag.item.garnished.stone_types.zultanite.black": "Black Zultanite Stone Type", + "tag.item.garnished.stone_types.zultanite.gray": "Grey Zultanite Stone Type", + "tag.item.garnished.stone_types.zultanite.light_gray": "Light Grey Zultanite Stone Type", + "tag.item.garnished.stone_types.zultanite.white": "White Zultanite Stone Type", + "tag.item.garnished.stone_types.zultanite.brown": "Brown Zultanite Stone Type", "tag.item.garnished.acceptable_nopalito_meat_ingredients": "Acceptable Meat for Nopalito Food(s)", "tag.item.garnished.aversion_foods": "Foods That Inflict Aversion", "tag.item.garnished.berries": "Berries", @@ -1056,9 +1127,9 @@ "emi.category.garnished.fan_black_dyeing": "Bulk Dyeing", "create.recipe.fan_black_dyeing.fan": "Fan Behind Black Liquefied Mastic Resin", "emi.category.garnished.fan_gray_dyeing": "Bulk Dyeing", - "create.recipe.fan_gray_dyeing.fan": "Fan Behind Gray Liquefied Mastic Resin", + "create.recipe.fan_gray_dyeing.fan": "Fan Behind Grey Liquefied Mastic Resin", "emi.category.garnished.fan_light_gray_dyeing": "Bulk Dyeing", - "create.recipe.fan_light_gray_dyeing.fan": "Fan Behind Light Gray Liquefied Mastic Resin", + "create.recipe.fan_light_gray_dyeing.fan": "Fan Behind Light Grey Liquefied Mastic Resin", "emi.category.garnished.fan_white_dyeing": "Bulk Dyeing", "create.recipe.fan_white_dyeing.fan": "Fan Behind White Liquefied Mastic Resin", "emi.category.garnished.fan_brown_dyeing": "Bulk Dyeing", @@ -1075,6 +1146,7 @@ "block.garnished.chestnut_sack": "Compacted Nut Sack", "block.garnished.nut_leaves": "Nut Leaves", + "block.garnished.unassigned_nut_leaves": "Nut Leaves", "block.garnished.peanut_leaves": "Nut Leaves", "block.garnished.cashew_leaves": "Nut Leaves", "block.garnished.almond_leaves": "Nut Leaves", @@ -1102,8 +1174,8 @@ "item.garnished.magenta_mastic_resin_bucket": "Bucket of Magenta Mastic Resin", "item.garnished.pink_mastic_resin_bucket": "Bucket of Pink Mastic Resin", "item.garnished.black_mastic_resin_bucket": "Bucket of Black Mastic Resin", - "item.garnished.gray_mastic_resin_bucket": "Bucket of Gray Mastic Resin", - "item.garnished.light_gray_mastic_resin_bucket": "Bucket of Light Gray Mastic Resin", + "item.garnished.gray_mastic_resin_bucket": "Bucket of Grey Mastic Resin", + "item.garnished.light_gray_mastic_resin_bucket": "Bucket of Light Grey Mastic Resin", "item.garnished.white_mastic_resin_bucket": "Bucket of White Mastic Resin", "item.garnished.brown_mastic_resin_bucket": "Bucket of Brown Mastic Resin", "item.garnished.dragon_breath_bucket": "Bucket of Dragon's Breath", @@ -1142,10 +1214,10 @@ "block.garnished.pink_mastic_resin": "Liquefied Pink Mastic Resin", "fluid.garnished.black_mastic_resin": "Liquefied Black Mastic Resin", "block.garnished.black_mastic_resin": "Liquefied Black Mastic Resin", - "fluid.garnished.gray_mastic_resin": "Liquefied Gray Mastic Resin", - "block.garnished.gray_mastic_resin": "Liquefied Gray Mastic Resin", - "fluid.garnished.light_gray_mastic_resin": "Liquefied Light Gray Mastic Resin", - "block.garnished.light_gray_mastic_resin": "Liquefied Light Gray Mastic Resin", + "fluid.garnished.gray_mastic_resin": "Liquefied Grey Mastic Resin", + "block.garnished.gray_mastic_resin": "Liquefied Grey Mastic Resin", + "fluid.garnished.light_gray_mastic_resin": "Liquefied Light Grey Mastic Resin", + "block.garnished.light_gray_mastic_resin": "Liquefied Light Grey Mastic Resin", "fluid.garnished.white_mastic_resin": "Liquefied White Mastic Resin", "block.garnished.white_mastic_resin": "Liquefied White Mastic Resin", "fluid.garnished.brown_mastic_resin": "Liquefied Brown Mastic Resin", diff --git a/src/main/resources/assets/garnished/lang/en_us.json b/src/main/resources/assets/garnished/lang/en_us.json index 80e379bb..1731e69a 100644 --- a/src/main/resources/assets/garnished/lang/en_us.json +++ b/src/main/resources/assets/garnished/lang/en_us.json @@ -299,6 +299,8 @@ "block.garnished.nut_fence_gate": "Nut Fence Gate", "block.garnished.nut_button": "Nut Button", "block.garnished.nut_pressure_plate": "Nut Pressure Plate", + "block.garnished.nut_window": "Nut Window", + "block.garnished.nut_window_pane": "Nut Window Pane", "block.garnished.nut_sign": "Nut Sign", "item.garnished.nut_boat": "Nut Boat", "item.garnished.nut_chest_boat": "Nut Boat With Chest", @@ -310,6 +312,11 @@ "block.garnished.sepia_button": "Sepia Button", "block.garnished.sepia_pressure_plate": "Sepia Pressure Plate", "block.garnished.sepia_sign": "Sepia Sign", + "block.garnished.sepia_window": "Sepia Window", + "block.garnished.sepia_window_pane": "Sepia Window Pane", + + "block.garnished.numbing_parchment_block": "Block of Numbing Parchment", + "block.garnished.numbing_parchment_carpet": "Numbing Clothe", "item.garnished.baklava": "Baklava", "item.garnished.slime_drop": "Slime Drop", @@ -1139,6 +1146,7 @@ "block.garnished.chestnut_sack": "Compacted Nut Sack", "block.garnished.nut_leaves": "Nut Leaves", + "block.garnished.unassigned_nut_leaves": "Nut Leaves", "block.garnished.peanut_leaves": "Nut Leaves", "block.garnished.cashew_leaves": "Nut Leaves", "block.garnished.almond_leaves": "Nut Leaves", diff --git a/src/main/resources/assets/garnished/models/block/numbing_parchment_block.json b/src/main/resources/assets/garnished/models/block/numbing_parchment_block.json new file mode 100644 index 00000000..35eae480 --- /dev/null +++ b/src/main/resources/assets/garnished/models/block/numbing_parchment_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "garnished:block/numbing_parchment_block" + } +} diff --git a/src/main/resources/assets/garnished/models/block/numbing_parchment_carpet.json b/src/main/resources/assets/garnished/models/block/numbing_parchment_carpet.json new file mode 100644 index 00000000..0746208e --- /dev/null +++ b/src/main/resources/assets/garnished/models/block/numbing_parchment_carpet.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/carpet", + "textures": { + "wool": "garnished:block/numbing_parchment_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/garnished/models/block/nut_window.json b/src/main/resources/assets/garnished/models/block/nut_window.json new file mode 100644 index 00000000..7f615f2e --- /dev/null +++ b/src/main/resources/assets/garnished/models/block/nut_window.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "garnished:block/nut_planks", + "side": "garnished:block/nut_window" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/garnished/models/block/nut_window_pane_noside.json b/src/main/resources/assets/garnished/models/block/nut_window_pane_noside.json new file mode 100644 index 00000000..2ad9b414 --- /dev/null +++ b/src/main/resources/assets/garnished/models/block/nut_window_pane_noside.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/noside", + "textures": { + "edge": "garnished:block/nut_planks", + "pane": "garnished:block/nut_window" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/garnished/models/block/nut_window_pane_noside_alt.json b/src/main/resources/assets/garnished/models/block/nut_window_pane_noside_alt.json new file mode 100644 index 00000000..e0b0ed93 --- /dev/null +++ b/src/main/resources/assets/garnished/models/block/nut_window_pane_noside_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/noside_alt", + "textures": { + "edge": "garnished:block/nut_planks", + "pane": "garnished:block/nut_window" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/garnished/models/block/nut_window_pane_post.json b/src/main/resources/assets/garnished/models/block/nut_window_pane_post.json new file mode 100644 index 00000000..ae53d6c9 --- /dev/null +++ b/src/main/resources/assets/garnished/models/block/nut_window_pane_post.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/post", + "textures": { + "edge": "garnished:block/nut_planks", + "pane": "garnished:block/nut_window" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/garnished/models/block/nut_window_pane_side.json b/src/main/resources/assets/garnished/models/block/nut_window_pane_side.json new file mode 100644 index 00000000..81204e3a --- /dev/null +++ b/src/main/resources/assets/garnished/models/block/nut_window_pane_side.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/side", + "textures": { + "edge": "garnished:block/nut_planks", + "pane": "garnished:block/nut_window" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/garnished/models/block/nut_window_pane_side_alt.json b/src/main/resources/assets/garnished/models/block/nut_window_pane_side_alt.json new file mode 100644 index 00000000..42d8433b --- /dev/null +++ b/src/main/resources/assets/garnished/models/block/nut_window_pane_side_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/side_alt", + "textures": { + "edge": "garnished:block/nut_planks", + "pane": "garnished:block/nut_window" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/garnished/models/block/sepia_window.json b/src/main/resources/assets/garnished/models/block/sepia_window.json new file mode 100644 index 00000000..21cfe864 --- /dev/null +++ b/src/main/resources/assets/garnished/models/block/sepia_window.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "garnished:block/sepia_planks", + "side": "garnished:block/sepia_window" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/garnished/models/block/sepia_window_pane_noside.json b/src/main/resources/assets/garnished/models/block/sepia_window_pane_noside.json new file mode 100644 index 00000000..e9a84d5d --- /dev/null +++ b/src/main/resources/assets/garnished/models/block/sepia_window_pane_noside.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/noside", + "textures": { + "edge": "garnished:block/sepia_planks", + "pane": "garnished:block/sepia_window" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/garnished/models/block/sepia_window_pane_noside_alt.json b/src/main/resources/assets/garnished/models/block/sepia_window_pane_noside_alt.json new file mode 100644 index 00000000..b37ee8a0 --- /dev/null +++ b/src/main/resources/assets/garnished/models/block/sepia_window_pane_noside_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/noside_alt", + "textures": { + "edge": "garnished:block/sepia_planks", + "pane": "garnished:block/sepia_window" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/garnished/models/block/sepia_window_pane_post.json b/src/main/resources/assets/garnished/models/block/sepia_window_pane_post.json new file mode 100644 index 00000000..33131bbc --- /dev/null +++ b/src/main/resources/assets/garnished/models/block/sepia_window_pane_post.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/post", + "textures": { + "edge": "garnished:block/sepia_planks", + "pane": "garnished:block/sepia_window" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/garnished/models/block/sepia_window_pane_side.json b/src/main/resources/assets/garnished/models/block/sepia_window_pane_side.json new file mode 100644 index 00000000..4792540f --- /dev/null +++ b/src/main/resources/assets/garnished/models/block/sepia_window_pane_side.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/side", + "textures": { + "edge": "garnished:block/sepia_planks", + "pane": "garnished:block/sepia_window" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/garnished/models/block/sepia_window_pane_side_alt.json b/src/main/resources/assets/garnished/models/block/sepia_window_pane_side_alt.json new file mode 100644 index 00000000..60f5d1eb --- /dev/null +++ b/src/main/resources/assets/garnished/models/block/sepia_window_pane_side_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/side_alt", + "textures": { + "edge": "garnished:block/sepia_planks", + "pane": "garnished:block/sepia_window" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/garnished/models/block/unassigned_nut_leaves.json b/src/main/resources/assets/garnished/models/block/unassigned_nut_leaves.json new file mode 100644 index 00000000..b9ade68f --- /dev/null +++ b/src/main/resources/assets/garnished/models/block/unassigned_nut_leaves.json @@ -0,0 +1,21 @@ +{ "parent": "block/block", + "textures": { + "particle": "garnished:block/nut_leaves", + "bottom": "garnished:block/nut_leaves", + "top": "garnished:block/nut_leaves", + "side": "garnished:block/nut_leaves" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down", "tintindex": 1 }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top", "cullface": "up", "tintindex": 1 }, + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "north", "tintindex": 1 }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "south", "tintindex": 1 }, + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "west", "tintindex": 1 }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "east", "tintindex": 1 } + } + } + ] +} diff --git a/src/main/resources/assets/garnished/models/item/brownie_walnuts_piece.json b/src/main/resources/assets/garnished/models/item/brownie_walnuts_piece.json new file mode 100644 index 00000000..9f0c6a8d --- /dev/null +++ b/src/main/resources/assets/garnished/models/item/brownie_walnuts_piece.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "garnished:item/integration/brownie_walnuts_slice" + } +} diff --git a/src/main/resources/assets/garnished/models/item/numbing_parchment_block.json b/src/main/resources/assets/garnished/models/item/numbing_parchment_block.json new file mode 100644 index 00000000..f0cfc371 --- /dev/null +++ b/src/main/resources/assets/garnished/models/item/numbing_parchment_block.json @@ -0,0 +1,3 @@ +{ + "parent": "garnished:block/numbing_parchment_block" +} diff --git a/src/main/resources/assets/garnished/models/item/numbing_parchment_carpet.json b/src/main/resources/assets/garnished/models/item/numbing_parchment_carpet.json new file mode 100644 index 00000000..1c205ffd --- /dev/null +++ b/src/main/resources/assets/garnished/models/item/numbing_parchment_carpet.json @@ -0,0 +1,3 @@ +{ + "parent": "garnished:block/numbing_parchment_carpet" +} \ No newline at end of file diff --git a/src/main/resources/assets/garnished/models/item/nut_window.json b/src/main/resources/assets/garnished/models/item/nut_window.json new file mode 100644 index 00000000..f2f07ef3 --- /dev/null +++ b/src/main/resources/assets/garnished/models/item/nut_window.json @@ -0,0 +1,3 @@ +{ + "parent": "garnished:block/nut_window" +} \ No newline at end of file diff --git a/src/main/resources/assets/garnished/models/item/nut_window_pane.json b/src/main/resources/assets/garnished/models/item/nut_window_pane.json new file mode 100644 index 00000000..58c26677 --- /dev/null +++ b/src/main/resources/assets/garnished/models/item/nut_window_pane.json @@ -0,0 +1,7 @@ +{ + "parent": "create:item/pane", + "textures": { + "edge": "garnished:block/nut_planks", + "pane": "garnished:block/nut_window" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/garnished/models/item/sepia_window.json b/src/main/resources/assets/garnished/models/item/sepia_window.json new file mode 100644 index 00000000..dca7178a --- /dev/null +++ b/src/main/resources/assets/garnished/models/item/sepia_window.json @@ -0,0 +1,3 @@ +{ + "parent": "garnished:block/sepia_window" +} \ No newline at end of file diff --git a/src/main/resources/assets/garnished/models/item/sepia_window_pane.json b/src/main/resources/assets/garnished/models/item/sepia_window_pane.json new file mode 100644 index 00000000..f263ede9 --- /dev/null +++ b/src/main/resources/assets/garnished/models/item/sepia_window_pane.json @@ -0,0 +1,7 @@ +{ + "parent": "create:item/pane", + "textures": { + "edge": "garnished:block/sepia_planks", + "pane": "garnished:block/sepia_window" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/garnished/models/item/unassigned_nut_leaves.json b/src/main/resources/assets/garnished/models/item/unassigned_nut_leaves.json new file mode 100644 index 00000000..bed31046 --- /dev/null +++ b/src/main/resources/assets/garnished/models/item/unassigned_nut_leaves.json @@ -0,0 +1,3 @@ +{ + "parent": "garnished:block/unassigned_nut_leaves" +} diff --git a/src/main/resources/assets/garnished/textures/block/numbing_parchment_block.png b/src/main/resources/assets/garnished/textures/block/numbing_parchment_block.png new file mode 100644 index 00000000..96c6212c Binary files /dev/null and b/src/main/resources/assets/garnished/textures/block/numbing_parchment_block.png differ diff --git a/src/main/resources/assets/garnished/textures/block/numbing_parchment_block_connected.png b/src/main/resources/assets/garnished/textures/block/numbing_parchment_block_connected.png new file mode 100644 index 00000000..ab31a71b Binary files /dev/null and b/src/main/resources/assets/garnished/textures/block/numbing_parchment_block_connected.png differ diff --git a/src/main/resources/assets/garnished/textures/block/nut_window.png b/src/main/resources/assets/garnished/textures/block/nut_window.png new file mode 100644 index 00000000..b7ea59c4 Binary files /dev/null and b/src/main/resources/assets/garnished/textures/block/nut_window.png differ diff --git a/src/main/resources/assets/garnished/textures/block/nut_window_connected.png b/src/main/resources/assets/garnished/textures/block/nut_window_connected.png new file mode 100644 index 00000000..54405e62 Binary files /dev/null and b/src/main/resources/assets/garnished/textures/block/nut_window_connected.png differ diff --git a/src/main/resources/assets/garnished/textures/block/sepia_window.png b/src/main/resources/assets/garnished/textures/block/sepia_window.png new file mode 100644 index 00000000..91198962 Binary files /dev/null and b/src/main/resources/assets/garnished/textures/block/sepia_window.png differ diff --git a/src/main/resources/assets/garnished/textures/block/sepia_window_connected.png b/src/main/resources/assets/garnished/textures/block/sepia_window_connected.png new file mode 100644 index 00000000..dbb492a5 Binary files /dev/null and b/src/main/resources/assets/garnished/textures/block/sepia_window_connected.png differ diff --git a/src/main/resources/assets/garnished/textures/item/integration/brownie_walnuts_slice.png b/src/main/resources/assets/garnished/textures/item/integration/brownie_walnuts_slice.png new file mode 100644 index 00000000..6144c1ee Binary files /dev/null and b/src/main/resources/assets/garnished/textures/item/integration/brownie_walnuts_slice.png differ diff --git a/src/main/resources/assets/garnished/textures/item/sturdy_waffle.png b/src/main/resources/assets/garnished/textures/item/sturdy_waffle.png index b31c6080..dd0fee7a 100644 Binary files a/src/main/resources/assets/garnished/textures/item/sturdy_waffle.png and b/src/main/resources/assets/garnished/textures/item/sturdy_waffle.png differ diff --git a/src/main/resources/assets/garnished/textures/mob_effect/austral.png b/src/main/resources/assets/garnished/textures/mob_effect/augmented.png similarity index 100% rename from src/main/resources/assets/garnished/textures/mob_effect/austral.png rename to src/main/resources/assets/garnished/textures/mob_effect/augmented.png diff --git a/src/main/resources/data/create/tags/items/sandpaper.json b/src/main/resources/data/create/tags/items/sandpaper.json new file mode 100644 index 00000000..a4eb8071 --- /dev/null +++ b/src/main/resources/data/create/tags/items/sandpaper.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "garnished:polar_hide_scratch_paper" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/garnished/advancements/consume_all_foods.json b/src/main/resources/data/garnished/advancements/consume_all_foods.json index 6ddf789d..f9d037d7 100644 --- a/src/main/resources/data/garnished/advancements/consume_all_foods.json +++ b/src/main/resources/data/garnished/advancements/consume_all_foods.json @@ -2078,16 +2078,6 @@ } } }, - "crestfallen_flora": { - "trigger": "minecraft:consume_item", - "conditions": { - "item": { - "items": [ - "garnished:crestfallen_flora" - ] - } - } - }, "bottled_malodorous_mixture": { "trigger": "minecraft:consume_item", "conditions": { @@ -2784,9 +2774,6 @@ [ "piquant_pretzel" ], - [ - "crestfallen_flora" - ], [ "bottled_malodorous_mixture" ], diff --git a/src/main/resources/data/garnished/loot_tables/blocks/carnotite_bricks_slab.json b/src/main/resources/data/garnished/loot_tables/blocks/carnotite_brick_slab.json similarity index 100% rename from src/main/resources/data/garnished/loot_tables/blocks/carnotite_bricks_slab.json rename to src/main/resources/data/garnished/loot_tables/blocks/carnotite_brick_slab.json diff --git a/src/main/resources/data/garnished/loot_tables/blocks/carnotite_bricks_wall.json b/src/main/resources/data/garnished/loot_tables/blocks/carnotite_brick_wall.json similarity index 100% rename from src/main/resources/data/garnished/loot_tables/blocks/carnotite_bricks_wall.json rename to src/main/resources/data/garnished/loot_tables/blocks/carnotite_brick_wall.json diff --git a/src/main/resources/data/garnished/loot_tables/blocks/numbing_parchment_block.json b/src/main/resources/data/garnished/loot_tables/blocks/numbing_parchment_block.json new file mode 100644 index 00000000..31bc7839 --- /dev/null +++ b/src/main/resources/data/garnished/loot_tables/blocks/numbing_parchment_block.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "garnished:numbing_parchment_block" + } + ], + "rolls": 1.0 + } + ] +} diff --git a/src/main/resources/data/garnished/loot_tables/blocks/numbing_parchment_carpet.json b/src/main/resources/data/garnished/loot_tables/blocks/numbing_parchment_carpet.json new file mode 100644 index 00000000..2476573a --- /dev/null +++ b/src/main/resources/data/garnished/loot_tables/blocks/numbing_parchment_carpet.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "garnished:numbing_parchment_carpet" + } + ], + "rolls": 1.0 + } + ] +} diff --git a/src/main/resources/data/garnished/loot_tables/blocks/nut_hanging_sign.json b/src/main/resources/data/garnished/loot_tables/blocks/nut_hanging_sign.json new file mode 100644 index 00000000..2ef838cb --- /dev/null +++ b/src/main/resources/data/garnished/loot_tables/blocks/nut_hanging_sign.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "garnished:nut_hanging_sign" + } + ], + "rolls": 1.0 + } + ] +} diff --git a/src/main/resources/data/garnished/loot_tables/blocks/nut_wall_hanging_sign.json b/src/main/resources/data/garnished/loot_tables/blocks/nut_wall_hanging_sign.json new file mode 100644 index 00000000..2ef838cb --- /dev/null +++ b/src/main/resources/data/garnished/loot_tables/blocks/nut_wall_hanging_sign.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "garnished:nut_hanging_sign" + } + ], + "rolls": 1.0 + } + ] +} diff --git a/src/main/resources/data/garnished/loot_tables/blocks/ritualistic_stone_slab.json b/src/main/resources/data/garnished/loot_tables/blocks/ritualistic_stone_slab.json new file mode 100644 index 00000000..b939bb7a --- /dev/null +++ b/src/main/resources/data/garnished/loot_tables/blocks/ritualistic_stone_slab.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "bonus_rolls": 0, + "entries": [ + { + "type": "minecraft:item", + "name": "garnished:ritualistic_stone_slab" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} diff --git a/src/main/resources/data/garnished/loot_tables/blocks/ritualistic_stone_stairs.json b/src/main/resources/data/garnished/loot_tables/blocks/ritualistic_stone_stairs.json new file mode 100644 index 00000000..356cb718 --- /dev/null +++ b/src/main/resources/data/garnished/loot_tables/blocks/ritualistic_stone_stairs.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "bonus_rolls": 0, + "entries": [ + { + "type": "minecraft:item", + "name": "garnished:ritualistic_stone_stairs" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} diff --git a/src/main/resources/data/garnished/loot_tables/blocks/ritualistic_stone_wall.json b/src/main/resources/data/garnished/loot_tables/blocks/ritualistic_stone_wall.json new file mode 100644 index 00000000..478f2d43 --- /dev/null +++ b/src/main/resources/data/garnished/loot_tables/blocks/ritualistic_stone_wall.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "bonus_rolls": 0, + "entries": [ + { + "type": "minecraft:item", + "name": "garnished:ritualistic_stone_wall" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} diff --git a/src/main/resources/data/garnished/loot_tables/blocks/sepia_hanging_sign.json b/src/main/resources/data/garnished/loot_tables/blocks/sepia_hanging_sign.json new file mode 100644 index 00000000..7e9c9d07 --- /dev/null +++ b/src/main/resources/data/garnished/loot_tables/blocks/sepia_hanging_sign.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "garnished:sepia_hanging_sign" + } + ], + "rolls": 1.0 + } + ] +} diff --git a/src/main/resources/data/garnished/loot_tables/blocks/sepia_wall_hanging_sign.json b/src/main/resources/data/garnished/loot_tables/blocks/sepia_wall_hanging_sign.json new file mode 100644 index 00000000..7e9c9d07 --- /dev/null +++ b/src/main/resources/data/garnished/loot_tables/blocks/sepia_wall_hanging_sign.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "garnished:sepia_hanging_sign" + } + ], + "rolls": 1.0 + } + ] +} diff --git a/src/main/resources/data/garnished/loot_tables/blocks/unassigned_nut_leaves.json b/src/main/resources/data/garnished/loot_tables/blocks/unassigned_nut_leaves.json new file mode 100644 index 00000000..b748cd93 --- /dev/null +++ b/src/main/resources/data/garnished/loot_tables/blocks/unassigned_nut_leaves.json @@ -0,0 +1,116 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "bonus_rolls": 0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "name": "garnished:unassigned_nut_leaves", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": [ + "minecraft:shears" + ] + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ] + } + ] + } + ] + } + ] + }, + { + "rolls": 1, + "bonus_rolls": 0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:stick", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "type": "minecraft:uniform", + "min": 1, + "max": 2 + }, + "add": false + }, + { + "function": "minecraft:explosion_decay" + } + ], + "conditions": [ + { + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune", + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ] + } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": [ + "minecraft:shears" + ] + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ] + } + } + ] + } + ] +} diff --git a/src/main/resources/data/garnished/recipes/dye_blowing/garnished/black/mastic_bucket_from_mastic_bucket_tag.json b/src/main/resources/data/garnished/recipes/dye_blowing/garnished/black/mastic_bucket_from_mastic_bucket_tag.json index 5981e2cd..ecd07eb4 100644 --- a/src/main/resources/data/garnished/recipes/dye_blowing/garnished/black/mastic_bucket_from_mastic_bucket_tag.json +++ b/src/main/resources/data/garnished/recipes/dye_blowing/garnished/black/mastic_bucket_from_mastic_bucket_tag.json @@ -2,7 +2,7 @@ "type": "garnished:black_dye_blowing", "ingredients": [ { - "tag": "forge:buckets/mastic_resin" + "tag": "c:buckets/mastic_resin" } ], "results": [ @@ -11,4 +11,4 @@ "count": 1 } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/garnished/recipes/dye_blowing/garnished/blue/mastic_bucket_from_mastic_bucket_tag.json b/src/main/resources/data/garnished/recipes/dye_blowing/garnished/blue/mastic_bucket_from_mastic_bucket_tag.json index fee632ed..efde64db 100644 --- a/src/main/resources/data/garnished/recipes/dye_blowing/garnished/blue/mastic_bucket_from_mastic_bucket_tag.json +++ b/src/main/resources/data/garnished/recipes/dye_blowing/garnished/blue/mastic_bucket_from_mastic_bucket_tag.json @@ -2,7 +2,7 @@ "type": "garnished:blue_dye_blowing", "ingredients": [ { - "tag": "forge:buckets/mastic_resin" + "tag": "c:buckets/mastic_resin" } ], "results": [ @@ -11,4 +11,4 @@ "count": 1 } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/garnished/recipes/dye_blowing/garnished/brown/mastic_bucket_from_mastic_bucket_tag.json b/src/main/resources/data/garnished/recipes/dye_blowing/garnished/brown/mastic_bucket_from_mastic_bucket_tag.json index ffa37e14..c73ae683 100644 --- a/src/main/resources/data/garnished/recipes/dye_blowing/garnished/brown/mastic_bucket_from_mastic_bucket_tag.json +++ b/src/main/resources/data/garnished/recipes/dye_blowing/garnished/brown/mastic_bucket_from_mastic_bucket_tag.json @@ -2,7 +2,7 @@ "type": "garnished:brown_dye_blowing", "ingredients": [ { - "tag": "forge:buckets/mastic_resin" + "tag": "c:buckets/mastic_resin" } ], "results": [ @@ -11,4 +11,4 @@ "count": 1 } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/garnished/recipes/dye_blowing/garnished/cyan/mastic_bucket_from_mastic_bucket_tag.json b/src/main/resources/data/garnished/recipes/dye_blowing/garnished/cyan/mastic_bucket_from_mastic_bucket_tag.json index 07e90a78..78cf6786 100644 --- a/src/main/resources/data/garnished/recipes/dye_blowing/garnished/cyan/mastic_bucket_from_mastic_bucket_tag.json +++ b/src/main/resources/data/garnished/recipes/dye_blowing/garnished/cyan/mastic_bucket_from_mastic_bucket_tag.json @@ -2,7 +2,7 @@ "type": "garnished:cyan_dye_blowing", "ingredients": [ { - "tag": "forge:buckets/mastic_resin" + "tag": "c:buckets/mastic_resin" } ], "results": [ @@ -11,4 +11,4 @@ "count": 1 } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/garnished/recipes/dye_blowing/garnished/gray/mastic_bucket_from_mastic_bucket_tag.json b/src/main/resources/data/garnished/recipes/dye_blowing/garnished/gray/mastic_bucket_from_mastic_bucket_tag.json index 0a03da62..b8c95e15 100644 --- a/src/main/resources/data/garnished/recipes/dye_blowing/garnished/gray/mastic_bucket_from_mastic_bucket_tag.json +++ b/src/main/resources/data/garnished/recipes/dye_blowing/garnished/gray/mastic_bucket_from_mastic_bucket_tag.json @@ -2,7 +2,7 @@ "type": "garnished:gray_dye_blowing", "ingredients": [ { - "tag": "forge:buckets/mastic_resin" + "tag": "c:buckets/mastic_resin" } ], "results": [ @@ -11,4 +11,4 @@ "count": 1 } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/garnished/recipes/dye_blowing/garnished/green/mastic_bucket_from_mastic_bucket_tag.json b/src/main/resources/data/garnished/recipes/dye_blowing/garnished/green/mastic_bucket_from_mastic_bucket_tag.json index c967d5ff..13639838 100644 --- a/src/main/resources/data/garnished/recipes/dye_blowing/garnished/green/mastic_bucket_from_mastic_bucket_tag.json +++ b/src/main/resources/data/garnished/recipes/dye_blowing/garnished/green/mastic_bucket_from_mastic_bucket_tag.json @@ -2,7 +2,7 @@ "type": "garnished:green_dye_blowing", "ingredients": [ { - "tag": "forge:buckets/mastic_resin" + "tag": "c:buckets/mastic_resin" } ], "results": [ @@ -11,4 +11,4 @@ "count": 1 } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/garnished/recipes/dye_blowing/garnished/light_blue/mastic_bucket_from_mastic_bucket_tag.json b/src/main/resources/data/garnished/recipes/dye_blowing/garnished/light_blue/mastic_bucket_from_mastic_bucket_tag.json index 604a79cb..d3c97c9c 100644 --- a/src/main/resources/data/garnished/recipes/dye_blowing/garnished/light_blue/mastic_bucket_from_mastic_bucket_tag.json +++ b/src/main/resources/data/garnished/recipes/dye_blowing/garnished/light_blue/mastic_bucket_from_mastic_bucket_tag.json @@ -2,7 +2,7 @@ "type": "garnished:light_blue_dye_blowing", "ingredients": [ { - "tag": "forge:buckets/mastic_resin" + "tag": "c:buckets/mastic_resin" } ], "results": [ @@ -11,4 +11,4 @@ "count": 1 } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/garnished/recipes/dye_blowing/garnished/light_gray/mastic_bucket_from_mastic_bucket_tag.json b/src/main/resources/data/garnished/recipes/dye_blowing/garnished/light_gray/mastic_bucket_from_mastic_bucket_tag.json index 21814bdb..91ceba36 100644 --- a/src/main/resources/data/garnished/recipes/dye_blowing/garnished/light_gray/mastic_bucket_from_mastic_bucket_tag.json +++ b/src/main/resources/data/garnished/recipes/dye_blowing/garnished/light_gray/mastic_bucket_from_mastic_bucket_tag.json @@ -2,7 +2,7 @@ "type": "garnished:light_gray_dye_blowing", "ingredients": [ { - "tag": "forge:buckets/mastic_resin" + "tag": "c:buckets/mastic_resin" } ], "results": [ @@ -11,4 +11,4 @@ "count": 1 } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/garnished/recipes/dye_blowing/garnished/lime/mastic_bucket_from_mastic_bucket_tag.json b/src/main/resources/data/garnished/recipes/dye_blowing/garnished/lime/mastic_bucket_from_mastic_bucket_tag.json index e4770c17..c3ba246d 100644 --- a/src/main/resources/data/garnished/recipes/dye_blowing/garnished/lime/mastic_bucket_from_mastic_bucket_tag.json +++ b/src/main/resources/data/garnished/recipes/dye_blowing/garnished/lime/mastic_bucket_from_mastic_bucket_tag.json @@ -2,7 +2,7 @@ "type": "garnished:lime_dye_blowing", "ingredients": [ { - "tag": "forge:buckets/mastic_resin" + "tag": "c:buckets/mastic_resin" } ], "results": [ @@ -11,4 +11,4 @@ "count": 1 } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/garnished/recipes/dye_blowing/garnished/magenta/mastic_bucket_from_mastic_bucket_tag.json b/src/main/resources/data/garnished/recipes/dye_blowing/garnished/magenta/mastic_bucket_from_mastic_bucket_tag.json index d2599691..fba5c11e 100644 --- a/src/main/resources/data/garnished/recipes/dye_blowing/garnished/magenta/mastic_bucket_from_mastic_bucket_tag.json +++ b/src/main/resources/data/garnished/recipes/dye_blowing/garnished/magenta/mastic_bucket_from_mastic_bucket_tag.json @@ -2,7 +2,7 @@ "type": "garnished:magenta_dye_blowing", "ingredients": [ { - "tag": "forge:buckets/mastic_resin" + "tag": "c:buckets/mastic_resin" } ], "results": [ @@ -11,4 +11,4 @@ "count": 1 } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/garnished/recipes/dye_blowing/garnished/orange/mastic_bucket_from_mastic_bucket_tag.json b/src/main/resources/data/garnished/recipes/dye_blowing/garnished/orange/mastic_bucket_from_mastic_bucket_tag.json index f79ac0c4..b977eff6 100644 --- a/src/main/resources/data/garnished/recipes/dye_blowing/garnished/orange/mastic_bucket_from_mastic_bucket_tag.json +++ b/src/main/resources/data/garnished/recipes/dye_blowing/garnished/orange/mastic_bucket_from_mastic_bucket_tag.json @@ -2,7 +2,7 @@ "type": "garnished:orange_dye_blowing", "ingredients": [ { - "tag": "forge:buckets/mastic_resin" + "tag": "c:buckets/mastic_resin" } ], "results": [ @@ -11,4 +11,4 @@ "count": 1 } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/garnished/recipes/dye_blowing/garnished/pink/mastic_bucket_from_mastic_bucket_tag.json b/src/main/resources/data/garnished/recipes/dye_blowing/garnished/pink/mastic_bucket_from_mastic_bucket_tag.json index fb7f9399..6853f2d4 100644 --- a/src/main/resources/data/garnished/recipes/dye_blowing/garnished/pink/mastic_bucket_from_mastic_bucket_tag.json +++ b/src/main/resources/data/garnished/recipes/dye_blowing/garnished/pink/mastic_bucket_from_mastic_bucket_tag.json @@ -2,7 +2,7 @@ "type": "garnished:pink_dye_blowing", "ingredients": [ { - "tag": "forge:buckets/mastic_resin" + "tag": "c:buckets/mastic_resin" } ], "results": [ @@ -11,4 +11,4 @@ "count": 1 } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/garnished/recipes/dye_blowing/garnished/purple/mastic_bucket_from_mastic_bucket_tag.json b/src/main/resources/data/garnished/recipes/dye_blowing/garnished/purple/mastic_bucket_from_mastic_bucket_tag.json index e8ab35ad..ed8ccb24 100644 --- a/src/main/resources/data/garnished/recipes/dye_blowing/garnished/purple/mastic_bucket_from_mastic_bucket_tag.json +++ b/src/main/resources/data/garnished/recipes/dye_blowing/garnished/purple/mastic_bucket_from_mastic_bucket_tag.json @@ -2,7 +2,7 @@ "type": "garnished:purple_dye_blowing", "ingredients": [ { - "tag": "forge:buckets/mastic_resin" + "tag": "c:buckets/mastic_resin" } ], "results": [ @@ -11,4 +11,4 @@ "count": 1 } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/garnished/recipes/dye_blowing/garnished/red/mastic_bucket_from_mastic_bucket_tag.json b/src/main/resources/data/garnished/recipes/dye_blowing/garnished/red/mastic_bucket_from_mastic_bucket_tag.json index 5d943b10..113dc292 100644 --- a/src/main/resources/data/garnished/recipes/dye_blowing/garnished/red/mastic_bucket_from_mastic_bucket_tag.json +++ b/src/main/resources/data/garnished/recipes/dye_blowing/garnished/red/mastic_bucket_from_mastic_bucket_tag.json @@ -2,7 +2,7 @@ "type": "garnished:red_dye_blowing", "ingredients": [ { - "tag": "forge:buckets/mastic_resin" + "tag": "c:buckets/mastic_resin" } ], "results": [ @@ -11,4 +11,4 @@ "count": 1 } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/garnished/recipes/dye_blowing/garnished/white/mastic_bucket_from_mastic_bucket_tag.json b/src/main/resources/data/garnished/recipes/dye_blowing/garnished/white/mastic_bucket_from_mastic_bucket_tag.json index 2a0dc733..06c37e8a 100644 --- a/src/main/resources/data/garnished/recipes/dye_blowing/garnished/white/mastic_bucket_from_mastic_bucket_tag.json +++ b/src/main/resources/data/garnished/recipes/dye_blowing/garnished/white/mastic_bucket_from_mastic_bucket_tag.json @@ -2,7 +2,7 @@ "type": "garnished:white_dye_blowing", "ingredients": [ { - "tag": "forge:buckets/mastic_resin" + "tag": "c:buckets/mastic_resin" } ], "results": [ @@ -11,4 +11,4 @@ "count": 1 } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/garnished/recipes/dye_blowing/garnished/yellow/mastic_bucket_from_mastic_bucket_tag.json b/src/main/resources/data/garnished/recipes/dye_blowing/garnished/yellow/mastic_bucket_from_mastic_bucket_tag.json index 2935bcf9..020fad07 100644 --- a/src/main/resources/data/garnished/recipes/dye_blowing/garnished/yellow/mastic_bucket_from_mastic_bucket_tag.json +++ b/src/main/resources/data/garnished/recipes/dye_blowing/garnished/yellow/mastic_bucket_from_mastic_bucket_tag.json @@ -2,7 +2,7 @@ "type": "garnished:yellow_dye_blowing", "ingredients": [ { - "tag": "forge:buckets/mastic_resin" + "tag": "c:buckets/mastic_resin" } ], "results": [ @@ -11,4 +11,4 @@ "count": 1 } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/black/stained_glass.json b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/black/stained_glass.json index 974a78c7..190ad654 100644 --- a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/black/stained_glass.json +++ b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/black/stained_glass.json @@ -3,7 +3,7 @@ "ingredients": [ [ { - "tag": "forge:stained_glass" + "tag": "c:stained_glass" }, { "item": "minecraft:glass" @@ -16,4 +16,4 @@ "count": 1 } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/black/stained_glass_pane.json b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/black/stained_glass_pane.json index 2a14d355..a2c42bcf 100644 --- a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/black/stained_glass_pane.json +++ b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/black/stained_glass_pane.json @@ -3,7 +3,7 @@ "ingredients": [ [ { - "tag": "forge:stained_glass_panes" + "tag": "c:stained_glass_panes" }, { "item": "minecraft:glass_pane" @@ -16,4 +16,4 @@ "count": 1 } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/blue/stained_glass.json b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/blue/stained_glass.json index 52b795fc..e80b4436 100644 --- a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/blue/stained_glass.json +++ b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/blue/stained_glass.json @@ -3,7 +3,7 @@ "ingredients": [ [ { - "tag": "forge:stained_glass" + "tag": "c:stained_glass" }, { "item": "minecraft:glass" @@ -16,4 +16,4 @@ "count": 1 } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/blue/stained_glass_pane.json b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/blue/stained_glass_pane.json index 523b4a25..4f010ea1 100644 --- a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/blue/stained_glass_pane.json +++ b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/blue/stained_glass_pane.json @@ -3,7 +3,7 @@ "ingredients": [ [ { - "tag": "forge:stained_glass_panes" + "tag": "c:stained_glass_panes" }, { "item": "minecraft:glass_pane" @@ -16,4 +16,4 @@ "count": 1 } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/brown/stained_glass.json b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/brown/stained_glass.json index 0e1a70d0..15a50b7a 100644 --- a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/brown/stained_glass.json +++ b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/brown/stained_glass.json @@ -3,7 +3,7 @@ "ingredients": [ [ { - "tag": "forge:stained_glass" + "tag": "c:stained_glass" }, { "item": "minecraft:glass" @@ -16,4 +16,4 @@ "count": 1 } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/brown/stained_glass_pane.json b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/brown/stained_glass_pane.json index 6963be53..ba21bf4e 100644 --- a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/brown/stained_glass_pane.json +++ b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/brown/stained_glass_pane.json @@ -3,7 +3,7 @@ "ingredients": [ [ { - "tag": "forge:stained_glass_panes" + "tag": "c:stained_glass_panes" }, { "item": "minecraft:glass_pane" @@ -16,4 +16,4 @@ "count": 1 } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/cyan/stained_glass.json b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/cyan/stained_glass.json index 7429f485..8881846e 100644 --- a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/cyan/stained_glass.json +++ b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/cyan/stained_glass.json @@ -3,7 +3,7 @@ "ingredients": [ [ { - "tag": "forge:stained_glass" + "tag": "c:stained_glass" }, { "item": "minecraft:glass" @@ -16,4 +16,4 @@ "count": 1 } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/cyan/stained_glass_pane.json b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/cyan/stained_glass_pane.json index 2db0f5cc..9dcf6eba 100644 --- a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/cyan/stained_glass_pane.json +++ b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/cyan/stained_glass_pane.json @@ -3,7 +3,7 @@ "ingredients": [ [ { - "tag": "forge:stained_glass_panes" + "tag": "c:stained_glass_panes" }, { "item": "minecraft:glass_pane" @@ -16,4 +16,4 @@ "count": 1 } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/gray/stained_glass.json b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/gray/stained_glass.json index 464a190a..e0dc76c5 100644 --- a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/gray/stained_glass.json +++ b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/gray/stained_glass.json @@ -3,7 +3,7 @@ "ingredients": [ [ { - "tag": "forge:stained_glass" + "tag": "c:stained_glass" }, { "item": "minecraft:glass" @@ -16,4 +16,4 @@ "count": 1 } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/gray/stained_glass_pane.json b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/gray/stained_glass_pane.json index 3e03d793..16d61e45 100644 --- a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/gray/stained_glass_pane.json +++ b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/gray/stained_glass_pane.json @@ -3,7 +3,7 @@ "ingredients": [ [ { - "tag": "forge:stained_glass_panes" + "tag": "c:stained_glass_panes" }, { "item": "minecraft:glass_pane" @@ -16,4 +16,4 @@ "count": 1 } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/green/slime_ball.json b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/green/slime_ball.json index 4fb7b58f..7a577327 100644 --- a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/green/slime_ball.json +++ b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/green/slime_ball.json @@ -2,7 +2,7 @@ "type": "garnished:green_dye_blowing", "ingredients": [ { - "tag": "forge:dough" + "tag": "c:dough" } ], "results": [ @@ -11,4 +11,4 @@ "count": 1 } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/green/stained_glass.json b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/green/stained_glass.json index 62478e10..d619975b 100644 --- a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/green/stained_glass.json +++ b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/green/stained_glass.json @@ -3,7 +3,7 @@ "ingredients": [ [ { - "tag": "forge:stained_glass" + "tag": "c:stained_glass" }, { "item": "minecraft:glass" @@ -16,4 +16,4 @@ "count": 1 } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/green/stained_glass_pane.json b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/green/stained_glass_pane.json index 1f08cf76..a3d60988 100644 --- a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/green/stained_glass_pane.json +++ b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/green/stained_glass_pane.json @@ -3,7 +3,7 @@ "ingredients": [ [ { - "tag": "forge:stained_glass_panes" + "tag": "c:stained_glass_panes" }, { "item": "minecraft:glass_pane" @@ -16,4 +16,4 @@ "count": 1 } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/light_blue/stained_glass.json b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/light_blue/stained_glass.json index 18c26516..13d34637 100644 --- a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/light_blue/stained_glass.json +++ b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/light_blue/stained_glass.json @@ -3,7 +3,7 @@ "ingredients": [ [ { - "tag": "forge:stained_glass" + "tag": "c:stained_glass" }, { "item": "minecraft:glass" @@ -16,4 +16,4 @@ "count": 1 } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/light_blue/stained_glass_pane.json b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/light_blue/stained_glass_pane.json index 6c4fbd29..c08a8174 100644 --- a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/light_blue/stained_glass_pane.json +++ b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/light_blue/stained_glass_pane.json @@ -3,7 +3,7 @@ "ingredients": [ [ { - "tag": "forge:stained_glass_panes" + "tag": "c:stained_glass_panes" }, { "item": "minecraft:glass_pane" @@ -16,4 +16,4 @@ "count": 1 } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/light_gray/stained_glass.json b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/light_gray/stained_glass.json index c861dfa2..a06f1e9d 100644 --- a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/light_gray/stained_glass.json +++ b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/light_gray/stained_glass.json @@ -3,7 +3,7 @@ "ingredients": [ [ { - "tag": "forge:stained_glass" + "tag": "c:stained_glass" }, { "item": "minecraft:glass" @@ -16,4 +16,4 @@ "count": 1 } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/light_gray/stained_glass_pane.json b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/light_gray/stained_glass_pane.json index 28f9c9d7..3ed3952e 100644 --- a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/light_gray/stained_glass_pane.json +++ b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/light_gray/stained_glass_pane.json @@ -3,7 +3,7 @@ "ingredients": [ [ { - "tag": "forge:stained_glass_panes" + "tag": "c:stained_glass_panes" }, { "item": "minecraft:glass_pane" @@ -16,4 +16,4 @@ "count": 1 } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/lime/stained_glass.json b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/lime/stained_glass.json index b6ab10d5..fb84adb7 100644 --- a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/lime/stained_glass.json +++ b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/lime/stained_glass.json @@ -3,7 +3,7 @@ "ingredients": [ [ { - "tag": "forge:stained_glass" + "tag": "c:stained_glass" }, { "item": "minecraft:glass" @@ -16,4 +16,4 @@ "count": 1 } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/lime/stained_glass_pane.json b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/lime/stained_glass_pane.json index 1903e67f..de222f44 100644 --- a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/lime/stained_glass_pane.json +++ b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/lime/stained_glass_pane.json @@ -3,7 +3,7 @@ "ingredients": [ [ { - "tag": "forge:stained_glass_panes" + "tag": "c:stained_glass_panes" }, { "item": "minecraft:glass_pane" @@ -16,4 +16,4 @@ "count": 1 } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/magenta/stained_glass.json b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/magenta/stained_glass.json index 1c4ada68..b3a8af4e 100644 --- a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/magenta/stained_glass.json +++ b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/magenta/stained_glass.json @@ -3,7 +3,7 @@ "ingredients": [ [ { - "tag": "forge:stained_glass" + "tag": "c:stained_glass" }, { "item": "minecraft:glass" @@ -16,4 +16,4 @@ "count": 1 } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/magenta/stained_glass_pane.json b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/magenta/stained_glass_pane.json index 150bd780..1935c348 100644 --- a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/magenta/stained_glass_pane.json +++ b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/magenta/stained_glass_pane.json @@ -3,7 +3,7 @@ "ingredients": [ [ { - "tag": "forge:stained_glass_panes" + "tag": "c:stained_glass_panes" }, { "item": "minecraft:glass_pane" @@ -16,4 +16,4 @@ "count": 1 } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/orange/stained_glass.json b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/orange/stained_glass.json index 818c06f8..f2296ea8 100644 --- a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/orange/stained_glass.json +++ b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/orange/stained_glass.json @@ -3,7 +3,7 @@ "ingredients": [ [ { - "tag": "forge:stained_glass" + "tag": "c:stained_glass" }, { "item": "minecraft:glass" @@ -16,4 +16,4 @@ "count": 1 } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/orange/stained_glass_pane.json b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/orange/stained_glass_pane.json index 1eb06622..e4f7744c 100644 --- a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/orange/stained_glass_pane.json +++ b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/orange/stained_glass_pane.json @@ -3,7 +3,7 @@ "ingredients": [ [ { - "tag": "forge:stained_glass_panes" + "tag": "c:stained_glass_panes" }, { "item": "minecraft:glass_pane" @@ -16,4 +16,4 @@ "count": 1 } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/pink/stained_glass.json b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/pink/stained_glass.json index 26a48f50..1314caa8 100644 --- a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/pink/stained_glass.json +++ b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/pink/stained_glass.json @@ -3,7 +3,7 @@ "ingredients": [ [ { - "tag": "forge:stained_glass" + "tag": "c:stained_glass" }, { "item": "minecraft:glass" @@ -16,4 +16,4 @@ "count": 1 } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/pink/stained_glass_pane.json b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/pink/stained_glass_pane.json index 7ff8371d..96299983 100644 --- a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/pink/stained_glass_pane.json +++ b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/pink/stained_glass_pane.json @@ -3,7 +3,7 @@ "ingredients": [ [ { - "tag": "forge:stained_glass_panes" + "tag": "c:stained_glass_panes" }, { "item": "minecraft:glass_pane" @@ -16,4 +16,4 @@ "count": 1 } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/purple/stained_glass.json b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/purple/stained_glass.json index 719eafc5..f31cb85d 100644 --- a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/purple/stained_glass.json +++ b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/purple/stained_glass.json @@ -3,7 +3,7 @@ "ingredients": [ [ { - "tag": "forge:stained_glass" + "tag": "c:stained_glass" }, { "item": "minecraft:glass" @@ -16,4 +16,4 @@ "count": 1 } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/purple/stained_glass_pane.json b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/purple/stained_glass_pane.json index 9e16cab6..f94f3701 100644 --- a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/purple/stained_glass_pane.json +++ b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/purple/stained_glass_pane.json @@ -3,7 +3,7 @@ "ingredients": [ [ { - "tag": "forge:stained_glass_panes" + "tag": "c:stained_glass_panes" }, { "item": "minecraft:glass_pane" @@ -16,4 +16,4 @@ "count": 1 } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/red/stained_glass.json b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/red/stained_glass.json index 01585998..eff4e1f5 100644 --- a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/red/stained_glass.json +++ b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/red/stained_glass.json @@ -3,7 +3,7 @@ "ingredients": [ [ { - "tag": "forge:stained_glass" + "tag": "c:stained_glass" }, { "item": "minecraft:glass" @@ -16,4 +16,4 @@ "count": 1 } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/red/stained_glass_pane.json b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/red/stained_glass_pane.json index 41ab1953..dc382bfe 100644 --- a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/red/stained_glass_pane.json +++ b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/red/stained_glass_pane.json @@ -3,7 +3,7 @@ "ingredients": [ [ { - "tag": "forge:stained_glass_panes" + "tag": "c:stained_glass_panes" }, { "item": "minecraft:glass_pane" @@ -16,4 +16,4 @@ "count": 1 } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/white/stained_glass.json b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/white/stained_glass.json index 9ad0f276..6c2b6f24 100644 --- a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/white/stained_glass.json +++ b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/white/stained_glass.json @@ -3,7 +3,7 @@ "ingredients": [ [ { - "tag": "forge:stained_glass" + "tag": "c:stained_glass" }, { "item": "minecraft:glass" @@ -16,4 +16,4 @@ "count": 1 } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/white/stained_glass_pane.json b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/white/stained_glass_pane.json index fc6b423a..da3a0a79 100644 --- a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/white/stained_glass_pane.json +++ b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/white/stained_glass_pane.json @@ -3,7 +3,7 @@ "ingredients": [ [ { - "tag": "forge:stained_glass_panes" + "tag": "c:stained_glass_panes" }, { "item": "minecraft:glass_pane" @@ -16,4 +16,4 @@ "count": 1 } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/yellow/stained_glass.json b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/yellow/stained_glass.json index 8c141298..51bfffc2 100644 --- a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/yellow/stained_glass.json +++ b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/yellow/stained_glass.json @@ -3,7 +3,7 @@ "ingredients": [ [ { - "tag": "forge:stained_glass" + "tag": "c:stained_glass" }, { "item": "minecraft:glass" @@ -16,4 +16,4 @@ "count": 1 } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/yellow/stained_glass_pane.json b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/yellow/stained_glass_pane.json index fbba28d2..d77d7cc8 100644 --- a/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/yellow/stained_glass_pane.json +++ b/src/main/resources/data/garnished/recipes/dye_blowing/minecraft/yellow/stained_glass_pane.json @@ -3,7 +3,7 @@ "ingredients": [ [ { - "tag": "forge:stained_glass_panes" + "tag": "c:stained_glass_panes" }, { "item": "minecraft:glass_pane" @@ -16,4 +16,4 @@ "count": 1 } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/garnished/recipes/integration/cooking/bewildered_pastry.json b/src/main/resources/data/garnished/recipes/integration/cooking/bewildered_pastry.json new file mode 100644 index 00000000..c22ade5e --- /dev/null +++ b/src/main/resources/data/garnished/recipes/integration/cooking/bewildered_pastry.json @@ -0,0 +1,31 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "farmersdelight" + ] + } + ], + "type": "farmersdelight:cooking", + "container": { + "item": "garnished:coral_wrapping" + }, + "cookingtime": 200, + "experience": 1.0, + "ingredients": [ + { + "item": "garnished:murky_jelly" + }, + { + "item": "garnished:murky_jelly" + }, + { + "item": "garnished:dulse_kelp" + } + ], + "recipe_book_tab": "meals", + "result": { + "item": "garnished:bewildered_pastry" + } +} diff --git a/src/main/resources/data/garnished/recipes/integration/cooking/blazing_delight.json b/src/main/resources/data/garnished/recipes/integration/cooking/blazing_delight.json new file mode 100644 index 00000000..e313f9bb --- /dev/null +++ b/src/main/resources/data/garnished/recipes/integration/cooking/blazing_delight.json @@ -0,0 +1,37 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "farmersdelight" + ] + } + ], + "type": "farmersdelight:cooking", + "container": { + "tag": "garnished:crimson_tusks" + }, + "cookingtime": 200, + "experience": 1.0, + "ingredients": [ + { + "item": "garnished:enflamed_mandible" + }, + { + "tag": "c:ender_dusts" + }, + { + "item": "garnished:crushed_shroomlight" + }, + { + "item": "garnished:malodorous_mixture" + }, + { + "item": "garnished:torrid_blend" + } + ], + "recipe_book_tab": "meals", + "result": { + "item": "garnished:blazing_delight" + } +} diff --git a/src/main/resources/data/garnished/recipes/integration/cooking/bottled_ender_jelly.json b/src/main/resources/data/garnished/recipes/integration/cooking/bottled_ender_jelly.json new file mode 100644 index 00000000..2938f276 --- /dev/null +++ b/src/main/resources/data/garnished/recipes/integration/cooking/bottled_ender_jelly.json @@ -0,0 +1,28 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "farmersdelight" + ] + } + ], + "type": "farmersdelight:cooking", + "container": { + "item": "minecraft:glass_bottle" + }, + "cookingtime": 200, + "experience": 1.0, + "ingredients": [ + { + "item": "garnished:ender_jelly" + }, + { + "item": "garnished:ender_jelly" + } + ], + "recipe_book_tab": "drinks", + "result": { + "item": "garnished:ender_jelly_bottle" + } +} diff --git a/src/main/resources/data/garnished/recipes/integration/cooking/chorus_bowl.json b/src/main/resources/data/garnished/recipes/integration/cooking/chorus_bowl.json new file mode 100644 index 00000000..4fc3af31 --- /dev/null +++ b/src/main/resources/data/garnished/recipes/integration/cooking/chorus_bowl.json @@ -0,0 +1,40 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "farmersdelight" + ] + } + ], + "type": "farmersdelight:cooking", + "container": { + "item": "garnished:hollowed_chorus_fruit" + }, + "cookingtime": 200, + "experience": 1.0, + "ingredients": [ + { + "item": "garnished:chorus_tuft" + }, + { + "item": "garnished:dimmed_scale" + }, + { + "item": "garnished:void_dust" + }, + { + "item": "garnished:void_dust" + }, + { + "item": "garnished:nut_flour" + }, + { + "item": "garnished:soul_roots" + } + ], + "recipe_book_tab": "meals", + "result": { + "item": "garnished:chorus_bowl" + } +} diff --git a/src/main/resources/data/garnished/recipes/integration/cooking/chorus_cocktail.json b/src/main/resources/data/garnished/recipes/integration/cooking/chorus_cocktail.json new file mode 100644 index 00000000..a384a864 --- /dev/null +++ b/src/main/resources/data/garnished/recipes/integration/cooking/chorus_cocktail.json @@ -0,0 +1,31 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "farmersdelight" + ] + } + ], + "type": "farmersdelight:cooking", + "container": { + "item": "minecraft:glass_bottle" + }, + "cookingtime": 200, + "experience": 1.0, + "ingredients": [ + { + "item": "minecraft:chorus_fruit" + }, + { + "item": "minecraft:chorus_fruit" + }, + { + "item": "garnished:ender_jelly" + } + ], + "recipe_book_tab": "drinks", + "result": { + "item": "garnished:chorus_cocktail" + } +} diff --git a/src/main/resources/data/garnished/recipes/integration/cooking/cosmic_brew.json b/src/main/resources/data/garnished/recipes/integration/cooking/cosmic_brew.json new file mode 100644 index 00000000..91310fa2 --- /dev/null +++ b/src/main/resources/data/garnished/recipes/integration/cooking/cosmic_brew.json @@ -0,0 +1,34 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "farmersdelight" + ] + } + ], + "type": "farmersdelight:cooking", + "container": { + "item": "minecraft:bowl" + }, + "cookingtime": 200, + "experience": 1.0, + "ingredients": [ + { + "item": "garnished:cosmic_powder" + }, + { + "item": "garnished:cosmic_powder" + }, + { + "item": "garnished:chorus_tuft" + }, + { + "item": "garnished:chorus_tuft" + } + ], + "recipe_book_tab": "meals", + "result": { + "item": "garnished:cosmic_brew" + } +} diff --git a/src/main/resources/data/garnished/recipes/integration/cooking/crimson_tangle.json b/src/main/resources/data/garnished/recipes/integration/cooking/crimson_tangle.json new file mode 100644 index 00000000..1884bac1 --- /dev/null +++ b/src/main/resources/data/garnished/recipes/integration/cooking/crimson_tangle.json @@ -0,0 +1,31 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "farmersdelight" + ] + } + ], + "type": "farmersdelight:cooking", + "container": { + "item": "garnished:hardened_wrap" + }, + "cookingtime": 200, + "experience": 1.0, + "ingredients": [ + { + "item": "garnished:crushed_crimson_fungus" + }, + { + "item": "garnished:incandescent_petal" + }, + { + "item": "garnished:almond_cheese" + } + ], + "recipe_book_tab": "meals", + "result": { + "item": "garnished:wrapped_crimson_tangle" + } +} diff --git a/src/main/resources/data/garnished/recipes/integration/cooking/desolate_stew.json b/src/main/resources/data/garnished/recipes/integration/cooking/desolate_stew.json new file mode 100644 index 00000000..b43df5ff --- /dev/null +++ b/src/main/resources/data/garnished/recipes/integration/cooking/desolate_stew.json @@ -0,0 +1,34 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "farmersdelight" + ] + } + ], + "type": "farmersdelight:cooking", + "container": { + "item": "minecraft:bowl" + }, + "cookingtime": 200, + "experience": 1.0, + "ingredients": [ + { + "item": "garnished:chorus_tuft" + }, + { + "item": "garnished:ender_jelly" + }, + { + "item": "garnished:void_dust" + }, + { + "item": "garnished:void_dust" + } + ], + "recipe_book_tab": "meals", + "result": { + "item": "garnished:desolate_stew" + } +} diff --git a/src/main/resources/data/garnished/recipes/integration/cooking/ethereal_concoction.json b/src/main/resources/data/garnished/recipes/integration/cooking/ethereal_concoction.json new file mode 100644 index 00000000..f3fedcca --- /dev/null +++ b/src/main/resources/data/garnished/recipes/integration/cooking/ethereal_concoction.json @@ -0,0 +1,31 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "farmersdelight" + ] + } + ], + "type": "farmersdelight:cooking", + "container": { + "item": "minecraft:bowl" + }, + "cookingtime": 200, + "experience": 1.0, + "ingredients": [ + { + "item": "garnished:chorus_tuft" + }, + { + "item": "garnished:ender_jelly" + }, + { + "item": "garnished:ethereal_compound" + } + ], + "recipe_book_tab": "meals", + "result": { + "item": "garnished:ethereal_concoction" + } +} diff --git a/src/main/resources/data/garnished/recipes/integration/cooking/explorers_concoction.json b/src/main/resources/data/garnished/recipes/integration/cooking/explorers_concoction.json new file mode 100644 index 00000000..8a4986fb --- /dev/null +++ b/src/main/resources/data/garnished/recipes/integration/cooking/explorers_concoction.json @@ -0,0 +1,34 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "farmersdelight" + ] + } + ], + "type": "farmersdelight:cooking", + "container": { + "item": "minecraft:bowl" + }, + "cookingtime": 200, + "experience": 1.0, + "ingredients": [ + { + "item": "garnished:torrid_blend" + }, + { + "item": "garnished:cosmic_powder" + }, + { + "item": "garnished:ender_jelly" + }, + { + "item": "garnished:mastic_paste_green" + } + ], + "recipe_book_tab": "meals", + "result": { + "item": "garnished:explorers_concoction" + } +} diff --git a/src/main/resources/data/garnished/recipes/integration/cooking/farseer_brew.json b/src/main/resources/data/garnished/recipes/integration/cooking/farseer_brew.json new file mode 100644 index 00000000..8fcad0c3 --- /dev/null +++ b/src/main/resources/data/garnished/recipes/integration/cooking/farseer_brew.json @@ -0,0 +1,34 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "farmersdelight" + ] + } + ], + "type": "farmersdelight:cooking", + "container": { + "item": "minecraft:bowl" + }, + "cookingtime": 200, + "experience": 1.0, + "ingredients": [ + { + "item": "minecraft:dragon_breath" + }, + { + "item": "garnished:preliminary_nucleus" + }, + { + "item": "garnished:aureate_shrub" + }, + { + "item": "garnished:vex_wing" + } + ], + "recipe_book_tab": "meals", + "result": { + "item": "garnished:farseer_brew" + } +} diff --git a/src/main/resources/data/garnished/recipes/integration/cooking/fishy_surprise.json b/src/main/resources/data/garnished/recipes/integration/cooking/fishy_surprise.json new file mode 100644 index 00000000..b0d45658 --- /dev/null +++ b/src/main/resources/data/garnished/recipes/integration/cooking/fishy_surprise.json @@ -0,0 +1,34 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "farmersdelight" + ] + } + ], + "type": "farmersdelight:cooking", + "container": { + "item": "minecraft:bowl" + }, + "cookingtime": 200, + "experience": 1.0, + "ingredients": [ + { + "item": "minecraft:cooked_salmon" + }, + { + "item": "minecraft:cooked_cod" + }, + { + "item": "minecraft:tropical_fish" + }, + { + "item": "minecraft:pufferfish" + } + ], + "recipe_book_tab": "meals", + "result": { + "item": "garnished:fishy_surprise" + } +} diff --git a/src/main/resources/data/garnished/recipes/integration/cooking/frosted_dessert.json b/src/main/resources/data/garnished/recipes/integration/cooking/frosted_dessert.json new file mode 100644 index 00000000..37f5b07d --- /dev/null +++ b/src/main/resources/data/garnished/recipes/integration/cooking/frosted_dessert.json @@ -0,0 +1,34 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "farmersdelight" + ] + } + ], + "type": "farmersdelight:cooking", + "container": { + "item": "minecraft:bowl" + }, + "cookingtime": 200, + "experience": 1.0, + "ingredients": [ + { + "item": "garnished:frost" + }, + { + "item": "garnished:solemn_dust" + }, + { + "item": "garnished:crushed_shroomlight" + }, + { + "item": "garnished:cashew_sorbet_scoop" + } + ], + "recipe_book_tab": "meals", + "result": { + "item": "garnished:frosted_dessert" + } +} diff --git a/src/main/resources/data/garnished/recipes/integration/cooking/galvanic_haunting.json b/src/main/resources/data/garnished/recipes/integration/cooking/galvanic_haunting.json new file mode 100644 index 00000000..6ba9c285 --- /dev/null +++ b/src/main/resources/data/garnished/recipes/integration/cooking/galvanic_haunting.json @@ -0,0 +1,40 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "farmersdelight" + ] + } + ], + "type": "farmersdelight:cooking", + "container": { + "item": "minecraft:bowl" + }, + "cookingtime": 200, + "experience": 1.0, + "ingredients": [ + { + "item": "garnished:voltaic_sea_grass" + }, + { + "item": "garnished:voltaic_sea_grass" + }, + { + "item": "garnished:voltaic_sea_grass" + }, + { + "item": "garnished:tube_coral_fan" + }, + { + "item": "garnished:tube_coral_fan" + }, + { + "item": "minecraft:lustrous_pearl" + } + ], + "recipe_book_tab": "meals", + "result": { + "item": "garnished:galvanic_haunting" + } +} diff --git a/src/main/resources/data/garnished/recipes/integration/cooking/ghandercken.json b/src/main/resources/data/garnished/recipes/integration/cooking/ghandercken.json new file mode 100644 index 00000000..185218b3 --- /dev/null +++ b/src/main/resources/data/garnished/recipes/integration/cooking/ghandercken.json @@ -0,0 +1,34 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "farmersdelight" + ] + } + ], + "type": "farmersdelight:cooking", + "container": { + "item": "minecraft:bowl" + }, + "cookingtime": 200, + "experience": 1.0, + "ingredients": [ + { + "tag": "c:ender_dusts" + }, + { + "item": "garnished:ghast_tendril" + }, + { + "item": "garnished:torrid_blend" + }, + { + "item": "minecraft:cooked_chicken" + } + ], + "recipe_book_tab": "meals", + "result": { + "item": "garnished:ghandercken" + } +} diff --git a/src/main/resources/data/garnished/recipes/integration/cooking/gloomy_gathering.json b/src/main/resources/data/garnished/recipes/integration/cooking/gloomy_gathering.json new file mode 100644 index 00000000..e02ea1a1 --- /dev/null +++ b/src/main/resources/data/garnished/recipes/integration/cooking/gloomy_gathering.json @@ -0,0 +1,37 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "farmersdelight" + ] + } + ], + "type": "farmersdelight:cooking", + "container": { + "item": "minecraft:bowl" + }, + "cookingtime": 200, + "experience": 1.0, + "ingredients": [ + { + "item": "garnished:cooked_tenebrous_meat" + }, + { + "item": "garnished:cooked_tenebrous_meat" + }, + { + "item": "garnished:crushed_shroomlight" + }, + { + "item": "garnished:crushed_shroomlight" + }, + { + "item": "minecraft:amethyst_shard" + } + ], + "recipe_book_tab": "meals", + "result": { + "item": "garnished:gloomy_gathering" + } +} diff --git a/src/main/resources/data/garnished/recipes/integration/cooking/illuminating_cocktail.json b/src/main/resources/data/garnished/recipes/integration/cooking/illuminating_cocktail.json new file mode 100644 index 00000000..1327b282 --- /dev/null +++ b/src/main/resources/data/garnished/recipes/integration/cooking/illuminating_cocktail.json @@ -0,0 +1,34 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "farmersdelight" + ] + } + ], + "type": "farmersdelight:cooking", + "container": { + "item": "minecraft:glass_bottle" + }, + "cookingtime": 200, + "experience": 1.0, + "ingredients": [ + { + "item": "minecraft:glow_berries" + }, + { + "item": "minecraft:glowstone_dust" + }, + { + "item": "minecraft:glow_ink_sac" + }, + { + "item": "minecraft:glow_ink_sac" + } + ], + "recipe_book_tab": "drinks", + "result": { + "item": "garnished:grim_stew" + } +} diff --git a/src/main/resources/data/garnished/recipes/integration/cooking/incendiary_stew.json b/src/main/resources/data/garnished/recipes/integration/cooking/incendiary_stew.json new file mode 100644 index 00000000..bdfd5700 --- /dev/null +++ b/src/main/resources/data/garnished/recipes/integration/cooking/incendiary_stew.json @@ -0,0 +1,37 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "farmersdelight" + ] + } + ], + "type": "farmersdelight:cooking", + "container": { + "item": "minecraft:bowl" + }, + "cookingtime": 200, + "experience": 1.0, + "ingredients": [ + { + "item": "minecraft:ink_sac" + }, + { + "item": "minecraft:ink_sac" + }, + { + "item": "minecraft:tnt" + }, + { + "item": "garnished:voltaic_sea_grass" + }, + { + "item": "garnished:voltaic_sea_grass" + } + ], + "recipe_book_tab": "meals", + "result": { + "item": "garnished:incendiary_stew" + } +} diff --git a/src/main/resources/data/garnished/recipes/integration/cooking/iniquitous_brew.json b/src/main/resources/data/garnished/recipes/integration/cooking/iniquitous_brew.json new file mode 100644 index 00000000..48410f61 --- /dev/null +++ b/src/main/resources/data/garnished/recipes/integration/cooking/iniquitous_brew.json @@ -0,0 +1,37 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "farmersdelight" + ] + } + ], + "type": "farmersdelight:cooking", + "container": { + "item": "minecraft:bowl" + }, + "cookingtime": 200, + "experience": 1.0, + "ingredients": [ + { + "item": "garnished:incandescent_petal" + }, + { + "item": "garnished:incandescent_lily" + }, + { + "item": "garnished:incandescent_lily" + }, + { + "item": "minecraft:crimson_roots" + }, + { + "item": "minecraft:crimson_roots" + } + ], + "recipe_book_tab": "meals", + "result": { + "item": "garnished:iniquitous_brew" + } +} diff --git a/src/main/resources/data/garnished/recipes/integration/cooking/molten_stew.json b/src/main/resources/data/garnished/recipes/integration/cooking/molten_stew.json new file mode 100644 index 00000000..3b78f93b --- /dev/null +++ b/src/main/resources/data/garnished/recipes/integration/cooking/molten_stew.json @@ -0,0 +1,37 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "farmersdelight" + ] + } + ], + "type": "farmersdelight:cooking", + "container": { + "item": "minecraft:bowl" + }, + "cookingtime": 200, + "experience": 1.0, + "ingredients": [ + { + "item": "garnished:torrid_blend" + }, + { + "item": "garnished:molten_remnant" + }, + { + "item": "minecraft:magma_cream" + }, + { + "item": "minecraft:magma_cream" + }, + { + "item": "minecraft:blaze_powder" + } + ], + "recipe_book_tab": "meals", + "result": { + "item": "garnished:molten_stew" + } +} diff --git a/src/main/resources/data/garnished/recipes/integration/cooking/mud_pie.json b/src/main/resources/data/garnished/recipes/integration/cooking/mud_pie.json new file mode 100644 index 00000000..550cf98e --- /dev/null +++ b/src/main/resources/data/garnished/recipes/integration/cooking/mud_pie.json @@ -0,0 +1,31 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "farmersdelight" + ] + } + ], + "type": "farmersdelight:cooking", + "container": { + "item": "minecraft:bowl" + }, + "cookingtime": 200, + "experience": 1.0, + "ingredients": [ + { + "item": "garnished:mulch" + }, + { + "tag": "minecraft:dirt" + }, + { + "tag": "minecraft:dirt" + } + ], + "recipe_book_tab": "meals", + "result": { + "item": "garnished:mud_pie" + } +} diff --git a/src/main/resources/data/garnished/recipes/integration/cooking/murky_macadamia_malice.json b/src/main/resources/data/garnished/recipes/integration/cooking/murky_macadamia_malice.json new file mode 100644 index 00000000..21afbfbe --- /dev/null +++ b/src/main/resources/data/garnished/recipes/integration/cooking/murky_macadamia_malice.json @@ -0,0 +1,40 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "farmersdelight" + ] + } + ], + "type": "farmersdelight:cooking", + "container": { + "item": "minecraft:bowl" + }, + "cookingtime": 200, + "experience": 1.0, + "ingredients": [ + { + "item": "garnished:murky_jelly" + }, + { + "item": "garnished:murky_jelly" + }, + { + "item": "garnished:macadamia" + }, + { + "item": "garnished:macadamia" + }, + { + "item": "garnished:volatile_dust" + }, + { + "item": "garnished:volatile_dust" + } + ], + "recipe_book_tab": "meals", + "result": { + "item": "garnished:murky_macadamia_malice" + } +} diff --git a/src/main/resources/data/garnished/recipes/integration/cooking/omniscient_stew.json b/src/main/resources/data/garnished/recipes/integration/cooking/omniscient_stew.json new file mode 100644 index 00000000..8011d2a2 --- /dev/null +++ b/src/main/resources/data/garnished/recipes/integration/cooking/omniscient_stew.json @@ -0,0 +1,34 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "farmersdelight" + ] + } + ], + "type": "farmersdelight:cooking", + "container": { + "item": "minecraft:bowl" + }, + "cookingtime": 200, + "experience": 1.0, + "ingredients": [ + { + "item": "garnished:pansophical_petal" + }, + { + "item": "garnished:pansophical_petal" + }, + { + "item": "garnished:fiendish_spore" + }, + { + "item": "garnished:senile_bone" + } + ], + "recipe_book_tab": "meals", + "result": { + "item": "garnished:omniscient_stew" + } +} diff --git a/src/main/resources/data/garnished/recipes/integration/cooking/overgrown_brew.json b/src/main/resources/data/garnished/recipes/integration/cooking/overgrown_brew.json new file mode 100644 index 00000000..3695f7fb --- /dev/null +++ b/src/main/resources/data/garnished/recipes/integration/cooking/overgrown_brew.json @@ -0,0 +1,37 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "farmersdelight" + ] + } + ], + "type": "farmersdelight:cooking", + "container": { + "item": "minecraft:bowl" + }, + "cookingtime": 200, + "experience": 1.0, + "ingredients": [ + { + "item": "garnished:bamboo_clod" + }, + { + "item": "minecraft:sugar_cane" + }, + { + "item": "minecraft:sugar_cane" + }, + { + "item": "minecraft:sweet_berries" + }, + { + "item": "minecraft:sweet_berries" + } + ], + "recipe_book_tab": "meals", + "result": { + "item": "garnished:overgrown_brew" + } +} diff --git a/src/main/resources/data/garnished/recipes/integration/cooking/porkchop_and_graze.json b/src/main/resources/data/garnished/recipes/integration/cooking/porkchop_and_graze.json new file mode 100644 index 00000000..8e96d608 --- /dev/null +++ b/src/main/resources/data/garnished/recipes/integration/cooking/porkchop_and_graze.json @@ -0,0 +1,28 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "farmersdelight" + ] + } + ], + "type": "farmersdelight:cooking", + "cookingtime": 200, + "experience": 1.0, + "ingredients": [ + { + "item": "minecraft:cooked_porkchop" + }, + { + "item": "garnished:wheat_graze" + }, + { + "item": "garnished:wheat_graze" + } + ], + "recipe_book_tab": "misc", + "result": { + "item": "garnished:porkchop_and_graze" + } +} diff --git a/src/main/resources/data/garnished/recipes/integration/cooking/prickly_pear_stew.json b/src/main/resources/data/garnished/recipes/integration/cooking/prickly_pear_stew.json new file mode 100644 index 00000000..fdf5241e --- /dev/null +++ b/src/main/resources/data/garnished/recipes/integration/cooking/prickly_pear_stew.json @@ -0,0 +1,37 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "farmersdelight" + ] + } + ], + "type": "farmersdelight:cooking", + "container": { + "item": "minecraft:bowl" + }, + "cookingtime": 200, + "experience": 1.0, + "ingredients": [ + { + "item": "garnished:prickly_pear" + }, + { + "item": "garnished:prickly_pear" + }, + { + "item": "garnished:prickly_pear" + }, + { + "item": "garnished:solemn_dust" + }, + { + "item": "garnished:solemn_dust" + } + ], + "recipe_book_tab": "meals", + "result": { + "item": "garnished:prickly_pear_stew" + } +} diff --git a/src/main/resources/data/garnished/recipes/integration/cooking/sepia_tangle.json b/src/main/resources/data/garnished/recipes/integration/cooking/sepia_tangle.json new file mode 100644 index 00000000..783f19e4 --- /dev/null +++ b/src/main/resources/data/garnished/recipes/integration/cooking/sepia_tangle.json @@ -0,0 +1,31 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "farmersdelight" + ] + } + ], + "type": "farmersdelight:cooking", + "container": { + "item": "garnished:hardened_wrap" + }, + "cookingtime": 200, + "experience": 1.0, + "ingredients": [ + { + "item": "garnished:crushed_sepia_fungus" + }, + { + "item": "garnished:soul_roots" + }, + { + "item": "garnished:almond_cheese" + } + ], + "recipe_book_tab": "meals", + "result": { + "item": "garnished:wrapped_sepia_tangle" + } +} diff --git a/src/main/resources/data/garnished/recipes/integration/cooking/shining_dish.json b/src/main/resources/data/garnished/recipes/integration/cooking/shining_dish.json new file mode 100644 index 00000000..983ee3d6 --- /dev/null +++ b/src/main/resources/data/garnished/recipes/integration/cooking/shining_dish.json @@ -0,0 +1,40 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "farmersdelight" + ] + } + ], + "type": "farmersdelight:cooking", + "container": { + "item": "minecraft:bowl" + }, + "cookingtime": 200, + "experience": 1.0, + "ingredients": [ + { + "item": "garnished:yam_o_glow_puffs" + }, + { + "item": "garnished:yam_o_glow_puffs" + }, + { + "item": "garnished:yam_o_glow_puffs" + }, + { + "item": "garnished:ungarnished_peanut" + }, + { + "item": "garnished:ungarnished_peanut" + }, + { + "item": "minecraft:hanging_roots" + } + ], + "recipe_book_tab": "meals", + "result": { + "item": "garnished:shining_dish" + } +} diff --git a/src/main/resources/data/garnished/recipes/integration/cooking/stew_of_the_damned.json b/src/main/resources/data/garnished/recipes/integration/cooking/stew_of_the_damned.json new file mode 100644 index 00000000..3e87f2ba --- /dev/null +++ b/src/main/resources/data/garnished/recipes/integration/cooking/stew_of_the_damned.json @@ -0,0 +1,37 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "farmersdelight" + ] + } + ], + "type": "farmersdelight:cooking", + "container": { + "item": "minecraft:bowl" + }, + "cookingtime": 200, + "experience": 1.0, + "ingredients": [ + { + "item": "minecraft:bone" + }, + { + "item": "minecraft:rotten_flesh" + }, + { + "item": "garnished:antique_swathe" + }, + { + "item": "garnished:antique_swathe" + }, + { + "item": "garnished:shattered_amber_remnant" + } + ], + "recipe_book_tab": "meals", + "result": { + "item": "garnished:stew_of_the_damned" + } +} diff --git a/src/main/resources/data/garnished/recipes/integration/cooking/vast_brew.json b/src/main/resources/data/garnished/recipes/integration/cooking/vast_brew.json new file mode 100644 index 00000000..d1ddde77 --- /dev/null +++ b/src/main/resources/data/garnished/recipes/integration/cooking/vast_brew.json @@ -0,0 +1,40 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "farmersdelight" + ] + } + ], + "type": "farmersdelight:cooking", + "container": { + "item": "minecraft:bowl" + }, + "cookingtime": 200, + "experience": 1.0, + "ingredients": [ + { + "item": "garnished:lustrous_pearl" + }, + { + "item": "garnished:vermilion_kelp" + }, + { + "item": "garnished:vermilion_kelp" + }, + { + "tag": "c:coral_fans" + }, + { + "item": "minecraft:sea_pickle" + }, + { + "item": "minecraft:sea_pickle" + } + ], + "recipe_book_tab": "meals", + "result": { + "item": "garnished:vast_brew" + } +} diff --git a/src/main/resources/data/garnished/recipes/integration/cooking/vermilion_stew.json b/src/main/resources/data/garnished/recipes/integration/cooking/vermilion_stew.json new file mode 100644 index 00000000..4670749b --- /dev/null +++ b/src/main/resources/data/garnished/recipes/integration/cooking/vermilion_stew.json @@ -0,0 +1,40 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "farmersdelight" + ] + } + ], + "type": "farmersdelight:cooking", + "container": { + "item": "minecraft:bowl" + }, + "cookingtime": 200, + "experience": 1.0, + "ingredients": [ + { + "item": "garnished:dried_vermilion_kelp" + }, + { + "item": "garnished:dried_vermilion_kelp" + }, + { + "item": "garnished:dried_vermilion_kelp" + }, + { + "item": "minecraft:fire_coral_fan" + }, + { + "item": "minecraft:fire_coral_fan" + }, + { + "item": "garnished:brittle_dust" + } + ], + "recipe_book_tab": "meals", + "result": { + "item": "garnished:vermilion_stew" + } +} diff --git a/src/main/resources/data/garnished/recipes/integration/cooking/void_mixture.json b/src/main/resources/data/garnished/recipes/integration/cooking/void_mixture.json new file mode 100644 index 00000000..ab63ac7d --- /dev/null +++ b/src/main/resources/data/garnished/recipes/integration/cooking/void_mixture.json @@ -0,0 +1,37 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "farmersdelight" + ] + } + ], + "type": "farmersdelight:cooking", + "container": { + "item": "minecraft:bowl" + }, + "cookingtime": 200, + "experience": 1.0, + "ingredients": [ + { + "item": "garnished:void_dust" + }, + { + "item": "garnished:void_dust" + }, + { + "item": "garnished:nut_flour" + }, + { + "item": "garnished:chorus_tuft" + }, + { + "item": "garnished:chorus_tuft" + } + ], + "recipe_book_tab": "meals", + "result": { + "item": "garnished:void_mixture" + } +} diff --git a/src/main/resources/data/garnished/recipes/integration/cooking/void_stroganoff.json b/src/main/resources/data/garnished/recipes/integration/cooking/void_stroganoff.json new file mode 100644 index 00000000..163e5306 --- /dev/null +++ b/src/main/resources/data/garnished/recipes/integration/cooking/void_stroganoff.json @@ -0,0 +1,34 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "farmersdelight" + ] + } + ], + "type": "farmersdelight:cooking", + "container": { + "item": "minecraft:bowl" + }, + "cookingtime": 200, + "experience": 1.0, + "ingredients": [ + { + "item": "garnished:garnish_powder" + }, + { + "item": "garnished:void_dust" + }, + { + "item": "garnished:cooked_polar_bear_meat" + }, + { + "item": "garnished:numbing_parchment" + } + ], + "recipe_book_tab": "meals", + "result": { + "item": "garnished:void_stroganoff" + } +} diff --git a/src/main/resources/data/garnished/recipes/integration/cooking/warped_brew.json b/src/main/resources/data/garnished/recipes/integration/cooking/warped_brew.json new file mode 100644 index 00000000..dc2874bb --- /dev/null +++ b/src/main/resources/data/garnished/recipes/integration/cooking/warped_brew.json @@ -0,0 +1,37 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "farmersdelight" + ] + } + ], + "type": "farmersdelight:cooking", + "container": { + "item": "minecraft:bowl" + }, + "cookingtime": 200, + "experience": 1.0, + "ingredients": [ + { + "item": "garnished:pansophical_daisy" + }, + { + "item": "garnished:pansophical_petal" + }, + { + "item": "garnished:crushed_warped_fungus" + }, + { + "item": "garnished:crushed_warped_fungus" + }, + { + "item": "minecraft:warped_fungus" + } + ], + "recipe_book_tab": "meals", + "result": { + "item": "garnished:warped_brew" + } +} diff --git a/src/main/resources/data/garnished/recipes/integration/cooking/warped_tangle.json b/src/main/resources/data/garnished/recipes/integration/cooking/warped_tangle.json new file mode 100644 index 00000000..55a165fb --- /dev/null +++ b/src/main/resources/data/garnished/recipes/integration/cooking/warped_tangle.json @@ -0,0 +1,31 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "farmersdelight" + ] + } + ], + "type": "farmersdelight:cooking", + "container": { + "item": "garnished:hardened_wrap" + }, + "cookingtime": 200, + "experience": 1.0, + "ingredients": [ + { + "item": "garnished:crushed_warped_fungus" + }, + { + "item": "garnished:pansophical_petal" + }, + { + "item": "garnished:almond_cheese" + } + ], + "recipe_book_tab": "meals", + "result": { + "item": "garnished:wrapped_warped_tangle" + } +} diff --git a/src/main/resources/data/garnished/recipes/integration/cutting/brownie_walnuts_slice.json b/src/main/resources/data/garnished/recipes/integration/cutting/brownie_walnuts_slice.json new file mode 100644 index 00000000..daf48574 --- /dev/null +++ b/src/main/resources/data/garnished/recipes/integration/cutting/brownie_walnuts_slice.json @@ -0,0 +1,25 @@ +{ + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "farmersdelight" + ] + } + ], + "type": "farmersdelight:cutting", + "ingredients": [ + { + "item": "garnished:brownie_walnuts" + } + ], + "result": [ + { + "count": 4, + "item": "garnished:brownie_walnuts_piece" + } + ], + "tool": { + "tag": "c:tools/knives" + } +} diff --git a/src/main/resources/data/garnished/recipes/numbing_parchment_block.json b/src/main/resources/data/garnished/recipes/numbing_parchment_block.json new file mode 100644 index 00000000..a1895068 --- /dev/null +++ b/src/main/resources/data/garnished/recipes/numbing_parchment_block.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "##", + "##" + ], + "key": { + "#": { + "item": "garnished:numbing_parchment" + } + }, + "result": { + "item": "garnished:numbing_parchment_block", + "count": 1 + } +} diff --git a/src/main/resources/data/garnished/recipes/numbing_parchment_carpet.json b/src/main/resources/data/garnished/recipes/numbing_parchment_carpet.json new file mode 100644 index 00000000..35d19934 --- /dev/null +++ b/src/main/resources/data/garnished/recipes/numbing_parchment_carpet.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "##" + ], + "key": { + "#": { + "item": "garnished:numbing_parchment_block" + } + }, + "result": { + "item": "garnished:numbing_parchment_carpet", + "count": 6 + } +} diff --git a/src/main/resources/data/garnished/recipes/numbing_parchment_from_block.json b/src/main/resources/data/garnished/recipes/numbing_parchment_from_block.json new file mode 100644 index 00000000..1f30a756 --- /dev/null +++ b/src/main/resources/data/garnished/recipes/numbing_parchment_from_block.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "garnished:numbing_parchment_block" + } + ], + "result": { + "item": "garnished:numbing_parchment", + "count": 4 + } +} diff --git a/src/main/resources/data/garnished/recipes/wood/nut/nut_window.json b/src/main/resources/data/garnished/recipes/wood/nut/nut_window.json new file mode 100644 index 00000000..1ed91c5c --- /dev/null +++ b/src/main/resources/data/garnished/recipes/wood/nut/nut_window.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "garnished:nut_planks" + }, + "X": { + "tag": "c:glass/colorless" + } + }, + "pattern": [ + " # ", + "#X#" + ], + "result": { + "count": 2, + "item": "garnished:nut_window" + }, + "show_notification": true +} diff --git a/src/main/resources/data/garnished/recipes/wood/nut/nut_window_pane.json b/src/main/resources/data/garnished/recipes/wood/nut/nut_window_pane.json new file mode 100644 index 00000000..fe0b71ce --- /dev/null +++ b/src/main/resources/data/garnished/recipes/wood/nut/nut_window_pane.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "garnished:nut_window" + } + }, + "pattern": [ + "###", + "###" + ], + "result": { + "count": 16, + "item": "garnished:nut_window_pane" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/resources/data/garnished/recipes/wood/sepia/sepia_window.json b/src/main/resources/data/garnished/recipes/wood/sepia/sepia_window.json new file mode 100644 index 00000000..d1a38495 --- /dev/null +++ b/src/main/resources/data/garnished/recipes/wood/sepia/sepia_window.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "garnished:sepia_planks" + }, + "X": { + "tag": "c:glass/colorless" + } + }, + "pattern": [ + " # ", + "#X#" + ], + "result": { + "count": 2, + "item": "garnished:sepia_window" + }, + "show_notification": true +} diff --git a/src/main/resources/data/garnished/recipes/wood/sepia/sepia_window_pane.json b/src/main/resources/data/garnished/recipes/wood/sepia/sepia_window_pane.json new file mode 100644 index 00000000..a1853fc8 --- /dev/null +++ b/src/main/resources/data/garnished/recipes/wood/sepia/sepia_window_pane.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "garnished:sepia_window" + } + }, + "pattern": [ + "###", + "###" + ], + "result": { + "count": 16, + "item": "garnished:sepia_window_pane" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/resources/data/garnished/worldgen/configured_feature/almond_tree_configured.json b/src/main/resources/data/garnished/worldgen/configured_feature/almond_tree_configured.json index 3d9668cf..b7bd2e38 100644 --- a/src/main/resources/data/garnished/worldgen/configured_feature/almond_tree_configured.json +++ b/src/main/resources/data/garnished/worldgen/configured_feature/almond_tree_configured.json @@ -30,7 +30,7 @@ { "weight": 3, "data": { - "Name": "minecraft:oak_leaves", + "Name": "garnished:unassigned_nut_leaves", "Properties": { "distance": "7", "persistent": "false", diff --git a/src/main/resources/data/garnished/worldgen/configured_feature/cashew_tree_configured.json b/src/main/resources/data/garnished/worldgen/configured_feature/cashew_tree_configured.json index 40562c1b..05c33df2 100644 --- a/src/main/resources/data/garnished/worldgen/configured_feature/cashew_tree_configured.json +++ b/src/main/resources/data/garnished/worldgen/configured_feature/cashew_tree_configured.json @@ -30,7 +30,7 @@ { "weight": 3, "data": { - "Name": "minecraft:oak_leaves", + "Name": "garnished:unassigned_nut_leaves", "Properties": { "distance": "7", "persistent": "false", diff --git a/src/main/resources/data/garnished/worldgen/configured_feature/chestnut_tree_configured.json b/src/main/resources/data/garnished/worldgen/configured_feature/chestnut_tree_configured.json index 33066f0a..57532a70 100644 --- a/src/main/resources/data/garnished/worldgen/configured_feature/chestnut_tree_configured.json +++ b/src/main/resources/data/garnished/worldgen/configured_feature/chestnut_tree_configured.json @@ -30,7 +30,7 @@ { "weight": 3, "data": { - "Name": "minecraft:oak_leaves", + "Name": "garnished:unassigned_nut_leaves", "Properties": { "distance": "7", "persistent": "false", diff --git a/src/main/resources/data/garnished/worldgen/configured_feature/hazelnut_tree_configured.json b/src/main/resources/data/garnished/worldgen/configured_feature/hazelnut_tree_configured.json index 86e64c95..1d9a0fa8 100644 --- a/src/main/resources/data/garnished/worldgen/configured_feature/hazelnut_tree_configured.json +++ b/src/main/resources/data/garnished/worldgen/configured_feature/hazelnut_tree_configured.json @@ -30,7 +30,7 @@ { "weight": 3, "data": { - "Name": "minecraft:oak_leaves", + "Name": "garnished:unassigned_nut_leaves", "Properties": { "distance": "7", "persistent": "false", diff --git a/src/main/resources/data/garnished/worldgen/configured_feature/macadamia_tree_configured.json b/src/main/resources/data/garnished/worldgen/configured_feature/macadamia_tree_configured.json index 6b3b71da..cb3dba28 100644 --- a/src/main/resources/data/garnished/worldgen/configured_feature/macadamia_tree_configured.json +++ b/src/main/resources/data/garnished/worldgen/configured_feature/macadamia_tree_configured.json @@ -30,7 +30,7 @@ { "weight": 3, "data": { - "Name": "minecraft:oak_leaves", + "Name": "garnished:unassigned_nut_leaves", "Properties": { "distance": "7", "persistent": "false", diff --git a/src/main/resources/data/garnished/worldgen/configured_feature/nut_tree_configured.json b/src/main/resources/data/garnished/worldgen/configured_feature/nut_tree_configured.json index 461e440e..e7df6784 100644 --- a/src/main/resources/data/garnished/worldgen/configured_feature/nut_tree_configured.json +++ b/src/main/resources/data/garnished/worldgen/configured_feature/nut_tree_configured.json @@ -30,7 +30,7 @@ { "weight": 5, "data": { - "Name": "minecraft:oak_leaves", + "Name": "garnished:unassigned_nut_leaves", "Properties": { "distance": "7", "persistent": "false", diff --git a/src/main/resources/data/garnished/worldgen/configured_feature/peanut_tree_configured.json b/src/main/resources/data/garnished/worldgen/configured_feature/peanut_tree_configured.json index 9e6ee1c6..9cf33cf3 100644 --- a/src/main/resources/data/garnished/worldgen/configured_feature/peanut_tree_configured.json +++ b/src/main/resources/data/garnished/worldgen/configured_feature/peanut_tree_configured.json @@ -30,7 +30,7 @@ { "weight": 3, "data": { - "Name": "minecraft:oak_leaves", + "Name": "garnished:unassigned_nut_leaves", "Properties": { "distance": "7", "persistent": "false", diff --git a/src/main/resources/data/garnished/worldgen/configured_feature/pecan_tree_configured.json b/src/main/resources/data/garnished/worldgen/configured_feature/pecan_tree_configured.json index 270d2ec5..cfeb2c6a 100644 --- a/src/main/resources/data/garnished/worldgen/configured_feature/pecan_tree_configured.json +++ b/src/main/resources/data/garnished/worldgen/configured_feature/pecan_tree_configured.json @@ -30,7 +30,7 @@ { "weight": 3, "data": { - "Name": "minecraft:oak_leaves", + "Name": "garnished:unassigned_nut_leaves", "Properties": { "distance": "7", "persistent": "false", diff --git a/src/main/resources/data/garnished/worldgen/configured_feature/pistachio_tree_configured.json b/src/main/resources/data/garnished/worldgen/configured_feature/pistachio_tree_configured.json index 67ae1852..ed34b32c 100644 --- a/src/main/resources/data/garnished/worldgen/configured_feature/pistachio_tree_configured.json +++ b/src/main/resources/data/garnished/worldgen/configured_feature/pistachio_tree_configured.json @@ -30,7 +30,7 @@ { "weight": 3, "data": { - "Name": "minecraft:oak_leaves", + "Name": "garnished:unassigned_nut_leaves", "Properties": { "distance": "7", "persistent": "false", diff --git a/src/main/resources/data/garnished/worldgen/configured_feature/walnut_tree_configured.json b/src/main/resources/data/garnished/worldgen/configured_feature/walnut_tree_configured.json index 55207ba6..091738d6 100644 --- a/src/main/resources/data/garnished/worldgen/configured_feature/walnut_tree_configured.json +++ b/src/main/resources/data/garnished/worldgen/configured_feature/walnut_tree_configured.json @@ -30,7 +30,7 @@ { "weight": 3, "data": { - "Name": "minecraft:oak_leaves", + "Name": "garnished:unassigned_nut_leaves", "Properties": { "distance": "7", "persistent": "false", diff --git a/src/main/resources/data/minecraft/tags/blocks/leaves.json b/src/main/resources/data/minecraft/tags/blocks/leaves.json index 4e215c3a..c85ac750 100644 --- a/src/main/resources/data/minecraft/tags/blocks/leaves.json +++ b/src/main/resources/data/minecraft/tags/blocks/leaves.json @@ -1,6 +1,7 @@ { "values": [ "garnished:nut_leaves", + "garnished:unassigned_nut_leaves", "garnished:peanut_leaves", "garnished:walnut_leaves", "garnished:cashew_leaves", diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/hoe.json b/src/main/resources/data/minecraft/tags/blocks/mineable/hoe.json index 2adcd989..23544542 100644 --- a/src/main/resources/data/minecraft/tags/blocks/mineable/hoe.json +++ b/src/main/resources/data/minecraft/tags/blocks/mineable/hoe.json @@ -3,6 +3,7 @@ "values": [ "garnished:sepia_wart_block", "garnished:nut_leaves", + "garnished:unassigned_nut_leaves", "garnished:peanut_leaves", "garnished:walnut_leaves", "garnished:cashew_leaves", diff --git a/src/main/resources/data/minecraft/tags/items/leaves.json b/src/main/resources/data/minecraft/tags/items/leaves.json index 4e215c3a..c85ac750 100644 --- a/src/main/resources/data/minecraft/tags/items/leaves.json +++ b/src/main/resources/data/minecraft/tags/items/leaves.json @@ -1,6 +1,7 @@ { "values": [ "garnished:nut_leaves", + "garnished:unassigned_nut_leaves", "garnished:peanut_leaves", "garnished:walnut_leaves", "garnished:cashew_leaves",