Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-22 15:18:34 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '1.20.4' of https://github.com/Ellpeck/ActuallyAdditions into 1.20.4

Browse source
This commit is contained in:
Mrbysco 2024-03-04 21:54:17 +01:00
commit b6d1fafa24
10 changed files with 269 additions and 168 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

117
src/main/java/de/ellpeck/actuallyadditions/data/ItemRecipeGenerator.java
View file

@ -4,13 +4,10 @@ import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
import de.ellpeck.actuallyadditions.mod.blocks.ActuallyBlocks; import de.ellpeck.actuallyadditions.mod.blocks.ActuallyBlocks;
import de.ellpeck.actuallyadditions.mod.config.conditions.BoolConfigCondition; import de.ellpeck.actuallyadditions.mod.config.conditions.BoolConfigCondition;
import de.ellpeck.actuallyadditions.mod.items.ActuallyItems; import de.ellpeck.actuallyadditions.mod.items.ActuallyItems;
import de.ellpeck.actuallyadditions.mod.util.NoAdvRecipeOutput;
import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.data.PackOutput; import net.minecraft.data.PackOutput;
import net.minecraft.data.recipes.RecipeCategory; import net.minecraft.data.recipes.*;
import net.minecraft.data.recipes.RecipeOutput;
import net.minecraft.data.recipes.RecipeProvider;
import net.minecraft.data.recipes.ShapedRecipeBuilder;
import net.minecraft.data.recipes.ShapelessRecipeBuilder;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.ItemTags; import net.minecraft.tags.ItemTags;
import net.minecraft.world.item.Item; import net.minecraft.world.item.Item;
@ -36,8 +33,10 @@ public class ItemRecipeGenerator extends RecipeProvider {
} }
@Override @Override
protected void buildRecipes(RecipeOutput consumer) { protected void buildRecipes(RecipeOutput output) {
generatePaxels(consumer); var recipeOutput = new NoAdvRecipeOutput(output);
generatePaxels(recipeOutput);
//Goggles //Goggles
Recipe.shaped(ActuallyItems.ENGINEERS_GOGGLES.get()) Recipe.shaped(ActuallyItems.ENGINEERS_GOGGLES.get())
@ -45,7 +44,7 @@ public class ItemRecipeGenerator extends RecipeProvider {
.pattern("IGI") .pattern("IGI")
.define('R', ActuallyItems.RESTONIA_CRYSTAL.get()) .define('R', ActuallyItems.RESTONIA_CRYSTAL.get())
.define('I', Items.IRON_BARS) .define('I', Items.IRON_BARS)
.define('G', Tags.Items.GLASS).save(consumer); .define('G', Tags.Items.GLASS).save(recipeOutput);
//Advanced Goggles //Advanced Goggles
Recipe.shaped(ActuallyItems.ENGINEERS_GOGGLES_ADVANCED.get()) Recipe.shaped(ActuallyItems.ENGINEERS_GOGGLES_ADVANCED.get())
@ -53,7 +52,7 @@ public class ItemRecipeGenerator extends RecipeProvider {
.pattern("IGI") .pattern("IGI")
.define('R', ActuallyItems.EMPOWERED_RESTONIA_CRYSTAL.get()) .define('R', ActuallyItems.EMPOWERED_RESTONIA_CRYSTAL.get())
.define('I', Items.IRON_BARS) .define('I', Items.IRON_BARS)
.define('G', ActuallyItems.ENGINEERS_GOGGLES.get()).save(consumer); .define('G', ActuallyItems.ENGINEERS_GOGGLES.get()).save(recipeOutput);
//Laser Upgrades //Laser Upgrades
//Invisibility //Invisibility
@ -63,7 +62,7 @@ public class ItemRecipeGenerator extends RecipeProvider {
.pattern("GGG") .pattern("GGG")
.define('G', Tags.Items.GLASS_BLACK) .define('G', Tags.Items.GLASS_BLACK)
.define('R', ActuallyItems.VOID_CRYSTAL.get()) .define('R', ActuallyItems.VOID_CRYSTAL.get())
.define('C', ActuallyItems.ADVANCED_COIL.get()).save(consumer); .define('C', ActuallyItems.ADVANCED_COIL.get()).save(recipeOutput);
//Range //Range
Recipe.shaped(ActuallyItems.LASER_UPGRADE_RANGE.get(), 2) Recipe.shaped(ActuallyItems.LASER_UPGRADE_RANGE.get(), 2)
@ -72,7 +71,7 @@ public class ItemRecipeGenerator extends RecipeProvider {
.pattern("CGG") .pattern("CGG")
.define('R', Items.COMPASS) .define('R', Items.COMPASS)
.define('G', ActuallyItems.RESTONIA_CRYSTAL.get()) .define('G', ActuallyItems.RESTONIA_CRYSTAL.get())
.define('C', ActuallyItems.ADVANCED_COIL.get()).save(consumer); .define('C', ActuallyItems.ADVANCED_COIL.get()).save(recipeOutput);
//Filling Wand //Filling Wand
Recipe.shaped(ActuallyItems.HANDHELD_FILLER.get()) Recipe.shaped(ActuallyItems.HANDHELD_FILLER.get())
@ -83,7 +82,7 @@ public class ItemRecipeGenerator extends RecipeProvider {
.define('P', ActuallyItems.PALIS_CRYSTAL.get()) .define('P', ActuallyItems.PALIS_CRYSTAL.get())
.define('C', ActuallyItems.ADVANCED_COIL.get()) .define('C', ActuallyItems.ADVANCED_COIL.get())
.define('D', ActuallyItems.DIAMATINE_CRYSTAL.get()) .define('D', ActuallyItems.DIAMATINE_CRYSTAL.get())
.define('B', ActuallyItems.TRIPLE_BATTERY.get()).save(consumer); .define('B', ActuallyItems.TRIPLE_BATTERY.get()).save(recipeOutput);
//Bag //Bag
Recipe.shaped(ActuallyItems.TRAVELERS_SACK.get()) Recipe.shaped(ActuallyItems.TRAVELERS_SACK.get())
@ -93,7 +92,7 @@ public class ItemRecipeGenerator extends RecipeProvider {
.define('S', Tags.Items.STRING) .define('S', Tags.Items.STRING)
.define('L', Tags.Items.LEATHER) .define('L', Tags.Items.LEATHER)
.define('C', Tags.Items.CHESTS_WOODEN) .define('C', Tags.Items.CHESTS_WOODEN)
.define('V', ActuallyBlocks.VOID_CRYSTAL.getItem()).save(consumer); .define('V', ActuallyBlocks.VOID_CRYSTAL.getItem()).save(recipeOutput);
//Void Bag //Void Bag
Recipe.shapeless(ActuallyItems.VOID_SACK.get()) Recipe.shapeless(ActuallyItems.VOID_SACK.get())
@ -101,7 +100,7 @@ public class ItemRecipeGenerator extends RecipeProvider {
.requires(Tags.Items.ENDER_PEARLS) .requires(Tags.Items.ENDER_PEARLS)
.requires(Tags.Items.OBSIDIAN) .requires(Tags.Items.OBSIDIAN)
.requires(ActuallyBlocks.VOID_CRYSTAL.getItem()) .requires(ActuallyBlocks.VOID_CRYSTAL.getItem())
.save(consumer); .save(recipeOutput);
//Lens //Lens
Recipe.shaped(ActuallyItems.LENS.get()) Recipe.shaped(ActuallyItems.LENS.get())
@ -109,22 +108,22 @@ public class ItemRecipeGenerator extends RecipeProvider {
.pattern("GBG") .pattern("GBG")
.pattern("GGG") .pattern("GGG")
.define('G', Tags.Items.GLASS) .define('G', Tags.Items.GLASS)
.define('B', ActuallyItems.BLACK_QUARTZ.get()).save(consumer); .define('B', ActuallyItems.BLACK_QUARTZ.get()).save(recipeOutput);
//Booklet //Booklet
Recipe.shapeless(ActuallyItems.ITEM_BOOKLET.get()) Recipe.shapeless(ActuallyItems.ITEM_BOOKLET.get())
.ingredients(ActuallyItems.CANOLA_SEEDS.get(), Items.PAPER).save(consumer); .ingredients(ActuallyItems.CANOLA_SEEDS.get(), Items.PAPER).save(recipeOutput);
//Clearing NBT Storage //Clearing NBT Storage
Recipe.shapeless(ActuallyItems.LASER_WRENCH.get()).ingredients(ActuallyItems.LASER_WRENCH.get()).name(new ResourceLocation(ActuallyAdditions.MODID, "laser_wrench_nbt")).save(consumer); Recipe.shapeless(ActuallyItems.LASER_WRENCH.get()).ingredients(ActuallyItems.LASER_WRENCH.get()).name(new ResourceLocation(ActuallyAdditions.MODID, "laser_wrench_nbt")).save(recipeOutput);
Recipe.shapeless(ActuallyItems.PHANTOM_CONNECTOR.get()).ingredients(ActuallyItems.PHANTOM_CONNECTOR.get()).name(new ResourceLocation(ActuallyAdditions.MODID, "phantom_clearing")).save(consumer); Recipe.shapeless(ActuallyItems.PHANTOM_CONNECTOR.get()).ingredients(ActuallyItems.PHANTOM_CONNECTOR.get()).name(new ResourceLocation(ActuallyAdditions.MODID, "phantom_clearing")).save(recipeOutput);
//Disenchanting Lens //Disenchanting Lens
Recipe.shapeless(ActuallyItems.LENS_OF_DISENCHANTING.get()) Recipe.shapeless(ActuallyItems.LENS_OF_DISENCHANTING.get())
.requires(ActuallyItems.LENS.get()) .requires(ActuallyItems.LENS.get())
.requires(Items.ENCHANTING_TABLE) .requires(Items.ENCHANTING_TABLE)
.requires(ActuallyItems.EMPOWERED_DIAMATINE_CRYSTAL.get(), 7).save(consumer); .requires(ActuallyItems.EMPOWERED_DIAMATINE_CRYSTAL.get(), 7).save(recipeOutput);
//Mining Lens //Mining Lens
Recipe.shaped(ActuallyItems.LENS_OF_THE_MINER.get()) Recipe.shaped(ActuallyItems.LENS_OF_THE_MINER.get())
@ -139,7 +138,7 @@ public class ItemRecipeGenerator extends RecipeProvider {
.define('B', ActuallyItems.BLACK_QUARTZ.get()) .define('B', ActuallyItems.BLACK_QUARTZ.get())
.define('Q', Tags.Items.GEMS_QUARTZ) .define('Q', Tags.Items.GEMS_QUARTZ)
.define('P', Tags.Items.GEMS_LAPIS) .define('P', Tags.Items.GEMS_LAPIS)
.define('E', Tags.Items.GEMS_EMERALD).save(consumer); .define('E', Tags.Items.GEMS_EMERALD).save(recipeOutput);
//Killer Lens //Killer Lens
ItemStack enchantedBook = new ItemStack(Items.ENCHANTED_BOOK); ItemStack enchantedBook = new ItemStack(Items.ENCHANTED_BOOK);
@ -147,7 +146,7 @@ public class ItemRecipeGenerator extends RecipeProvider {
Recipe.shapeless(ActuallyItems.LENS_OF_THE_KILLER.get()) Recipe.shapeless(ActuallyItems.LENS_OF_THE_KILLER.get())
.requires(Items.DIAMOND_SWORD) .requires(Items.DIAMOND_SWORD)
.requires(ActuallyItems.LENS_OF_CERTAIN_DEATH.get()) .requires(ActuallyItems.LENS_OF_CERTAIN_DEATH.get())
.requires(NBTIngredient.of(true, enchantedBook)).save(consumer); .requires(NBTIngredient.of(true, enchantedBook)).save(recipeOutput);
//Filter //Filter
@ -156,7 +155,7 @@ public class ItemRecipeGenerator extends RecipeProvider {
.pattern("IQI") .pattern("IQI")
.pattern("III") .pattern("III")
.define('I', Items.IRON_BARS) .define('I', Items.IRON_BARS)
.define('Q', ActuallyItems.BLACK_QUARTZ.get()).save(consumer); .define('Q', ActuallyItems.BLACK_QUARTZ.get()).save(recipeOutput);
//Crate Keeper //Crate Keeper
Recipe.shaped(ActuallyItems.CRATE_KEEPER.get()) Recipe.shaped(ActuallyItems.CRATE_KEEPER.get())
@ -165,7 +164,7 @@ public class ItemRecipeGenerator extends RecipeProvider {
.pattern("WIW") .pattern("WIW")
.define('I', Tags.Items.INGOTS_IRON) .define('I', Tags.Items.INGOTS_IRON)
.define('W', ItemTags.PLANKS) .define('W', ItemTags.PLANKS)
.define('Q', ActuallyItems.BLACK_QUARTZ.get()).save(consumer); .define('Q', ActuallyItems.BLACK_QUARTZ.get()).save(recipeOutput);
//Laser Wrench //Laser Wrench
Recipe.shaped(ActuallyItems.LASER_WRENCH.get()) Recipe.shaped(ActuallyItems.LASER_WRENCH.get())
@ -173,7 +172,7 @@ public class ItemRecipeGenerator extends RecipeProvider {
.pattern(" S ") .pattern(" S ")
.pattern(" S") .pattern(" S")
.define('C', ActuallyItems.ADVANCED_COIL.get()) .define('C', ActuallyItems.ADVANCED_COIL.get())
.define('S', ActuallyItems.ENORI_CRYSTAL.get()).save(consumer); .define('S', ActuallyItems.ENORI_CRYSTAL.get()).save(recipeOutput);
/* //Rice Recipes /* //Rice Recipes
@ -190,7 +189,7 @@ public class ItemRecipeGenerator extends RecipeProvider {
.pattern(" R ") .pattern(" R ")
.define('R', ActuallyItems.RICE_DOUGH.get()) .define('R', ActuallyItems.RICE_DOUGH.get())
.define('B', Items.WATER_BUCKET) .define('B', Items.WATER_BUCKET)
.save(consumer, new ResourceLocation(ActuallyAdditions.MODID, "rice_slime")); .save(recipeOutput, new ResourceLocation(ActuallyAdditions.MODID, "rice_slime"));
Recipe.shaped(ActuallyItems.RICE_SLIMEBALL.get()) Recipe.shaped(ActuallyItems.RICE_SLIMEBALL.get())
.requiresBook() .requiresBook()
@ -199,7 +198,7 @@ public class ItemRecipeGenerator extends RecipeProvider {
.pattern(" R ") .pattern(" R ")
.define('R', ActuallyItems.RICE_DOUGH.get()) .define('R', ActuallyItems.RICE_DOUGH.get())
.define('B', Items.POTION) .define('B', Items.POTION)
.save(consumer, new ResourceLocation(ActuallyAdditions.MODID, "rice_slime_potion")); .save(recipeOutput, new ResourceLocation(ActuallyAdditions.MODID, "rice_slime_potion"));
//Leaf Blower //Leaf Blower
Recipe.shaped(ActuallyItems.LEAF_BLOWER.get()) Recipe.shaped(ActuallyItems.LEAF_BLOWER.get())
@ -209,7 +208,7 @@ public class ItemRecipeGenerator extends RecipeProvider {
.define('I', ActuallyItems.ENORI_CRYSTAL.get()) .define('I', ActuallyItems.ENORI_CRYSTAL.get())
.define('P', Items.PISTON) .define('P', Items.PISTON)
.define('F', Items.FLINT) .define('F', Items.FLINT)
.define('C', ActuallyItems.ADVANCED_COIL.get()).save(consumer); .define('C', ActuallyItems.ADVANCED_COIL.get()).save(recipeOutput);
//Advanced Leaf Blower //Advanced Leaf Blower
Recipe.shaped(ActuallyItems.ADVANCED_LEAF_BLOWER.get()).pattern(" F", "DP", "DC") Recipe.shaped(ActuallyItems.ADVANCED_LEAF_BLOWER.get()).pattern(" F", "DP", "DC")
@ -217,7 +216,7 @@ public class ItemRecipeGenerator extends RecipeProvider {
.define('D', ActuallyItems.DIAMATINE_CRYSTAL.get()) .define('D', ActuallyItems.DIAMATINE_CRYSTAL.get())
.define('P', Items.PISTON) .define('P', Items.PISTON)
.define('C', ActuallyItems.ADVANCED_COIL.get()) .define('C', ActuallyItems.ADVANCED_COIL.get())
.save(consumer); .save(recipeOutput);
//Drill //TODO the rest of the coloring recipes //Drill //TODO the rest of the coloring recipes
Recipe.shaped(ActuallyItems.DRILL_MAIN.get()) Recipe.shaped(ActuallyItems.DRILL_MAIN.get())
@ -227,7 +226,7 @@ public class ItemRecipeGenerator extends RecipeProvider {
.define('D', Tags.Items.GEMS_DIAMOND) .define('D', Tags.Items.GEMS_DIAMOND)
.define('C', ActuallyItems.ADVANCED_COIL.get()) .define('C', ActuallyItems.ADVANCED_COIL.get())
.define('R', ActuallyItems.DRILL_CORE.get()) .define('R', ActuallyItems.DRILL_CORE.get())
.define('I', ActuallyItems.ENORI_CRYSTAL.get()).save(consumer); .define('I', ActuallyItems.ENORI_CRYSTAL.get()).save(recipeOutput);
//Drill Core //Drill Core
Recipe.shaped(ActuallyItems.DRILL_CORE.get()) Recipe.shaped(ActuallyItems.DRILL_CORE.get())
@ -236,7 +235,7 @@ public class ItemRecipeGenerator extends RecipeProvider {
.pattern("ICI") .pattern("ICI")
.define('C', ActuallyItems.BASIC_COIL.get()) .define('C', ActuallyItems.BASIC_COIL.get())
.define('R', ActuallyItems.RESTONIA_CRYSTAL.get()) .define('R', ActuallyItems.RESTONIA_CRYSTAL.get())
.define('I', ActuallyItems.ENORI_CRYSTAL.get()).save(consumer); .define('I', ActuallyItems.ENORI_CRYSTAL.get()).save(recipeOutput);
//Tele Staff //Tele Staff
Recipe.shaped(ActuallyItems.TELEPORT_STAFF.get()) Recipe.shaped(ActuallyItems.TELEPORT_STAFF.get())
@ -246,7 +245,7 @@ public class ItemRecipeGenerator extends RecipeProvider {
.define('F', ActuallyItems.EMPOWERED_DIAMATINE_CRYSTAL.get()) .define('F', ActuallyItems.EMPOWERED_DIAMATINE_CRYSTAL.get())
.define('E', Tags.Items.ENDER_PEARLS) .define('E', Tags.Items.ENDER_PEARLS)
.define('S', ActuallyBlocks.ENDER_CASING.getItem()) .define('S', ActuallyBlocks.ENDER_CASING.getItem())
.define('B', ActuallyItems.SINGLE_BATTERY.get()).save(consumer); .define('B', ActuallyItems.SINGLE_BATTERY.get()).save(recipeOutput);
//Drill Speed upgrade //Drill Speed upgrade
Recipe.shaped(ActuallyItems.DRILL_UPGRADE_SPEED.get()) Recipe.shaped(ActuallyItems.DRILL_UPGRADE_SPEED.get())
@ -255,7 +254,7 @@ public class ItemRecipeGenerator extends RecipeProvider {
.pattern("ISI") .pattern("ISI")
.define('I', ActuallyItems.ENORI_CRYSTAL.get()) .define('I', ActuallyItems.ENORI_CRYSTAL.get())
.define('S', Items.SUGAR) .define('S', Items.SUGAR)
.define('R', ActuallyItems.RESTONIA_CRYSTAL.get()).save(consumer); .define('R', ActuallyItems.RESTONIA_CRYSTAL.get()).save(recipeOutput);
//Drill Speed upgrade II //Drill Speed upgrade II
Recipe.shaped(ActuallyItems.DRILL_UPGRADE_SPEED_II.get()) Recipe.shaped(ActuallyItems.DRILL_UPGRADE_SPEED_II.get())
@ -264,7 +263,7 @@ public class ItemRecipeGenerator extends RecipeProvider {
.pattern("ISI") .pattern("ISI")
.define('I', ActuallyItems.ENORI_CRYSTAL.get()) .define('I', ActuallyItems.ENORI_CRYSTAL.get())
.define('S', Items.SUGAR) .define('S', Items.SUGAR)
.define('R', Items.CAKE).save(consumer); .define('R', Items.CAKE).save(recipeOutput);
//Drill Speed upgrade III //Drill Speed upgrade III
Recipe.shaped(ActuallyItems.DRILL_UPGRADE_SPEED_III.get()) Recipe.shaped(ActuallyItems.DRILL_UPGRADE_SPEED_III.get())
@ -273,7 +272,7 @@ public class ItemRecipeGenerator extends RecipeProvider {
.pattern("ISI") .pattern("ISI")
.define('I', ActuallyItems.EMPOWERED_ENORI_CRYSTAL.get()) .define('I', ActuallyItems.EMPOWERED_ENORI_CRYSTAL.get())
.define('S', Items.SUGAR) .define('S', Items.SUGAR)
.define('R', ActuallyItems.EMPOWERED_DIAMATINE_CRYSTAL.get()).save(consumer); .define('R', ActuallyItems.EMPOWERED_DIAMATINE_CRYSTAL.get()).save(recipeOutput);
//Drill Fortune upgrade //Drill Fortune upgrade
Recipe.shaped(ActuallyItems.DRILL_UPGRADE_FORTUNE.get()) Recipe.shaped(ActuallyItems.DRILL_UPGRADE_FORTUNE.get())
@ -282,7 +281,7 @@ public class ItemRecipeGenerator extends RecipeProvider {
.pattern("ISI") .pattern("ISI")
.define('I', Items.GLOWSTONE) .define('I', Items.GLOWSTONE)
.define('S', Tags.Items.DUSTS_REDSTONE) .define('S', Tags.Items.DUSTS_REDSTONE)
.define('R', ActuallyBlocks.EMPOWERED_DIAMATINE_CRYSTAL.getItem()).save(consumer); .define('R', ActuallyBlocks.EMPOWERED_DIAMATINE_CRYSTAL.getItem()).save(recipeOutput);
//Drill Fortune upgrade II //Drill Fortune upgrade II
Recipe.shaped(ActuallyItems.DRILL_UPGRADE_FORTUNE_II.get()) Recipe.shaped(ActuallyItems.DRILL_UPGRADE_FORTUNE_II.get())
@ -291,7 +290,7 @@ public class ItemRecipeGenerator extends RecipeProvider {
.pattern("ISI") .pattern("ISI")
.define('I', Items.GLOWSTONE) .define('I', Items.GLOWSTONE)
.define('S', ActuallyItems.EMPOWERED_RESTONIA_CRYSTAL.get()) .define('S', ActuallyItems.EMPOWERED_RESTONIA_CRYSTAL.get())
.define('R', ActuallyBlocks.ENDER_CASING.getItem()).save(consumer); .define('R', ActuallyBlocks.ENDER_CASING.getItem()).save(recipeOutput);
//3x3 //3x3
Recipe.shaped(ActuallyItems.DRILL_UPGRADE_THREE_BY_THREE.get()) Recipe.shaped(ActuallyItems.DRILL_UPGRADE_THREE_BY_THREE.get())
@ -300,7 +299,7 @@ public class ItemRecipeGenerator extends RecipeProvider {
.pattern("DID") .pattern("DID")
.define('I', ActuallyItems.ENORI_CRYSTAL.get()) .define('I', ActuallyItems.ENORI_CRYSTAL.get())
.define('D', ActuallyItems.DIAMATINE_CRYSTAL.get()) .define('D', ActuallyItems.DIAMATINE_CRYSTAL.get())
.define('C', ActuallyItems.BASIC_COIL.get()).save(consumer); .define('C', ActuallyItems.BASIC_COIL.get()).save(recipeOutput);
//5x5 //5x5
Recipe.shaped(ActuallyItems.DRILL_UPGRADE_FIVE_BY_FIVE.get()) Recipe.shaped(ActuallyItems.DRILL_UPGRADE_FIVE_BY_FIVE.get())
@ -309,7 +308,7 @@ public class ItemRecipeGenerator extends RecipeProvider {
.pattern("DID") .pattern("DID")
.define('I', ActuallyItems.EMPOWERED_ENORI_CRYSTAL.get()) .define('I', ActuallyItems.EMPOWERED_ENORI_CRYSTAL.get())
.define('D', ActuallyItems.DIAMATINE_CRYSTAL.get()) .define('D', ActuallyItems.DIAMATINE_CRYSTAL.get())
.define('C', ActuallyItems.ADVANCED_COIL.get()).save(consumer); .define('C', ActuallyItems.ADVANCED_COIL.get()).save(recipeOutput);
//Silk Touch //Silk Touch
Recipe.shaped(ActuallyItems.DRILL_UPGRADE_SILK_TOUCH.get()) Recipe.shaped(ActuallyItems.DRILL_UPGRADE_SILK_TOUCH.get())
@ -318,7 +317,7 @@ public class ItemRecipeGenerator extends RecipeProvider {
.pattern("DSD") .pattern("DSD")
.define('D', ActuallyItems.EMERADIC_CRYSTAL.get()) .define('D', ActuallyItems.EMERADIC_CRYSTAL.get())
.define('S', ActuallyItems.DIAMATINE_CRYSTAL.get()) .define('S', ActuallyItems.DIAMATINE_CRYSTAL.get())
.define('C', ActuallyItems.ADVANCED_COIL.get()).save(consumer); .define('C', ActuallyItems.ADVANCED_COIL.get()).save(recipeOutput);
//Placing //Placing
Recipe.shaped(ActuallyItems.DRILL_UPGRADE_BLOCK_PLACING.get()) Recipe.shaped(ActuallyItems.DRILL_UPGRADE_BLOCK_PLACING.get())
@ -328,7 +327,7 @@ public class ItemRecipeGenerator extends RecipeProvider {
.define('C', Tags.Items.COBBLESTONE) .define('C', Tags.Items.COBBLESTONE)
.define('E', Items.PAPER) .define('E', Items.PAPER)
.define('A', ActuallyItems.BASIC_COIL.get()) .define('A', ActuallyItems.BASIC_COIL.get())
.define('R', ActuallyItems.ENORI_CRYSTAL.get()).save(consumer); .define('R', ActuallyItems.ENORI_CRYSTAL.get()).save(recipeOutput);
//Bat Wings //Bat Wings
Recipe.shaped(ActuallyItems.WINGS_OF_THE_BATS.get()) Recipe.shaped(ActuallyItems.WINGS_OF_THE_BATS.get())
@ -337,7 +336,7 @@ public class ItemRecipeGenerator extends RecipeProvider {
.pattern("WNW") .pattern("WNW")
.define('W', ActuallyItems.BATS_WING.get()) .define('W', ActuallyItems.BATS_WING.get())
.define('N', ActuallyBlocks.DIAMATINE_CRYSTAL.getItem()) .define('N', ActuallyBlocks.DIAMATINE_CRYSTAL.getItem())
.define('D', ActuallyItems.ENDER_STAR.get()).save(consumer); .define('D', ActuallyItems.ENDER_STAR.get()).save(recipeOutput);
//Coil //Coil
Recipe.shaped(ActuallyItems.BASIC_COIL.get()) Recipe.shaped(ActuallyItems.BASIC_COIL.get())
@ -345,7 +344,7 @@ public class ItemRecipeGenerator extends RecipeProvider {
.pattern("RIR") .pattern("RIR")
.pattern(" R ") .pattern(" R ")
.define('I', ActuallyItems.BLACK_QUARTZ.get()) .define('I', ActuallyItems.BLACK_QUARTZ.get())
.define('R', ActuallyItems.RESTONIA_CRYSTAL.get()).save(consumer); .define('R', ActuallyItems.RESTONIA_CRYSTAL.get()).save(recipeOutput);
//Advanced Coil //Advanced Coil
Recipe.shaped(ActuallyItems.ADVANCED_COIL.get()) Recipe.shaped(ActuallyItems.ADVANCED_COIL.get())
@ -353,7 +352,7 @@ public class ItemRecipeGenerator extends RecipeProvider {
.pattern("GCG") .pattern("GCG")
.pattern("GGG") .pattern("GGG")
.define('C', ActuallyItems.BASIC_COIL.get()) .define('C', ActuallyItems.BASIC_COIL.get())
.define('G', Items.GOLD_NUGGET).save(consumer); .define('G', Items.GOLD_NUGGET).save(recipeOutput);
//Battery //Battery
Recipe.shaped(ActuallyItems.SINGLE_BATTERY.get()) Recipe.shaped(ActuallyItems.SINGLE_BATTERY.get())
@ -363,7 +362,7 @@ public class ItemRecipeGenerator extends RecipeProvider {
.define('R', ActuallyItems.RESTONIA_CRYSTAL.get()) .define('R', ActuallyItems.RESTONIA_CRYSTAL.get())
.define('I', ActuallyItems.ENORI_CRYSTAL.get()) .define('I', ActuallyItems.ENORI_CRYSTAL.get())
.define('C', ActuallyItems.ADVANCED_COIL.get()) .define('C', ActuallyItems.ADVANCED_COIL.get())
.save(consumer); .save(recipeOutput);
// //Double Battery TODO: Flanks please fix these :) // //Double Battery TODO: Flanks please fix these :)
// Recipe.shaped(ActuallyItems.DOUBLE_BATTERY.get()) // Recipe.shaped(ActuallyItems.DOUBLE_BATTERY.get())
@ -412,7 +411,7 @@ public class ItemRecipeGenerator extends RecipeProvider {
.define('I', ActuallyItems.ENORI_CRYSTAL.get()) .define('I', ActuallyItems.ENORI_CRYSTAL.get())
.define('B', Items.LAPIS_LAZULI) .define('B', Items.LAPIS_LAZULI)
.define('O', ActuallyItems.RING.get()) .define('O', ActuallyItems.RING.get())
.save(consumer); .save(recipeOutput);
//Growth Ring //Growth Ring
Recipe.shaped(ActuallyItems.RING_OF_GROWTH.get()) Recipe.shaped(ActuallyItems.RING_OF_GROWTH.get())
@ -420,11 +419,11 @@ public class ItemRecipeGenerator extends RecipeProvider {
.define('S', Tags.Items.SEEDS) .define('S', Tags.Items.SEEDS)
.define('I', ActuallyItems.EMPOWERED_ENORI_CRYSTAL.get()) .define('I', ActuallyItems.EMPOWERED_ENORI_CRYSTAL.get())
.define('O', ActuallyItems.RING.get()) .define('O', ActuallyItems.RING.get())
.save(consumer); .save(recipeOutput);
Recipe.shapeless(ActuallyItems.CRAFTER_ON_A_STICK.get()).requires(Items.CRAFTING_TABLE).requires(ItemTags.SIGNS).save(consumer); Recipe.shapeless(ActuallyItems.CRAFTER_ON_A_STICK.get()).requires(Items.CRAFTING_TABLE).requires(ItemTags.SIGNS).save(recipeOutput);
RecipeOutput boolConsumer = consumer.withConditions(new BoolConfigCondition("tinyCoalStuff")); RecipeOutput boolConsumer = recipeOutput.withConditions(new BoolConfigCondition("tinyCoalStuff"));
Recipe.shapeless(ActuallyItems.TINY_COAL.get(), 8) Recipe.shapeless(ActuallyItems.TINY_COAL.get(), 8)
.requires(Items.COAL) .requires(Items.COAL)
@ -441,19 +440,19 @@ public class ItemRecipeGenerator extends RecipeProvider {
//Canola Seeds //Canola Seeds
Recipe.shapeless(ActuallyItems.CANOLA_SEEDS.get()) Recipe.shapeless(ActuallyItems.CANOLA_SEEDS.get())
.requires(ActuallyItems.CANOLA.get()) .requires(ActuallyItems.CANOLA.get())
.save(consumer); .save(recipeOutput);
//Rice Seeds //Rice Seeds
Recipe.shapeless(ActuallyItems.RICE_SEEDS.get()) Recipe.shapeless(ActuallyItems.RICE_SEEDS.get())
.requires(ActuallyItems.RICE.get()) .requires(ActuallyItems.RICE.get())
.save(consumer); .save(recipeOutput);
//Cup //Cup
Recipe.shaped(ActuallyItems.EMPTY_CUP.get()) Recipe.shaped(ActuallyItems.EMPTY_CUP.get())
.pattern("S S", "SCS", "SSS") .pattern("S S", "SCS", "SSS")
.define('S', Tags.Items.STONE) .define('S', Tags.Items.STONE)
.define('C', ActuallyItems.COFFEE_BEANS.get()) .define('C', ActuallyItems.COFFEE_BEANS.get())
.save(consumer); .save(recipeOutput);
//Phantom Connector //Phantom Connector
Recipe.shaped(ActuallyItems.PHANTOM_CONNECTOR.get()) Recipe.shaped(ActuallyItems.PHANTOM_CONNECTOR.get())
@ -461,7 +460,7 @@ public class ItemRecipeGenerator extends RecipeProvider {
.define('Y', Items.ENDER_EYE) .define('Y', Items.ENDER_EYE)
.define('E', Tags.Items.ENDER_PEARLS) .define('E', Tags.Items.ENDER_PEARLS)
.define('S', Tags.Items.RODS_WOODEN) .define('S', Tags.Items.RODS_WOODEN)
.save(consumer); .save(recipeOutput);
//Player Probe //Player Probe
Recipe.shaped(ActuallyItems.PLAYER_PROBE.get()) Recipe.shaped(ActuallyItems.PLAYER_PROBE.get())
@ -470,15 +469,15 @@ public class ItemRecipeGenerator extends RecipeProvider {
.define('R', ActuallyItems.EMPOWERED_RESTONIA_CRYSTAL.get()) .define('R', ActuallyItems.EMPOWERED_RESTONIA_CRYSTAL.get())
.define('H', Items.WITHER_SKELETON_SKULL) .define('H', Items.WITHER_SKELETON_SKULL)
.define('I', Items.IRON_HELMET) .define('I', Items.IRON_HELMET)
.save(consumer); .save(recipeOutput);
//Shards //Shards
addShard(consumer, ActuallyItems.VOID_CRYSTAL_SHARD, ActuallyItems.VOID_CRYSTAL); addShard(recipeOutput, ActuallyItems.VOID_CRYSTAL_SHARD, ActuallyItems.VOID_CRYSTAL);
addShard(consumer, ActuallyItems.ENORI_CRYSTAL_SHARD, ActuallyItems.ENORI_CRYSTAL); addShard(recipeOutput, ActuallyItems.ENORI_CRYSTAL_SHARD, ActuallyItems.ENORI_CRYSTAL);
addShard(consumer, ActuallyItems.RESTONIA_CRYSTAL_SHARD, ActuallyItems.RESTONIA_CRYSTAL); addShard(recipeOutput, ActuallyItems.RESTONIA_CRYSTAL_SHARD, ActuallyItems.RESTONIA_CRYSTAL);
addShard(consumer, ActuallyItems.PALIS_CRYSTAL_SHARD, ActuallyItems.PALIS_CRYSTAL); addShard(recipeOutput, ActuallyItems.PALIS_CRYSTAL_SHARD, ActuallyItems.PALIS_CRYSTAL);
addShard(consumer, ActuallyItems.DIAMATINE_CRYSTAL_SHARD, ActuallyItems.DIAMATINE_CRYSTAL); addShard(recipeOutput, ActuallyItems.DIAMATINE_CRYSTAL_SHARD, ActuallyItems.DIAMATINE_CRYSTAL);
addShard(consumer, ActuallyItems.EMERADIC_CRYSTAL_SHARD, ActuallyItems.EMERADIC_CRYSTAL); addShard(recipeOutput, ActuallyItems.EMERADIC_CRYSTAL_SHARD, ActuallyItems.EMERADIC_CRYSTAL);
// //Quartz // //Quartz

8
src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ActuallyRecipes.java
View file

@ -5,7 +5,9 @@ import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.world.item.crafting.RecipeSerializer; import net.minecraft.world.item.crafting.RecipeSerializer;
import net.minecraft.world.item.crafting.RecipeType; import net.minecraft.world.item.crafting.RecipeType;
import net.neoforged.bus.api.IEventBus; import net.neoforged.bus.api.IEventBus;
import net.neoforged.neoforge.common.crafting.IngredientType;
import net.neoforged.neoforge.registries.DeferredRegister; import net.neoforged.neoforge.registries.DeferredRegister;
import net.neoforged.neoforge.registries.NeoForgeRegistries;
import java.util.function.Supplier; import java.util.function.Supplier;
@ -14,6 +16,7 @@ public class ActuallyRecipes {
public static void init(IEventBus bus) { public static void init(IEventBus bus) {
SERIALIZERS.register(bus); SERIALIZERS.register(bus);
Ingredients.INGREDIENTS.register(bus);
Types.RECIPE_TYPES.register(bus); Types.RECIPE_TYPES.register(bus);
} }
@ -43,4 +46,9 @@ public class ActuallyRecipes {
public static final Supplier<RecipeType<ColorChangeRecipe>> COLOR_CHANGE = RECIPE_TYPES.register("color_change", () -> new RecipeType<>() {}); public static final Supplier<RecipeType<ColorChangeRecipe>> COLOR_CHANGE = RECIPE_TYPES.register("color_change", () -> new RecipeType<>() {});
public static final Supplier<RecipeType<MiningLensRecipe>> MINING_LENS = RECIPE_TYPES.register("mining_lens", () -> new RecipeType<>() {}); public static final Supplier<RecipeType<MiningLensRecipe>> MINING_LENS = RECIPE_TYPES.register("mining_lens", () -> new RecipeType<>() {});
} }
public static class Ingredients {
public static final DeferredRegister<IngredientType<?>> INGREDIENTS = DeferredRegister.create(NeoForgeRegistries.Keys.INGREDIENT_TYPES, ActuallyAdditions.MODID);
public static final Supplier<IngredientType<TargetNBTIngredient>> TARGET_NBT = INGREDIENTS.register("target_nbt", () -> new IngredientType<>(TargetNBTIngredient.CODEC));
}
} }

38
src/main/java/de/ellpeck/actuallyadditions/mod/crafting/RecipeKeepDataShaped.java
View file

@ -1,30 +1,22 @@
package de.ellpeck.actuallyadditions.mod.crafting; package de.ellpeck.actuallyadditions.mod.crafting;
import com.google.gson.JsonObject; import com.mojang.serialization.Codec;
import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
import net.minecraft.core.NonNullList; import net.minecraft.core.NonNullList;
import net.minecraft.core.RegistryAccess; import net.minecraft.core.RegistryAccess;
import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.inventory.CraftingContainer; import net.minecraft.world.inventory.CraftingContainer;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.crafting.CraftingBookCategory;
import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.item.crafting.Ingredient;
import net.minecraft.world.item.crafting.RecipeSerializer; import net.minecraft.world.item.crafting.RecipeSerializer;
import net.minecraft.world.item.crafting.ShapedRecipe; import net.minecraft.world.item.crafting.ShapedRecipe;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import javax.annotation.Nullable; import javax.annotation.Nullable;
public class RecipeKeepDataShaped extends ShapedRecipe { public class RecipeKeepDataShaped extends ShapedRecipe {
public static String NAME = "copy_nbt"; public static String NAME = "copy_nbt";
public static final Logger LOGGER = LogManager.getLogger();
public RecipeKeepDataShaped(ResourceLocation idIn, String groupIn, int recipeWidthIn, int recipeHeightIn, NonNullList<Ingredient> recipeItemsIn, ItemStack recipeOutputIn) {
super(idIn, groupIn, CraftingBookCategory.MISC, recipeWidthIn, recipeHeightIn, recipeItemsIn, recipeOutputIn);
}
public RecipeKeepDataShaped(ShapedRecipe shapedRecipe) { public RecipeKeepDataShaped(ShapedRecipe shapedRecipe) {
super(shapedRecipe.getId(), shapedRecipe.getGroup(), CraftingBookCategory.MISC, shapedRecipe.getRecipeWidth(), shapedRecipe.getRecipeHeight(), shapedRecipe.getIngredients(), shapedRecipe.getResultItem(null)); super(shapedRecipe.getGroup(), shapedRecipe.category(), shapedRecipe.pattern, shapedRecipe.getResultItem(null));
} }
@Override @Override
@ -62,21 +54,17 @@ public class RecipeKeepDataShaped extends ShapedRecipe {
} }
public static class Serializer implements RecipeSerializer<RecipeKeepDataShaped> { public static class Serializer implements RecipeSerializer<RecipeKeepDataShaped> {
@Nullable private static final Codec<RecipeKeepDataShaped> CODEC = ShapedRecipe.Serializer.CODEC.xmap(RecipeKeepDataShaped::new, $ -> $);
@Override
public RecipeKeepDataShaped fromNetwork(ResourceLocation recipeId, FriendlyByteBuf buffer) {
return new RecipeKeepDataShaped(RecipeSerializer.SHAPED_RECIPE.fromNetwork(recipeId, buffer));
}
@Override @Override
public RecipeKeepDataShaped fromJson(ResourceLocation recipeId, JsonObject json) { public Codec<RecipeKeepDataShaped> codec() {
try { return CODEC;
return new RecipeKeepDataShaped(RecipeSerializer.SHAPED_RECIPE.fromJson(recipeId, json)); }
}
catch (Exception exception) { @Nullable
LOGGER.info("Error reading "+ NAME +" Recipe from packet: ", exception); @Override
throw exception; public RecipeKeepDataShaped fromNetwork(FriendlyByteBuf buffer) {
} return new RecipeKeepDataShaped(RecipeSerializer.SHAPED_RECIPE.fromNetwork(buffer));
} }
@Override @Override
@ -85,7 +73,7 @@ public class RecipeKeepDataShaped extends ShapedRecipe {
RecipeSerializer.SHAPED_RECIPE.toNetwork(buffer, recipe); RecipeSerializer.SHAPED_RECIPE.toNetwork(buffer, recipe);
} }
catch (Exception exception) { catch (Exception exception) {
LOGGER.info("Error writing "+ NAME +" Recipe to packet: ", exception); ActuallyAdditions.LOGGER.info("Error writing "+ NAME +" Recipe to packet: ", exception);
throw exception; throw exception;
} }
} }

115
src/main/java/de/ellpeck/actuallyadditions/mod/crafting/TargetNBTIngredient.java
View file

@ -1,75 +1,40 @@
//package de.ellpeck.actuallyadditions.mod.crafting; package de.ellpeck.actuallyadditions.mod.crafting;
//
//import com.google.gson.JsonElement; import com.mojang.serialization.Codec;
//import com.google.gson.JsonObject; import net.minecraft.tags.TagKey;
//import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import net.minecraft.world.item.ItemStack;
//import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.item.crafting.Ingredient;
//import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.ItemLike;
//import net.minecraft.tags.TagKey; import org.jetbrains.annotations.Nullable;
//import net.minecraft.world.item.ItemStack;
//import net.minecraft.world.item.crafting.Ingredient; import java.util.Arrays;
//import net.minecraft.world.level.ItemLike; import java.util.stream.Stream;
//import net.neoforged.neoforge.common.crafting.IIngredientSerializer;
// public class TargetNBTIngredient extends Ingredient {
//import javax.annotation.Nonnull; public static final Codec<TargetNBTIngredient> CODEC = Ingredient.VANILLA_CODEC.xmap(TargetNBTIngredient::new, TargetNBTIngredient::new); //Wrapped in value sub-object
//import java.util.stream.Stream; /* public static final Codec<TargetNBTIngredient> CODEC =
// RecordCodecBuilder.create(builder -> builder.group(
//public class TargetNBTIngredient extends Ingredient { TODO: FLANKS PLEASE :D BuiltInRegistries.ITEM.byNameCodec().fieldOf( "item").forGetter(TargetNBTIngredient::getItem)
// public TargetNBTIngredient(Stream<? extends Value> itemLists) { ).apply(builder, TargetNBTIngredient::new));*/
// super(itemLists); public TargetNBTIngredient(Stream<? extends Value> itemLists) {
// } super(itemLists, ActuallyRecipes.Ingredients.TARGET_NBT);
// }
// @Override public TargetNBTIngredient(Ingredient ingredient) {
// @Nonnull super(Arrays.stream(ingredient.values), ActuallyRecipes.Ingredients.TARGET_NBT);
// public IIngredientSerializer<? extends Ingredient> getSerializer() { }
// return SERIALIZER;
// } @Override
// public boolean test(@Nullable ItemStack pStack) {
// public static TargetNBTIngredient of(ItemLike itemProvider) { return super.test(pStack);
// return new TargetNBTIngredient(Stream.of(new ItemValue(new ItemStack(itemProvider)))); }
// }
// public static TargetNBTIngredient of(ItemStack itemStack) { public static TargetNBTIngredient of(ItemLike itemProvider) {
// return new TargetNBTIngredient(Stream.of(new ItemValue(itemStack))); return new TargetNBTIngredient(Stream.of(new ItemValue(new ItemStack(itemProvider))));
// } }
// @Nonnull public static TargetNBTIngredient of(ItemStack itemStack) {
// public static TargetNBTIngredient of(@Nonnull TagKey tag) { return new TargetNBTIngredient(Stream.of(new ItemValue(itemStack)));
// return new TargetNBTIngredient(Stream.of(new TagValue(tag))); }
// } public static TargetNBTIngredient of(TagKey tag) {
// return new TargetNBTIngredient(Stream.of(new TagValue(tag)));
// }
// }
// @Override
// @Nonnull
// public JsonElement toJson() {
// JsonObject tmp = super.toJson().getAsJsonObject();
// tmp.addProperty("type", Serializer.NAME.toString());
// return tmp;
// }
//
//
// public static Serializer SERIALIZER = new Serializer();
// public static class Serializer implements IIngredientSerializer<TargetNBTIngredient> {
// public static ResourceLocation NAME = new ResourceLocation(ActuallyAdditions.MODID, "nbt_target");
//
// @Override
// @Nonnull
// public TargetNBTIngredient parse(FriendlyByteBuf buffer) {
// return new TargetNBTIngredient(Stream.generate(() -> new ItemValue(buffer.readItem())).limit(buffer.readVarInt()));
// }
//
// @Override
// @Nonnull
// public TargetNBTIngredient parse(@Nonnull JsonObject json) {
// return new TargetNBTIngredient(Stream.of(Ingredient.valueFromJson(json)));
// }
//
// @Override
// public void write(FriendlyByteBuf buffer, TargetNBTIngredient ingredient) {
// ItemStack[] items = ingredient.getItems();
// buffer.writeVarInt(items.length);
//
// for (ItemStack stack : items)
// buffer.writeItem(stack);
// }
// }
//}

20
src/main/java/de/ellpeck/actuallyadditions/mod/tile/FilterSettings.java
View file

@ -35,13 +35,21 @@ public class FilterSettings {
} }
public FilterSettings(int slots, boolean defaultWhitelist, boolean defaultRespectNBT, boolean defaultRespectMod) { public FilterSettings(int slots, boolean defaultWhitelist, boolean defaultRespectNBT, boolean defaultRespectMod) {
this.filterInventory = new ItemStackHandlerAA(slots); this.filterInventory = new ItemStackHandlerAA(slots) {
@Override
protected void onContentsChanged(int slot) {
super.onContentsChanged(slot);
FilterSettings.this.onContentsChanged();
}
};
this.isWhitelist = defaultWhitelist; this.isWhitelist = defaultWhitelist;
this.respectNBT = defaultRespectNBT; this.respectNBT = defaultRespectNBT;
this.respectMod = defaultRespectMod; this.respectMod = defaultRespectMod;
} }
public void onContentsChanged() {}
public static boolean check(ItemStack stack, ItemStackHandlerAA filter, boolean whitelist, boolean nbt, boolean mod) { public static boolean check(ItemStack stack, ItemStackHandlerAA filter, boolean whitelist, boolean nbt, boolean mod) {
if (!stack.isEmpty()) { if (!stack.isEmpty()) {
for (int i = 0; i < filter.getSlots(); i++) { for (int i = 0; i < filter.getSlots(); i++) {
@ -77,11 +85,7 @@ public class FilterSettings {
return false; return false;
} }
boolean nbtFine = !nbt || ItemStack.isSameItemSameTags(first, second); return !nbt || ItemStack.isSameItemSameTags(first, second);
if (nbtFine) {
return true;
}
return false;
} }
public void writeToNBT(CompoundTag tag, String name) { public void writeToNBT(CompoundTag tag, String name) {
@ -89,7 +93,7 @@ public class FilterSettings {
compound.putBoolean("Whitelist", this.isWhitelist); compound.putBoolean("Whitelist", this.isWhitelist);
compound.putBoolean("NBT", this.respectNBT); compound.putBoolean("NBT", this.respectNBT);
compound.putBoolean("Mod", this.respectMod); compound.putBoolean("Mod", this.respectMod);
TileEntityInventoryBase.saveSlots(this.filterInventory, compound); compound.put("Items", filterInventory.serializeNBT());
tag.put(name, compound); tag.put(name, compound);
} }
@ -98,7 +102,7 @@ public class FilterSettings {
this.isWhitelist = compound.getBoolean("Whitelist"); this.isWhitelist = compound.getBoolean("Whitelist");
this.respectNBT = compound.getBoolean("NBT"); this.respectNBT = compound.getBoolean("NBT");
this.respectMod = compound.getBoolean("Mod"); this.respectMod = compound.getBoolean("Mod");
TileEntityInventoryBase.loadSlots(this.filterInventory, compound); this.filterInventory.deserializeNBT(compound.getCompound("Items"));
} }
public boolean needsUpdateSend() { public boolean needsUpdateSend() {

33
src/main/java/de/ellpeck/actuallyadditions/mod/util/CapHelper.java Normal file
View file

@ -0,0 +1,33 @@
package de.ellpeck.actuallyadditions.mod.util;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.state.BlockState;
import net.neoforged.neoforge.capabilities.Capabilities;
import net.neoforged.neoforge.items.IItemHandler;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.Optional;
public class CapHelper {
@Nonnull
public static Optional<IItemHandler> getItemHandler(@Nonnull Level level, @Nonnull BlockPos pos, @Nullable Direction side) {
BlockState blockState = level.getBlockState(pos);
if (blockState.hasBlockEntity()) {
BlockEntity blockEntity = level.getBlockEntity(pos);
if (blockEntity != null) {
return Optional.ofNullable(level.getCapability(Capabilities.ItemHandler.BLOCK, pos, level.getBlockState(pos), blockEntity, side));
}
}
return Optional.empty();
}
@Nonnull
public static Optional<IItemHandler> getItemHandler(ItemStack stack) {
return Optional.ofNullable(stack.getCapability(Capabilities.ItemHandler.ITEM));
}
}

29
src/main/java/de/ellpeck/actuallyadditions/mod/util/NoAdvRecipeOutput.java Normal file
View file

@ -0,0 +1,29 @@
package de.ellpeck.actuallyadditions.mod.util;
import net.minecraft.advancements.Advancement;
import net.minecraft.advancements.AdvancementHolder;
import net.minecraft.data.recipes.RecipeOutput;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.crafting.Recipe;
import net.neoforged.neoforge.common.conditions.ICondition;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
public class NoAdvRecipeOutput implements RecipeOutput {
private final RecipeOutput inner;
public NoAdvRecipeOutput(RecipeOutput output) {
inner = output;
}
@Nonnull
@Override
public Advancement.Builder advancement() {
return inner.advancement();
}
@Override
public void accept(@Nonnull ResourceLocation resourceLocation, @Nonnull Recipe<?> recipe, @Nullable AdvancementHolder advancementHolder, @Nonnull ICondition... iConditions) {
inner.accept(resourceLocation, recipe, null, iConditions);
}
}

32
src/main/java/de/ellpeck/actuallyadditions/mod/util/RecipeInjector.java Normal file
View file

@ -0,0 +1,32 @@
package de.ellpeck.actuallyadditions.mod.util;
import net.minecraft.advancements.Advancement;
import net.minecraft.advancements.AdvancementHolder;
import net.minecraft.data.recipes.RecipeOutput;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.crafting.Recipe;
import net.neoforged.neoforge.common.conditions.ICondition;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.function.Function;
@SuppressWarnings("unchecked")
public class RecipeInjector<T extends Recipe<?>> implements RecipeOutput {
private final RecipeOutput inner;
private final Function<T, ? extends T> constructor;
public RecipeInjector(RecipeOutput output, Function<T, ? extends T> constructorIn) {
inner = output;
this.constructor = constructorIn;
}
@Nonnull
@Override
public Advancement.Builder advancement() {
return inner.advancement();
}
@Override
public void accept(@Nonnull ResourceLocation resourceLocation, @Nonnull Recipe<?> recipe, @Nullable AdvancementHolder advancementHolder, @Nonnull ICondition... iConditions) {
inner.accept(resourceLocation, constructor.apply((T) recipe), advancementHolder, iConditions);
}
}

42
src/main/java/de/ellpeck/actuallyadditions/mod/util/RecipeUnlocker.java Normal file
View file

@ -0,0 +1,42 @@
package de.ellpeck.actuallyadditions.mod.util;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.entity.player.Player;
import net.neoforged.bus.api.IEventBus;
import net.neoforged.neoforge.event.entity.player.PlayerEvent;
import java.util.ArrayList;
public class RecipeUnlocker {
private static String modtag;
private static int version;
private static String MODID;
public static void register(String modid, IEventBus bus, int recipeversion) {
modtag = modid + "_unlocked";
version = recipeversion;
MODID = modid;
bus.addListener(RecipeUnlocker::onPlayerLoggedIn);
}
private static void onPlayerLoggedIn(PlayerEvent.PlayerLoggedInEvent event) {
Player player = event.getEntity();
CompoundTag tag = player.getPersistentData();
if (tag.contains(modtag) && tag.getInt(modtag) >= version) {
return;
}
if (player instanceof ServerPlayer) {
MinecraftServer server = player.getServer();
if (server != null) {
var recipes = new ArrayList<>(server.getRecipeManager().getRecipes());
recipes.removeIf((recipe -> !recipe.id().getNamespace().contains(MODID)));
player.awardRecipes(recipes);
tag.putInt(modtag, version);
}
}
}
}

3
src/main/resources/META-INF/accesstransformer.cfg
View file

@ -1,3 +1,4 @@
public net.minecraft.world.damagesource.DamageSources *() # DamageSources public net.minecraft.world.damagesource.DamageSources *() # DamageSources
public net.minecraft.world.damagesource.DamageSources damageTypes public net.minecraft.world.damagesource.DamageSources damageTypes
public-f net.minecraft.data.recipes.RecipeProvider getName()Ljava/lang/String; public-f net.minecraft.data.recipes.RecipeProvider getName()Ljava/lang/String;
public net.minecraft.world.item.crafting.ShapedRecipe pattern # pattern