[Change] Moved Alloying Recipes to BCLib
This commit is contained in:
Frank
parent
34d55debce
commit
e45eade668
19 changed files with 72 additions and 471 deletions
|
|
@ -1,6 +1,6 @@
|
|||
package org.betterx.betterend.recipe;
|
||||
|
||||
import org.betterx.betterend.recipe.builders.AlloyingRecipe;
|
||||
import org.betterx.betterend.recipe.builders.AlloyingRecipeBuilder;
|
||||
import org.betterx.betterend.registry.EndBlocks;
|
||||
import org.betterx.betterend.registry.EndItems;
|
||||
import org.betterx.betterend.registry.EndTags;
|
||||
|
|
@ -10,44 +10,44 @@ import net.minecraft.world.level.block.Blocks;
|
|||
|
||||
public class AlloyingRecipes {
|
||||
public static void register() {
|
||||
AlloyingRecipe.Builder.create("additional_iron")
|
||||
.setInput(EndTags.ALLOYING_IRON, EndTags.ALLOYING_IRON)
|
||||
.setOutput(Items.IRON_INGOT, 3)
|
||||
.setExpiriense(2.1F)
|
||||
.build();
|
||||
AlloyingRecipe.Builder.create("additional_gold")
|
||||
.setInput(EndTags.ALLOYING_GOLD, EndTags.ALLOYING_GOLD)
|
||||
.setOutput(Items.GOLD_INGOT, 3)
|
||||
.setExpiriense(3F)
|
||||
.build();
|
||||
AlloyingRecipe.Builder.create("additional_copper")
|
||||
.setInput(EndTags.ALLOYING_COPPER, EndTags.ALLOYING_COPPER)
|
||||
.setOutput(Items.COPPER_INGOT, 3)
|
||||
.setExpiriense(3F)
|
||||
.build();
|
||||
AlloyingRecipe.Builder.create("additional_netherite")
|
||||
.setInput(Blocks.ANCIENT_DEBRIS, Blocks.ANCIENT_DEBRIS)
|
||||
.setOutput(Items.NETHERITE_SCRAP, 3)
|
||||
.setExpiriense(6F)
|
||||
.setSmeltTime(1000)
|
||||
.build();
|
||||
AlloyingRecipe.Builder.create("terminite_ingot")
|
||||
.setInput(Items.IRON_INGOT, EndItems.ENDER_DUST)
|
||||
.setOutput(EndBlocks.TERMINITE.ingot, 1)
|
||||
.setExpiriense(2.5F)
|
||||
.setSmeltTime(450)
|
||||
.build();
|
||||
AlloyingRecipe.Builder.create("aeternium_ingot")
|
||||
.setInput(EndBlocks.TERMINITE.ingot, Items.NETHERITE_INGOT)
|
||||
.setOutput(EndItems.AETERNIUM_INGOT, 1)
|
||||
.setExpiriense(4.5F)
|
||||
.setSmeltTime(850)
|
||||
.build();
|
||||
AlloyingRecipe.Builder.create("terminite_ingot_thallasium")
|
||||
.setInput(EndBlocks.THALLASIUM.ingot, EndItems.ENDER_DUST)
|
||||
.setOutput(EndBlocks.TERMINITE.ingot, 1)
|
||||
.setExpiriense(2.5F)
|
||||
.setSmeltTime(450)
|
||||
.build();
|
||||
AlloyingRecipeBuilder.create("additional_iron")
|
||||
.setInput(EndTags.ALLOYING_IRON, EndTags.ALLOYING_IRON)
|
||||
.setOutput(Items.IRON_INGOT, 3)
|
||||
.setExpiriense(2.1F)
|
||||
.build();
|
||||
AlloyingRecipeBuilder.create("additional_gold")
|
||||
.setInput(EndTags.ALLOYING_GOLD, EndTags.ALLOYING_GOLD)
|
||||
.setOutput(Items.GOLD_INGOT, 3)
|
||||
.setExpiriense(3F)
|
||||
.build();
|
||||
AlloyingRecipeBuilder.create("additional_copper")
|
||||
.setInput(EndTags.ALLOYING_COPPER, EndTags.ALLOYING_COPPER)
|
||||
.setOutput(Items.COPPER_INGOT, 3)
|
||||
.setExpiriense(3F)
|
||||
.build();
|
||||
AlloyingRecipeBuilder.create("additional_netherite")
|
||||
.setInput(Blocks.ANCIENT_DEBRIS, Blocks.ANCIENT_DEBRIS)
|
||||
.setOutput(Items.NETHERITE_SCRAP, 3)
|
||||
.setExpiriense(6F)
|
||||
.setSmeltTime(1000)
|
||||
.build();
|
||||
AlloyingRecipeBuilder.create("terminite_ingot")
|
||||
.setInput(Items.IRON_INGOT, EndItems.ENDER_DUST)
|
||||
.setOutput(EndBlocks.TERMINITE.ingot, 1)
|
||||
.setExpiriense(2.5F)
|
||||
.setSmeltTime(450)
|
||||
.build();
|
||||
AlloyingRecipeBuilder.create("aeternium_ingot")
|
||||
.setInput(EndBlocks.TERMINITE.ingot, Items.NETHERITE_INGOT)
|
||||
.setOutput(EndItems.AETERNIUM_INGOT, 1)
|
||||
.setExpiriense(4.5F)
|
||||
.setSmeltTime(850)
|
||||
.build();
|
||||
AlloyingRecipeBuilder.create("terminite_ingot_thallasium")
|
||||
.setInput(EndBlocks.THALLASIUM.ingot, EndItems.ENDER_DUST)
|
||||
.setOutput(EndBlocks.TERMINITE.ingot, 1)
|
||||
.setExpiriense(2.5F)
|
||||
.setSmeltTime(450)
|
||||
.build();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,301 +0,0 @@
|
|||
package org.betterx.betterend.recipe.builders;
|
||||
|
||||
import org.betterx.bclib.interfaces.UnknownReceipBookCategory;
|
||||
import org.betterx.bclib.recipes.BCLRecipeManager;
|
||||
import org.betterx.bclib.util.ItemUtil;
|
||||
import org.betterx.bclib.util.RecipeHelper;
|
||||
import org.betterx.betterend.BetterEnd;
|
||||
import org.betterx.betterend.config.Configs;
|
||||
import org.betterx.betterend.registry.EndBlocks;
|
||||
|
||||
import net.minecraft.core.NonNullList;
|
||||
import net.minecraft.network.FriendlyByteBuf;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.tags.TagKey;
|
||||
import net.minecraft.util.GsonHelper;
|
||||
import net.minecraft.world.Container;
|
||||
import net.minecraft.world.item.Item;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import net.minecraft.world.item.crafting.Ingredient;
|
||||
import net.minecraft.world.item.crafting.Recipe;
|
||||
import net.minecraft.world.item.crafting.RecipeSerializer;
|
||||
import net.minecraft.world.item.crafting.RecipeType;
|
||||
import net.minecraft.world.level.ItemLike;
|
||||
import net.minecraft.world.level.Level;
|
||||
|
||||
import net.fabricmc.api.EnvType;
|
||||
import net.fabricmc.api.Environment;
|
||||
|
||||
import com.google.gson.JsonArray;
|
||||
import com.google.gson.JsonObject;
|
||||
|
||||
public class AlloyingRecipe implements Recipe<Container>, UnknownReceipBookCategory {
|
||||
public final static String GROUP = "alloying";
|
||||
public final static RecipeType<AlloyingRecipe> TYPE = BCLRecipeManager.registerType(BetterEnd.MOD_ID, GROUP);
|
||||
public final static Serializer SERIALIZER = BCLRecipeManager.registerSerializer(
|
||||
BetterEnd.MOD_ID,
|
||||
GROUP,
|
||||
new Serializer()
|
||||
);
|
||||
|
||||
protected final RecipeType<?> type;
|
||||
protected final ResourceLocation id;
|
||||
protected final Ingredient primaryInput;
|
||||
protected final Ingredient secondaryInput;
|
||||
protected final ItemStack output;
|
||||
protected final String group;
|
||||
protected final float experience;
|
||||
protected final int smeltTime;
|
||||
|
||||
public AlloyingRecipe(
|
||||
ResourceLocation id,
|
||||
String group,
|
||||
Ingredient primaryInput,
|
||||
Ingredient secondaryInput,
|
||||
ItemStack output,
|
||||
float experience,
|
||||
int smeltTime
|
||||
) {
|
||||
this.group = group;
|
||||
this.id = id;
|
||||
this.primaryInput = primaryInput;
|
||||
this.secondaryInput = secondaryInput;
|
||||
this.output = output;
|
||||
this.experience = experience;
|
||||
this.smeltTime = smeltTime;
|
||||
this.type = TYPE;
|
||||
}
|
||||
|
||||
public float getExperience() {
|
||||
return this.experience;
|
||||
}
|
||||
|
||||
public int getSmeltTime() {
|
||||
return this.smeltTime;
|
||||
}
|
||||
|
||||
@Override
|
||||
public NonNullList<Ingredient> getIngredients() {
|
||||
NonNullList<Ingredient> defaultedList = NonNullList.create();
|
||||
defaultedList.add(primaryInput);
|
||||
defaultedList.add(secondaryInput);
|
||||
|
||||
return defaultedList;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean matches(Container inv, Level world) {
|
||||
return this.primaryInput.test(inv.getItem(0)) && this.secondaryInput.test(inv.getItem(1)) || this.primaryInput.test(
|
||||
inv.getItem(1)) && this.secondaryInput.test(inv.getItem(0));
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack assemble(Container inv) {
|
||||
return this.output.copy();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canCraftInDimensions(int width, int height) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getResultItem() {
|
||||
return this.output;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResourceLocation getId() {
|
||||
return this.id;
|
||||
}
|
||||
|
||||
@Override
|
||||
public RecipeSerializer<?> getSerializer() {
|
||||
return SERIALIZER;
|
||||
}
|
||||
|
||||
@Override
|
||||
public RecipeType<?> getType() {
|
||||
return this.type;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Environment(EnvType.CLIENT)
|
||||
public String getGroup() {
|
||||
return this.group;
|
||||
}
|
||||
|
||||
@Environment(EnvType.CLIENT)
|
||||
public ItemStack getToastSymbol() {
|
||||
return new ItemStack(EndBlocks.END_STONE_SMELTER);
|
||||
}
|
||||
|
||||
public static class Builder {
|
||||
private final static Builder INSTANCE = new Builder();
|
||||
private static boolean exist;
|
||||
|
||||
public static Builder create(ResourceLocation id) {
|
||||
INSTANCE.id = id;
|
||||
INSTANCE.group = String.format("%s_%s", GROUP, id);
|
||||
INSTANCE.primaryInput = null;
|
||||
INSTANCE.secondaryInput = null;
|
||||
INSTANCE.output = null;
|
||||
INSTANCE.experience = 0.0F;
|
||||
INSTANCE.smeltTime = 350;
|
||||
exist = Configs.RECIPE_CONFIG.getBoolean("alloying", id.getPath(), true);
|
||||
|
||||
return INSTANCE;
|
||||
}
|
||||
|
||||
public static Builder create(String id) {
|
||||
return create(BetterEnd.makeID(id));
|
||||
}
|
||||
|
||||
private ResourceLocation id;
|
||||
private Ingredient primaryInput;
|
||||
private Ingredient secondaryInput;
|
||||
private ItemStack output;
|
||||
private String group;
|
||||
private float experience;
|
||||
private int smeltTime;
|
||||
private boolean alright = true;
|
||||
|
||||
private Builder() {
|
||||
}
|
||||
|
||||
public Builder setGroup(String group) {
|
||||
this.group = group;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder setPrimaryInput(ItemLike... inputs) {
|
||||
for (ItemLike item : inputs) {
|
||||
this.alright &= RecipeHelper.exists(item);
|
||||
}
|
||||
this.primaryInput = Ingredient.of(inputs);
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder setSecondaryInput(ItemLike... inputs) {
|
||||
for (ItemLike item : inputs) {
|
||||
this.alright &= RecipeHelper.exists(item);
|
||||
}
|
||||
this.secondaryInput = Ingredient.of(inputs);
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder setPrimaryInput(TagKey<Item> input) {
|
||||
this.primaryInput = Ingredient.of(input);
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder setSecondaryInput(TagKey<Item> input) {
|
||||
this.secondaryInput = Ingredient.of(input);
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder setInput(ItemLike primaryInput, ItemLike secondaryInput) {
|
||||
this.setPrimaryInput(primaryInput);
|
||||
this.setSecondaryInput(secondaryInput);
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder setInput(TagKey<Item> primaryInput, TagKey<Item> secondaryInput) {
|
||||
this.setPrimaryInput(primaryInput);
|
||||
this.setSecondaryInput(secondaryInput);
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder setOutput(ItemLike output, int amount) {
|
||||
this.alright &= RecipeHelper.exists(output);
|
||||
this.output = new ItemStack(output, amount);
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder setExpiriense(float amount) {
|
||||
this.experience = amount;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder setSmeltTime(int time) {
|
||||
this.smeltTime = time;
|
||||
return this;
|
||||
}
|
||||
|
||||
public void build() {
|
||||
if (exist) {
|
||||
if (primaryInput == null) {
|
||||
BetterEnd.LOGGER.warning(
|
||||
"Primary input for Alloying recipe can't be 'null', recipe {} will be ignored!",
|
||||
id
|
||||
);
|
||||
return;
|
||||
}
|
||||
if (secondaryInput == null) {
|
||||
BetterEnd.LOGGER.warning(
|
||||
"Secondary input for Alloying can't be 'null', recipe {} will be ignored!",
|
||||
id
|
||||
);
|
||||
return;
|
||||
}
|
||||
if (output == null) {
|
||||
BetterEnd.LOGGER.warning("Output for Alloying can't be 'null', recipe {} will be ignored!", id);
|
||||
return;
|
||||
}
|
||||
if (BCLRecipeManager.getRecipe(TYPE, id) != null) {
|
||||
BetterEnd.LOGGER.warning("Can't add Alloying recipe! Id {} already exists!", id);
|
||||
return;
|
||||
}
|
||||
if (!alright) {
|
||||
BetterEnd.LOGGER.debug("Can't add Alloying recipe {}! Ingeredient or output not exists.", id);
|
||||
return;
|
||||
}
|
||||
BCLRecipeManager.addRecipe(
|
||||
TYPE,
|
||||
new AlloyingRecipe(id, group, primaryInput, secondaryInput, output, experience, smeltTime)
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static class Serializer implements RecipeSerializer<AlloyingRecipe> {
|
||||
@Override
|
||||
public AlloyingRecipe fromJson(ResourceLocation id, JsonObject json) {
|
||||
JsonArray ingredients = GsonHelper.getAsJsonArray(json, "ingredients");
|
||||
Ingredient primaryInput = Ingredient.fromJson(ingredients.get(0));
|
||||
Ingredient secondaryInput = Ingredient.fromJson(ingredients.get(1));
|
||||
String group = GsonHelper.getAsString(json, "group", "");
|
||||
JsonObject result = GsonHelper.getAsJsonObject(json, "result");
|
||||
ItemStack output = ItemUtil.fromJsonRecipe(result);
|
||||
if (output == null) {
|
||||
throw new IllegalStateException("Output item does not exists!");
|
||||
}
|
||||
float experience = GsonHelper.getAsFloat(json, "experience", 0.0F);
|
||||
int smeltTime = GsonHelper.getAsInt(json, "smelttime", 350);
|
||||
|
||||
return new AlloyingRecipe(id, group, primaryInput, secondaryInput, output, experience, smeltTime);
|
||||
}
|
||||
|
||||
@Override
|
||||
public AlloyingRecipe fromNetwork(ResourceLocation id, FriendlyByteBuf packetBuffer) {
|
||||
String group = packetBuffer.readUtf(32767);
|
||||
Ingredient primary = Ingredient.fromNetwork(packetBuffer);
|
||||
Ingredient secondary = Ingredient.fromNetwork(packetBuffer);
|
||||
ItemStack output = packetBuffer.readItem();
|
||||
float experience = packetBuffer.readFloat();
|
||||
int smeltTime = packetBuffer.readVarInt();
|
||||
|
||||
return new AlloyingRecipe(id, group, primary, secondary, output, experience, smeltTime);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void toNetwork(FriendlyByteBuf packetBuffer, AlloyingRecipe recipe) {
|
||||
packetBuffer.writeUtf(recipe.group);
|
||||
recipe.primaryInput.toNetwork(packetBuffer);
|
||||
recipe.secondaryInput.toNetwork(packetBuffer);
|
||||
packetBuffer.writeItem(recipe.output);
|
||||
packetBuffer.writeFloat(recipe.experience);
|
||||
packetBuffer.writeVarInt(recipe.smeltTime);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
package org.betterx.betterend.recipe.builders;
|
||||
|
||||
import org.betterx.bclib.recipes.AlloyingRecipe;
|
||||
import org.betterx.betterend.BetterEnd;
|
||||
import org.betterx.betterend.config.Configs;
|
||||
|
||||
public class AlloyingRecipeBuilder extends AlloyingRecipe.Builder {
|
||||
private AlloyingRecipeBuilder() {
|
||||
}
|
||||
|
||||
public static AlloyingRecipe.Builder create(String id) {
|
||||
return AlloyingRecipe.Builder.create(BetterEnd.MOD_ID, id, Configs.RECIPE_CONFIG);
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue