MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Reformated

Browse source
This commit is contained in:
Frank 2022-06-08 20:58:41 +02:00
parent fc1da134e7
commit 60e8008cb7
416 changed files with 5772 additions and 4573 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/org/betterx/betterend/recipe/AlloyingRecipes.java
View file

@ -1,13 +1,13 @@
package org.betterx.betterend.recipe;
import net.minecraft.world.item.Items;
import net.minecraft.world.level.block.Blocks;
import org.betterx.betterend.recipe.builders.AlloyingRecipe;
import org.betterx.betterend.registry.EndBlocks;
import org.betterx.betterend.registry.EndItems;
import org.betterx.betterend.registry.EndTags;
import net.minecraft.world.item.Items;
import net.minecraft.world.level.block.Blocks;
public class AlloyingRecipes {
public static void register() {
AlloyingRecipe.Builder.create("additional_iron")

4
src/main/java/org/betterx/betterend/recipe/AnvilRecipes.java
View file

@ -1,12 +1,12 @@
package org.betterx.betterend.recipe;
import net.minecraft.world.item.Items;
import org.betterx.bclib.recipes.AnvilRecipe;
import org.betterx.betterend.config.Configs;
import org.betterx.betterend.item.material.EndToolMaterial;
import org.betterx.betterend.registry.EndItems;
import net.minecraft.world.item.Items;
public class AnvilRecipes {
public static void register() {
AnvilRecipe.create("ender_pearl_to_dust")

20
src/main/java/org/betterx/betterend/recipe/CraftingRecipes.java
View file

@ -1,5 +1,12 @@
package org.betterx.betterend.recipe;
import org.betterx.bclib.api.v2.tag.CommonItemTags;
import org.betterx.bclib.recipes.GridRecipe;
import org.betterx.betterend.BetterEnd;
import org.betterx.betterend.config.Configs;
import org.betterx.betterend.registry.EndBlocks;
import org.betterx.betterend.registry.EndItems;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;
@ -8,13 +15,6 @@ import net.minecraft.world.item.alchemy.Potions;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks;
import org.betterx.bclib.api.v2.tag.CommonItemTags;
import org.betterx.bclib.recipes.GridRecipe;
import org.betterx.betterend.BetterEnd;
import org.betterx.betterend.config.Configs;
import org.betterx.betterend.registry.EndBlocks;
import org.betterx.betterend.registry.EndItems;
public class CraftingRecipes {
public static void register() {
@ -43,19 +43,19 @@ public class CraftingRecipes {
EndBlocks.ANDESITE_PEDESTAL,
Blocks.POLISHED_ANDESITE_SLAB,
Blocks.POLISHED_ANDESITE
);
);
registerPedestal(
"diorite_pedestal",
EndBlocks.DIORITE_PEDESTAL,
Blocks.POLISHED_DIORITE_SLAB,
Blocks.POLISHED_DIORITE
);
);
registerPedestal(
"granite_pedestal",
EndBlocks.GRANITE_PEDESTAL,
Blocks.POLISHED_GRANITE_SLAB,
Blocks.POLISHED_GRANITE
);
);
registerPedestal("quartz_pedestal", EndBlocks.QUARTZ_PEDESTAL, Blocks.QUARTZ_SLAB, Blocks.QUARTZ_PILLAR);
registerPedestal("purpur_pedestal", EndBlocks.PURPUR_PEDESTAL, Blocks.PURPUR_SLAB, Blocks.PURPUR_PILLAR);

10
src/main/java/org/betterx/betterend/recipe/FurnaceRecipes.java
View file

@ -1,14 +1,14 @@
package org.betterx.betterend.recipe;
import net.minecraft.world.item.Items;
import net.minecraft.world.level.block.Blocks;
import org.betterx.bclib.recipes.FurnaceRecipe;
import org.betterx.betterend.BetterEnd;
import org.betterx.betterend.config.Configs;
import org.betterx.betterend.registry.EndBlocks;
import org.betterx.betterend.registry.EndItems;
import net.minecraft.world.item.Items;
import net.minecraft.world.level.block.Blocks;
public class FurnaceRecipes {
public static void register() {
FurnaceRecipe.make(
@ -16,7 +16,7 @@ public class FurnaceRecipes {
"end_lily_leaf_dried",
EndItems.END_LILY_LEAF,
EndItems.END_LILY_LEAF_DRIED
).checkConfig(Configs.RECIPE_CONFIG).build();
).checkConfig(Configs.RECIPE_CONFIG).build();
FurnaceRecipe.make(BetterEnd.MOD_ID, "end_glass", EndBlocks.ENDSTONE_DUST, Blocks.GLASS)
.checkConfig(Configs.RECIPE_CONFIG)
.build();
@ -37,7 +37,7 @@ public class FurnaceRecipes {
"chorus_mushroom",
EndItems.CHORUS_MUSHROOM_RAW,
EndItems.CHORUS_MUSHROOM_COOKED
).checkConfig(Configs.RECIPE_CONFIG).buildFoodlike();
).checkConfig(Configs.RECIPE_CONFIG).buildFoodlike();
FurnaceRecipe.make(BetterEnd.MOD_ID, "bolux_mushroom", EndBlocks.BOLUX_MUSHROOM, EndItems.BOLUX_MUSHROOM_COOKED)
.checkConfig(Configs.RECIPE_CONFIG)
.buildFoodlike();

8
src/main/java/org/betterx/betterend/recipe/InfusionRecipes.java
View file

@ -1,5 +1,9 @@
package org.betterx.betterend.recipe;
import org.betterx.betterend.recipe.builders.InfusionRecipe;
import org.betterx.betterend.registry.EndBlocks;
import org.betterx.betterend.registry.EndItems;
import net.minecraft.world.item.EnchantedBookItem;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;
@ -8,10 +12,6 @@ import net.minecraft.world.item.enchantment.EnchantmentInstance;
import net.minecraft.world.item.enchantment.Enchantments;
import net.minecraft.world.level.block.Blocks;
import org.betterx.betterend.recipe.builders.InfusionRecipe;
import org.betterx.betterend.registry.EndBlocks;
import org.betterx.betterend.registry.EndItems;
public class InfusionRecipes {
public static void register() {
InfusionRecipe.Builder.create("runed_flavolite")

4
src/main/java/org/betterx/betterend/recipe/SmithingRecipes.java
View file

@ -1,13 +1,13 @@
package org.betterx.betterend.recipe;
import net.minecraft.world.item.Items;
import org.betterx.bclib.recipes.SmithingTableRecipe;
import org.betterx.betterend.BetterEnd;
import org.betterx.betterend.config.Configs;
import org.betterx.betterend.registry.EndBlocks;
import org.betterx.betterend.registry.EndItems;
import net.minecraft.world.item.Items;
public class SmithingRecipes {
public static void register() {

39
src/main/java/org/betterx/betterend/recipe/builders/AlloyingRecipe.java
View file

@ -1,5 +1,13 @@
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;
@ -20,13 +28,6 @@ import net.fabricmc.api.Environment;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
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;
public class AlloyingRecipe implements Recipe<Container>, UnknownReceipBookCategory {
public final static String GROUP = "alloying";
@ -35,7 +36,7 @@ public class AlloyingRecipe implements Recipe<Container>, UnknownReceipBookCateg
BetterEnd.MOD_ID,
GROUP,
new Serializer()
);
);
protected final RecipeType<?> type;
protected final ResourceLocation id;
@ -46,13 +47,15 @@ public class AlloyingRecipe implements Recipe<Container>, UnknownReceipBookCateg
protected final float experience;
protected final int smeltTime;
public AlloyingRecipe(ResourceLocation id,
String group,
Ingredient primaryInput,
Ingredient secondaryInput,
ItemStack output,
float experience,
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;
@ -225,14 +228,14 @@ public class AlloyingRecipe implements Recipe<Container>, UnknownReceipBookCateg
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) {
@ -250,7 +253,7 @@ public class AlloyingRecipe implements Recipe<Container>, UnknownReceipBookCateg
BCLRecipeManager.addRecipe(
TYPE,
new AlloyingRecipe(id, group, primaryInput, secondaryInput, output, experience, smeltTime)
);
);
}
}
}

21
src/main/java/org/betterx/betterend/recipe/builders/InfusionRecipe.java
View file

@ -1,5 +1,13 @@
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.betterend.BetterEnd;
import org.betterx.betterend.config.Configs;
import org.betterx.betterend.rituals.InfusionRitual;
import com.mojang.brigadier.exceptions.CommandSyntaxException;
import net.minecraft.core.NonNullList;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.TagParser;
@ -18,13 +26,6 @@ import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import com.google.gson.JsonObject;
import com.mojang.brigadier.exceptions.CommandSyntaxException;
import org.betterx.bclib.interfaces.UnknownReceipBookCategory;
import org.betterx.bclib.recipes.BCLRecipeManager;
import org.betterx.bclib.util.ItemUtil;
import org.betterx.betterend.BetterEnd;
import org.betterx.betterend.config.Configs;
import org.betterx.betterend.rituals.InfusionRitual;
import java.util.Arrays;
@ -35,7 +36,7 @@ public class InfusionRecipe implements Recipe<InfusionRitual>, UnknownReceipBook
BetterEnd.MOD_ID,
GROUP,
new Serializer()
);
);
private final ResourceLocation id;
private final Ingredient[] catalysts;
@ -184,14 +185,14 @@ public class InfusionRecipe implements Recipe<InfusionRitual>, UnknownReceipBook
BetterEnd.LOGGER.warning(
"Input for Infusion recipe can't be 'null', recipe {} will be ignored!",
id
);
);
return;
}
if (output == null) {
BetterEnd.LOGGER.warning(
"Output for Infusion recipe can't be 'null', recipe {} will be ignored!",
id
);
);
return;
}
InfusionRecipe recipe = new InfusionRecipe(id, input, output);