PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2025-01-31 19:16:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

Move recipes to their own package

Browse source
This commit is contained in:
Sollace 2024-04-05 18:33:24 +01:00
parent 8c83647004
commit 5529382e71
No known key found for this signature in database
GPG key ID: E52FACE7B5C773DB
26 changed files with 37 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/com/minelittlepony/unicopia/ability/EarthPonyGrowAbility.java
View file

@ -10,10 +10,10 @@ import com.minelittlepony.unicopia.ability.data.Hit;
import com.minelittlepony.unicopia.ability.data.Pos;
import com.minelittlepony.unicopia.block.UBlocks;
import com.minelittlepony.unicopia.entity.player.Pony;
import com.minelittlepony.unicopia.item.TransformCropsRecipe;
import com.minelittlepony.unicopia.item.URecipes;
import com.minelittlepony.unicopia.particle.MagicParticleEffect;
import com.minelittlepony.unicopia.particle.ParticleUtils;
import com.minelittlepony.unicopia.recipe.TransformCropsRecipe;
import com.minelittlepony.unicopia.recipe.URecipes;
import com.minelittlepony.unicopia.server.world.BlockDestructionManager;
import com.minelittlepony.unicopia.util.TraceHelper;
import com.minelittlepony.unicopia.util.VecHelper;

2
src/main/java/com/minelittlepony/unicopia/ability/magic/spell/crafting/SpellCraftingRecipe.java
View file

@ -9,7 +9,7 @@ import com.minelittlepony.unicopia.ability.magic.spell.effect.SpellType;
import com.minelittlepony.unicopia.ability.magic.spell.trait.SpellTraits;
import com.minelittlepony.unicopia.container.inventory.SpellbookInventory;
import com.minelittlepony.unicopia.item.EnchantableItem;
import com.minelittlepony.unicopia.item.URecipes;
import com.minelittlepony.unicopia.recipe.URecipes;
import com.minelittlepony.unicopia.util.InventoryUtil;
import com.mojang.datafixers.util.Pair;

1
src/main/java/com/minelittlepony/unicopia/ability/magic/spell/crafting/SpellDuplicatingRecipe.java
View file

@ -4,6 +4,7 @@ import com.google.gson.JsonObject;
import com.minelittlepony.unicopia.ability.magic.spell.effect.SpellType;
import com.minelittlepony.unicopia.container.inventory.SpellbookInventory;
import com.minelittlepony.unicopia.item.*;
import com.minelittlepony.unicopia.recipe.URecipes;
import com.minelittlepony.unicopia.util.InventoryUtil;
import net.minecraft.item.ItemStack;

1
src/main/java/com/minelittlepony/unicopia/ability/magic/spell/crafting/SpellEnhancingRecipe.java
View file

@ -4,6 +4,7 @@ import com.google.gson.JsonObject;
import com.minelittlepony.unicopia.ability.magic.spell.trait.SpellTraits;
import com.minelittlepony.unicopia.container.inventory.SpellbookInventory;
import com.minelittlepony.unicopia.item.*;
import com.minelittlepony.unicopia.recipe.URecipes;
import net.minecraft.item.ItemStack;
import net.minecraft.network.PacketByteBuf;

2
src/main/java/com/minelittlepony/unicopia/ability/magic/spell/crafting/SpellShapedCraftingRecipe.java
View file

@ -2,7 +2,7 @@ package com.minelittlepony.unicopia.ability.magic.spell.crafting;
import com.google.gson.JsonObject;
import com.minelittlepony.unicopia.item.EnchantableItem;
import com.minelittlepony.unicopia.item.URecipes;
import com.minelittlepony.unicopia.recipe.URecipes;
import com.minelittlepony.unicopia.util.InventoryUtil;
import net.minecraft.inventory.RecipeInputInventory;

2
src/main/java/com/minelittlepony/unicopia/ability/magic/spell/crafting/SpellbookRecipe.java
View file

@ -5,7 +5,7 @@ import java.util.List;
import com.minelittlepony.unicopia.ability.magic.spell.trait.Trait;
import com.minelittlepony.unicopia.container.inventory.SpellbookInventory;
import com.minelittlepony.unicopia.item.UItems;
import com.minelittlepony.unicopia.item.URecipes;
import com.minelittlepony.unicopia.recipe.URecipes;
import net.minecraft.item.ItemStack;
import net.minecraft.recipe.Recipe;

