Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-21 23:13:28 +01:00
Code Issues Projects Releases Wiki Activity

Added reset recipes for machines that retain contents.

Browse source
This commit is contained in:
Flanks255 2024-11-07 17:57:28 -06:00
parent 2b8884da3e
commit a85dcdc0f8
20 changed files with 268 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/generated/resources/.cache/9cf54cdf67e16111ec482a2a3b607e8fd75a4246
View file

@ -1,4 +1,4 @@
// 1.21.1 2024-10-16T22:05:14.5301488 Item Recipes
// 1.21.1 2024-11-07T15:26:09.7156836 Item Recipes
14bd5bc2ee3e84b6f3a3181c0e0efd40df5f1d84 data/actuallyadditions/recipe/advanced_coil.json
955aad6c1def123a6adbaeabb13faa6eedce847f data/actuallyadditions/recipe/advanced_leaf_blower.json
97e7ba64f5054b030f4e49615dc4212a28ca9be1 data/actuallyadditions/recipe/basic_coil.json
@ -102,6 +102,23 @@ a87ce0c47d97dffb4aae7b22d014007a6c9594a5 data/actuallyadditions/recipe/phantom_c
f471f62cce2a66b1abcb20ac2f04a721cb502c82 data/actuallyadditions/recipe/player_probe.json
a63510c304f5b5d0f814f75210b99b02e643fde5 data/actuallyadditions/recipe/quadruple_battery.json
27a066dffb4934fada9191452dcc1865670d7785 data/actuallyadditions/recipe/quintuple_battery.json
766aa4277b3d9f3013e91099bbd0cc93701d0c1c data/actuallyadditions/recipe/reset/atomic_reconstructor.json
f0fcec31dbca65ab1f7debcd4c36cb55b24fac7c data/actuallyadditions/recipe/reset/breaker.json
41ef3599fc2a94c3b99975aed88d5299ffaca8d3 data/actuallyadditions/recipe/reset/canola_press.json
3d9137796f2b14541b61814a380e2077bd1d3e98 data/actuallyadditions/recipe/reset/coal_generator.json
70be7544916763f74297a29017d41b4aef913bd4 data/actuallyadditions/recipe/reset/coffee_machine.json
1e98eab64a166305639d9bc9bec90e7ac18e4c9e data/actuallyadditions/recipe/reset/crusher.json
665029d430d9e4212c3e19d6e9e631bfa01c927a data/actuallyadditions/recipe/reset/crusher_double.json
0477029ac0df30077cdb7326756ec6629f10a71c data/actuallyadditions/recipe/reset/display_stand.json
64c43e0d73c4da97adc81381278fd60412e82e42 data/actuallyadditions/recipe/reset/dropper.json
52b180afdc6ca7ece2e290fde3bbd8ff1c474710 data/actuallyadditions/recipe/reset/farmer.json
5c6766ddac0b09c138471ff9f06f8044c0bfe992 data/actuallyadditions/recipe/reset/fermenting_barrel.json
e53a990694951b5b47fa52c0d52842de7649cedb data/actuallyadditions/recipe/reset/fluid_collector.json
35b80e07e40060af13a8666e753356918ee1978d data/actuallyadditions/recipe/reset/fluid_placer.json
8a570904919955a7d133a858ca19c6211b265036 data/actuallyadditions/recipe/reset/leaf_generator.json
92f9bb62415383f6e00bdb4f1641ed1f83554ef8 data/actuallyadditions/recipe/reset/oil_generator.json
f90b544db04bbb20664268451738cf907d06c4a6 data/actuallyadditions/recipe/reset/placer.json
a97b7e4418bb22002914b1e2d4283a4394356607 data/actuallyadditions/recipe/reset/powered_furnace.json
f4390d29692bc7255e4f71dd8c7a1889a08472a0 data/actuallyadditions/recipe/rice_dough.json
8387752b39fe9b367e409e4ee1d70227830a4720 data/actuallyadditions/recipe/rice_dough_smelting.json
f7b4a51bf6bcaee860b68bfd2dc40a6b0bfff6bc data/actuallyadditions/recipe/rice_paper.json

13
src/generated/resources/data/actuallyadditions/recipe/reset/atomic_reconstructor.json Normal file
View file

@ -0,0 +1,13 @@
{
"type": "minecraft:crafting_shapeless",
"category": "misc",
"ingredients": [
{
"item": "actuallyadditions:atomic_reconstructor"
}
],
"result": {
"count": 1,
"id": "actuallyadditions:atomic_reconstructor"
}
}

13
src/generated/resources/data/actuallyadditions/recipe/reset/breaker.json Normal file
View file

@ -0,0 +1,13 @@
{
"type": "minecraft:crafting_shapeless",
"category": "misc",
"ingredients": [
{
"item": "actuallyadditions:breaker"
}
],
"result": {
"count": 1,
"id": "actuallyadditions:breaker"
}
}

13
src/generated/resources/data/actuallyadditions/recipe/reset/canola_press.json Normal file
View file

@ -0,0 +1,13 @@
{
"type": "minecraft:crafting_shapeless",
"category": "misc",
"ingredients": [
{
"item": "actuallyadditions:canola_press"
}
],
"result": {
"count": 1,
"id": "actuallyadditions:canola_press"
}
}

13
src/generated/resources/data/actuallyadditions/recipe/reset/coal_generator.json Normal file
View file

@ -0,0 +1,13 @@
{
"type": "minecraft:crafting_shapeless",
"category": "misc",
"ingredients": [
{
"item": "actuallyadditions:coal_generator"
}
],
"result": {
"count": 1,
"id": "actuallyadditions:coal_generator"
}
}

13
src/generated/resources/data/actuallyadditions/recipe/reset/coffee_machine.json Normal file
View file

@ -0,0 +1,13 @@
{
"type": "minecraft:crafting_shapeless",
"category": "misc",
"ingredients": [
{
"item": "actuallyadditions:coffee_machine"
}
],
"result": {
"count": 1,
"id": "actuallyadditions:coffee_machine"
}
}

13
src/generated/resources/data/actuallyadditions/recipe/reset/crusher.json Normal file
View file

@ -0,0 +1,13 @@
{
"type": "minecraft:crafting_shapeless",
"category": "misc",
"ingredients": [
{
"item": "actuallyadditions:crusher"
}
],
"result": {
"count": 1,
"id": "actuallyadditions:crusher"
}
}

13
src/generated/resources/data/actuallyadditions/recipe/reset/crusher_double.json Normal file
View file

@ -0,0 +1,13 @@
{
"type": "minecraft:crafting_shapeless",
"category": "misc",
"ingredients": [
{
"item": "actuallyadditions:crusher_double"
}
],
"result": {
"count": 1,
"id": "actuallyadditions:crusher_double"
}
}

13
src/generated/resources/data/actuallyadditions/recipe/reset/display_stand.json Normal file
View file

@ -0,0 +1,13 @@
{
"type": "minecraft:crafting_shapeless",
"category": "misc",
"ingredients": [
{
"item": "actuallyadditions:display_stand"
}
],
"result": {
"count": 1,
"id": "actuallyadditions:display_stand"
}
}

13
src/generated/resources/data/actuallyadditions/recipe/reset/dropper.json Normal file
View file

@ -0,0 +1,13 @@
{
"type": "minecraft:crafting_shapeless",
"category": "misc",
"ingredients": [
{
"item": "actuallyadditions:dropper"
}
],
"result": {
"count": 1,
"id": "actuallyadditions:dropper"
}
}

13
src/generated/resources/data/actuallyadditions/recipe/reset/farmer.json Normal file
View file

@ -0,0 +1,13 @@
{
"type": "minecraft:crafting_shapeless",
"category": "misc",
"ingredients": [
{
"item": "actuallyadditions:farmer"
}
],
"result": {
"count": 1,
"id": "actuallyadditions:farmer"
}
}

13
src/generated/resources/data/actuallyadditions/recipe/reset/fermenting_barrel.json Normal file
View file

@ -0,0 +1,13 @@
{
"type": "minecraft:crafting_shapeless",
"category": "misc",
"ingredients": [
{
"item": "actuallyadditions:fermenting_barrel"
}
],
"result": {
"count": 1,
"id": "actuallyadditions:fermenting_barrel"
}
}

13
src/generated/resources/data/actuallyadditions/recipe/reset/fluid_collector.json Normal file
View file

@ -0,0 +1,13 @@
{
"type": "minecraft:crafting_shapeless",
"category": "misc",
"ingredients": [
{
"item": "actuallyadditions:fluid_collector"
}
],
"result": {
"count": 1,
"id": "actuallyadditions:fluid_collector"
}
}

13
src/generated/resources/data/actuallyadditions/recipe/reset/fluid_placer.json Normal file
View file

@ -0,0 +1,13 @@
{
"type": "minecraft:crafting_shapeless",
"category": "misc",
"ingredients": [
{
"item": "actuallyadditions:fluid_placer"
}
],
"result": {
"count": 1,
"id": "actuallyadditions:fluid_placer"
}
}

13
src/generated/resources/data/actuallyadditions/recipe/reset/leaf_generator.json Normal file
View file

@ -0,0 +1,13 @@
{
"type": "minecraft:crafting_shapeless",
"category": "misc",
"ingredients": [
{
"item": "actuallyadditions:leaf_generator"
}
],
"result": {
"count": 1,
"id": "actuallyadditions:leaf_generator"
}
}

13
src/generated/resources/data/actuallyadditions/recipe/reset/oil_generator.json Normal file
View file

@ -0,0 +1,13 @@
{
"type": "minecraft:crafting_shapeless",
"category": "misc",
"ingredients": [
{
"item": "actuallyadditions:oil_generator"
}
],
"result": {
"count": 1,
"id": "actuallyadditions:oil_generator"
}
}

13
src/generated/resources/data/actuallyadditions/recipe/reset/placer.json Normal file
View file

@ -0,0 +1,13 @@
{
"type": "minecraft:crafting_shapeless",
"category": "misc",
"ingredients": [
{
"item": "actuallyadditions:placer"
}
],
"result": {
"count": 1,
"id": "actuallyadditions:placer"
}
}

13
src/generated/resources/data/actuallyadditions/recipe/reset/powered_furnace.json Normal file
View file

@ -0,0 +1,13 @@
{
"type": "minecraft:crafting_shapeless",
"category": "misc",
"ingredients": [
{
"item": "actuallyadditions:powered_furnace"
}
],
"result": {
"count": 1,
"id": "actuallyadditions:powered_furnace"
}
}

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

@ -10,6 +10,7 @@ import de.ellpeck.actuallyadditions.mod.crafting.TargetNBTIngredient;
import de.ellpeck.actuallyadditions.mod.items.ActuallyItems;
import de.ellpeck.actuallyadditions.mod.util.NoAdvRecipeOutput;
import de.ellpeck.actuallyadditions.mod.util.RecipeInjector;
import de.ellpeck.actuallyadditions.registration.AABlockReg;
import net.minecraft.core.HolderLookup;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.core.registries.Registries;
@ -609,6 +610,33 @@ public class ItemRecipeGenerator extends RecipeProvider {
.requires(ActuallyItems.ITEM_BOOKLET.get())
.requires(Items.PAPER)
.save(recipeOutput);
// Reset Recipes
generateReset(ActuallyBlocks.OIL_GENERATOR, recipeOutput);
generateReset(ActuallyBlocks.COAL_GENERATOR, recipeOutput);
generateReset(ActuallyBlocks.LEAF_GENERATOR, recipeOutput);
generateReset(ActuallyBlocks.POWERED_FURNACE, recipeOutput);
generateReset(ActuallyBlocks.CRUSHER, recipeOutput);
generateReset(ActuallyBlocks.CRUSHER_DOUBLE, recipeOutput);
generateReset(ActuallyBlocks.DISPLAY_STAND, recipeOutput);
generateReset(ActuallyBlocks.ATOMIC_RECONSTRUCTOR, recipeOutput);
generateReset(ActuallyBlocks.FARMER, recipeOutput);
generateReset(ActuallyBlocks.DROPPER, recipeOutput);
generateReset(ActuallyBlocks.PLACER, recipeOutput);
generateReset(ActuallyBlocks.BREAKER, recipeOutput);
generateReset(ActuallyBlocks.FLUID_COLLECTOR, recipeOutput);
generateReset(ActuallyBlocks.FLUID_PLACER, recipeOutput);
generateReset(ActuallyBlocks.COFFEE_MACHINE, recipeOutput);
generateReset(ActuallyBlocks.CANOLA_PRESS, recipeOutput);
generateReset(ActuallyBlocks.FERMENTING_BARREL, recipeOutput);
}
protected void generateReset(@Nonnull AABlockReg<?, ?, ?> item, @Nonnull RecipeOutput consumer) {
Recipe.shapeless(item.getItem())
.ingredients(item.getItem())
.name(ActuallyAdditions.modLoc("reset/" + item.getName()))
.save(consumer);
}
protected void generateAOIT(RecipeOutput consumer) {

2
src/main/java/de/ellpeck/actuallyadditions/registration/AABlockReg.java
View file

@ -44,7 +44,7 @@ public class AABlockReg<B extends Block, I extends Item, T extends BlockEntity>
*/
public String getName() {return name;}
public String getName() { return name; }
@Override
public Block get() {