2
src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/SpellbookCraftingPageContent.java
View file

@ -7,7 +7,7 @@ import com.minelittlepony.unicopia.ability.magic.spell.crafting.SpellbookRecipe;
import com.minelittlepony.unicopia.client.gui.DrawableUtil;
import com.minelittlepony.unicopia.client.gui.MagicText;
import com.minelittlepony.unicopia.container.SpellbookState;
import com.minelittlepony.unicopia.item.URecipes;
import com.minelittlepony.unicopia.recipe.URecipes;
import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.gui.DrawContext;

4
src/main/java/com/minelittlepony/unicopia/compat/emi/Main.java
View file

@ -15,10 +15,10 @@ import com.minelittlepony.unicopia.ability.magic.spell.trait.Trait;
import com.minelittlepony.unicopia.block.UBlocks;
import com.minelittlepony.unicopia.block.state.Schematic;
import com.minelittlepony.unicopia.item.EnchantableItem;
import com.minelittlepony.unicopia.item.TransformCropsRecipe;
import com.minelittlepony.unicopia.item.UItems;
import com.minelittlepony.unicopia.item.URecipes;
import com.minelittlepony.unicopia.item.group.MultiItem;
import com.minelittlepony.unicopia.recipe.TransformCropsRecipe;
import com.minelittlepony.unicopia.recipe.URecipes;
import dev.emi.emi.api.EmiPlugin;
import dev.emi.emi.api.EmiRegistry;

2
src/main/java/com/minelittlepony/unicopia/container/ShapingBenchScreenHandler.java
View file

@ -1,7 +1,7 @@
package com.minelittlepony.unicopia.container;
import com.minelittlepony.unicopia.block.UBlocks;
import com.minelittlepony.unicopia.item.URecipes;
import com.minelittlepony.unicopia.recipe.URecipes;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.PlayerInventory;

2
src/main/java/com/minelittlepony/unicopia/container/SpellbookScreenHandler.java
View file

@ -10,7 +10,7 @@ import com.minelittlepony.unicopia.compat.trinkets.TrinketsDelegate;
import com.minelittlepony.unicopia.container.inventory.*;
import com.minelittlepony.unicopia.entity.player.Pony;
import com.minelittlepony.unicopia.item.UItems;
import com.minelittlepony.unicopia.item.URecipes;
import com.minelittlepony.unicopia.recipe.URecipes;
import com.mojang.datafixers.util.Pair;
import net.minecraft.enchantment.EnchantmentHelper;

1
src/main/java/com/minelittlepony/unicopia/datagen/providers/UAdvancementsProvider.java
View file

@ -146,6 +146,7 @@ public class UAdvancementsProvider extends FabricAdvancementProvider {
private void generateUnicornTribeAdvancementsTree(Consumer<Advancement> consumer, AdvancementDisplayBuilder.Parent parent) {
parent.child(UItems.SPELLBOOK).criterion("has_spellbook", hasItems(UItems.SPELLBOOK)).build(consumer, "books").children(p -> {
// TODO:
//ItemPredicate bookPredicate = ItemPredicate.Builder.create().tag(ItemTags.BOOKSHELF_BOOKS).build();
//p.child(Items.BOOK).hidden().frame(AdvancementFrame.CHALLENGE).criterion("has_books", InventoryChangedCriterion.Conditions.items(IntStream.range(0, 9 * 4).mapToObj(i -> bookPredicate).toArray(ItemPredicate[]::new))).build(consumer, "books_books_books");
p.child(UItems.CRYSTAL_SHARD).criterion("has_shard", hasItems(UItems.CRYSTAL_SHARD)).build(consumer, "crystaline").children(pp -> {

2
src/main/java/com/minelittlepony/unicopia/datagen/providers/recipe/CraftingMaterialHelper.java
View file

@ -4,7 +4,7 @@ import java.util.Map;
import java.util.NoSuchElementException;
import com.minelittlepony.unicopia.ability.magic.spell.effect.SpellType;
import com.minelittlepony.unicopia.item.URecipes;
import com.minelittlepony.unicopia.recipe.URecipes;
import com.mojang.datafixers.util.Either;
import net.fabricmc.fabric.api.tag.convention.v1.ConventionalItemTags;

2
src/main/java/com/minelittlepony/unicopia/datagen/providers/recipe/GrowingRecipeJsonBuilder.java
View file

@ -7,7 +7,7 @@ import org.jetbrains.annotations.Nullable;
import org.spongepowered.include.com.google.common.base.Preconditions;
import com.google.gson.JsonObject;
import com.minelittlepony.unicopia.item.URecipes;
import com.minelittlepony.unicopia.recipe.URecipes;
import com.mojang.serialization.JsonOps;
import net.minecraft.advancement.Advancement;

3
src/main/java/com/minelittlepony/unicopia/datagen/providers/recipe/SpellcraftingRecipeJsonBuilder.java
View file

@ -15,7 +15,8 @@ import com.minelittlepony.unicopia.ability.magic.spell.effect.SpellType;
import com.minelittlepony.unicopia.ability.magic.spell.trait.SpellTraits;
import com.minelittlepony.unicopia.advancement.TraitDiscoveredCriterion;
import com.minelittlepony.unicopia.item.UItems;
import com.minelittlepony.unicopia.item.URecipes;
import com.minelittlepony.unicopia.recipe.URecipes;
import net.minecraft.advancement.Advancement;
import net.minecraft.advancement.AdvancementRewards;
import net.minecraft.advancement.CriterionMerger;

2
src/main/java/com/minelittlepony/unicopia/datagen/providers/recipe/TrickCraftingRecipeJsonBuilder.java
View file

@ -8,7 +8,7 @@ import org.spongepowered.include.com.google.common.base.Preconditions;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import com.minelittlepony.unicopia.item.URecipes;
import com.minelittlepony.unicopia.recipe.URecipes;
import net.minecraft.advancement.Advancement;
import net.minecraft.advancement.AdvancementRewards;

2
src/main/java/com/minelittlepony/unicopia/datagen/providers/recipe/URecipeProvider.java
View file

@ -17,7 +17,7 @@ import com.minelittlepony.unicopia.datagen.ItemFamilies;
import com.minelittlepony.unicopia.datagen.UBlockFamilies;
import com.minelittlepony.unicopia.datagen.providers.recipe.BedSheetPatternRecipeBuilder.PatternTemplate;
import com.minelittlepony.unicopia.item.UItems;
import com.minelittlepony.unicopia.item.URecipes;
import com.minelittlepony.unicopia.recipe.URecipes;
import com.minelittlepony.unicopia.server.world.UTreeGen;
import com.mojang.datafixers.util.Either;

3
src/main/java/com/minelittlepony/unicopia/datagen/providers/tag/UItemTagProvider.java
View file

@ -228,9 +228,8 @@ public class UItemTagProvider extends FabricTagProvider.ItemTagProvider {
.addOptionalTag(new Identifier("c", "raw_pork"))
.addOptionalTag(new Identifier("c", "lemon_chickens"));
getOrCreateTagBuilder(UConventionalTags.Items.ROTTEN_MEAT).add(Items.ROTTEN_FLESH);
getOrCreateTagBuilder(UConventionalTags.Items.ROTTEN_FISH);//.add(Items.ROTTEN_FLESH); TODO:
getOrCreateTagBuilder(UConventionalTags.Items.ROTTEN_INSECT).add(Items.FERMENTED_SPIDER_EYE);
getOrCreateTagBuilder(UConventionalTags.Items.COOKED_INSECT);//.add(Items.FERMENTED_SPIDER_EYE);
getOrCreateTagBuilder(UConventionalTags.Items.COOKED_INSECT);//.add(Items.FERMENTED_SPIDER_EYE); TODO
getOrCreateTagBuilder(UConventionalTags.Items.RAW_INSECT).add(Items.SPIDER_EYE, UItems.BUTTERFLY, UItems.WHEAT_WORMS, UBlocks.WORM_BLOCK.asItem());
getOrCreateTagBuilder(UConventionalTags.Items.WORMS).add(UItems.WHEAT_WORMS);
getOrCreateTagBuilder(UConventionalTags.Items.STICKS).add(Items.STICK);

1
src/main/java/com/minelittlepony/unicopia/item/UItems.java
View file

@ -12,6 +12,7 @@ import com.minelittlepony.unicopia.item.cloud.CloudBedItem;
import com.minelittlepony.unicopia.item.enchantment.UEnchantments;
import com.minelittlepony.unicopia.item.group.ItemGroupRegistry;
import com.minelittlepony.unicopia.item.group.UItemGroups;
import com.minelittlepony.unicopia.recipe.URecipes;
import com.terraformersmc.terraform.boat.api.TerraformBoatType;
import com.terraformersmc.terraform.boat.api.TerraformBoatTypeRegistry;
import com.terraformersmc.terraform.boat.api.item.TerraformBoatItemHelper;

3
src/main/java/com/minelittlepony/unicopia/item/cloud/CloudShapingRecipe.java → src/main/java/com/minelittlepony/unicopia/recipe/CloudShapingRecipe.java
View file

@ -1,7 +1,6 @@
package com.minelittlepony.unicopia.item.cloud;
package com.minelittlepony.unicopia.recipe;
import com.minelittlepony.unicopia.block.UBlocks;
import com.minelittlepony.unicopia.item.URecipes;
import net.minecraft.item.ItemStack;
import net.minecraft.recipe.Ingredient;

4
src/main/java/com/minelittlepony/unicopia/item/GlowingRecipe.java → src/main/java/com/minelittlepony/unicopia/recipe/GlowingRecipe.java
View file

@ -1,4 +1,6 @@
package com.minelittlepony.unicopia.item;
package com.minelittlepony.unicopia.recipe;
import com.minelittlepony.unicopia.item.GlowableItem;
import net.minecraft.inventory.RecipeInputInventory;
import net.minecraft.item.ItemStack;

2
src/main/java/com/minelittlepony/unicopia/item/ItemCombinationRecipe.java → src/main/java/com/minelittlepony/unicopia/recipe/ItemCombinationRecipe.java
View file

@ -1,4 +1,4 @@
package com.minelittlepony.unicopia.item;
package com.minelittlepony.unicopia.recipe;
import net.minecraft.inventory.RecipeInputInventory;
import net.minecraft.item.ItemStack;

4
src/main/java/com/minelittlepony/unicopia/item/JarExtractRecipe.java → src/main/java/com/minelittlepony/unicopia/recipe/JarExtractRecipe.java
View file

@ -1,7 +1,9 @@
package com.minelittlepony.unicopia.item;
package com.minelittlepony.unicopia.recipe;
import org.jetbrains.annotations.Nullable;
import com.minelittlepony.unicopia.item.UItems;
import net.minecraft.inventory.RecipeInputInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.recipe.RecipeSerializer;

5
src/main/java/com/minelittlepony/unicopia/item/JarInsertRecipe.java → src/main/java/com/minelittlepony/unicopia/recipe/JarInsertRecipe.java
View file

@ -1,4 +1,7 @@
package com.minelittlepony.unicopia.item;
package com.minelittlepony.unicopia.recipe;
import com.minelittlepony.unicopia.item.EmptyJarItem;
import com.minelittlepony.unicopia.item.UItems;
import net.minecraft.inventory.RecipeInputInventory;
import net.minecraft.item.ItemStack;

2
src/main/java/com/minelittlepony/unicopia/item/TransformCropsRecipe.java → src/main/java/com/minelittlepony/unicopia/recipe/TransformCropsRecipe.java
View file

@ -1,4 +1,4 @@
package com.minelittlepony.unicopia.item;
package com.minelittlepony.unicopia.recipe;
import java.util.HashSet;
import java.util.Set;

3
src/main/java/com/minelittlepony/unicopia/item/URecipes.java → src/main/java/com/minelittlepony/unicopia/recipe/URecipes.java
View file

@ -1,10 +1,9 @@
package com.minelittlepony.unicopia.item;
package com.minelittlepony.unicopia.recipe;
import java.util.List;
import com.google.gson.JsonArray;
import com.minelittlepony.unicopia.ability.magic.spell.crafting.*;
import com.minelittlepony.unicopia.item.cloud.CloudShapingRecipe;
import net.fabricmc.fabric.api.loot.v2.LootTableEvents;
import net.minecraft.loot.LootTable;

3
src/main/java/com/minelittlepony/unicopia/item/ZapAppleRecipe.java → src/main/java/com/minelittlepony/unicopia/recipe/ZapAppleRecipe.java
View file

@ -1,8 +1,9 @@
package com.minelittlepony.unicopia.item;
package com.minelittlepony.unicopia.recipe;
import com.google.gson.JsonObject;
import com.google.gson.JsonParseException;
import com.google.gson.JsonSyntaxException;
import com.minelittlepony.unicopia.item.UItems;
import net.minecraft.item.ItemStack;
import net.minecraft.network.PacketByteBuf;