This commit is contained in:
Vincent Lee committed 2020-03-30 23:08:22 -05:00
1 parent c9cc1c615a
commit 6c99e4e19a
10 files changed
+63 -21

No files matched your search

@@ -324,8 +324,7 @@ public final class BotaniaAPI {
public static final Rarity rarityRelic = Rarity.create("RELIC", TextFormatting.GOLD);
// todo 1.15 move this too
@ObjectHolder("botania:fallback")
public static Brew fallbackBrew;
@ObjectHolder("botania:fallback") public static Brew fallbackBrew;
/**
* The internal method handler in use.
@@ -9,11 +9,11 @@
package vazkii.botania.api.recipe;
import com.google.common.collect.ImmutableList;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParseException;
import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
import net.minecraft.item.crafting.IRecipe;
@@ -26,9 +26,9 @@ import net.minecraft.util.NonNullList;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;
import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.items.wrapper.RecipeWrapper;
import net.minecraftforge.registries.ForgeRegistryEntry;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.brew.Brew;
import vazkii.botania.api.brew.IBrewContainer;
@@ -37,6 +37,7 @@ import vazkii.botania.common.crafting.ModRecipeTypes;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -11,6 +11,7 @@ package vazkii.botania.api.recipe;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.item.crafting.IRecipeSerializer;
@@ -24,10 +25,12 @@ import net.minecraft.world.World;
import net.minecraftforge.common.crafting.CraftingHelper;
import net.minecraftforge.items.wrapper.RecipeWrapper;
import net.minecraftforge.registries.ForgeRegistryEntry;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.crafting.ModRecipeTypes;
import javax.annotation.Nonnull;
import java.util.ArrayList;
import java.util.List;
@@ -85,7 +88,8 @@ public class RecipePetals implements IRecipe<RecipeWrapper> {
}
@Nonnull
@Override public ItemStack getIcon() {
@Override
public ItemStack getIcon() {
return new ItemStack(ModBlocks.defaultAltar);
}
@@ -150,7 +154,7 @@ public class RecipePetals implements IRecipe<RecipeWrapper> {
}
buf.writeItemStack(recipe.getRecipeOutput(), false);
}
}
}
@@ -10,10 +10,10 @@ package vazkii.botania.api.recipe;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.item.crafting.IRecipeSerializer;
@@ -28,10 +28,12 @@ import net.minecraftforge.common.crafting.CraftingHelper;
import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.items.wrapper.RecipeWrapper;
import net.minecraftforge.registries.ForgeRegistryEntry;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.crafting.ModRecipeTypes;
import javax.annotation.Nonnull;
import java.util.ArrayList;
import java.util.List;
@@ -119,7 +121,7 @@ public class RecipeRuneAltar implements IRecipe<RecipeWrapper> {
public int getManaUsage() {
return mana;
}
// Ignored IRecipe methods
@Nonnull
@Override
@@ -131,7 +133,7 @@ public class RecipeRuneAltar implements IRecipe<RecipeWrapper> {
public boolean canFit(int width, int height) {
return false;
}
public static class Serializer extends ForgeRegistryEntry<IRecipeSerializer<?>> implements IRecipeSerializer<RecipeRuneAltar> {
@Nonnull
@Override
@@ -25,6 +25,7 @@ import net.minecraft.tags.Tag;
import net.minecraft.util.JSONUtils;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.registries.ForgeRegistries;
import vazkii.botania.common.core.helper.ItemNBTHelper;
import java.util.Collections;
@@ -17,8 +17,8 @@ import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.registries.ForgeRegistries;
import net.minecraftforge.registries.RegistryBuilder;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.brew.Brew;
import vazkii.botania.common.lib.LibBrewNames;
@@ -59,11 +59,11 @@ public class ModBrews {
@SubscribeEvent
public static void registerRegistry(RegistryEvent.NewRegistry evt) {
BotaniaAPI.brewRegistry = new RegistryBuilder<Brew>()
.setName(prefix("brews"))
.setType(Brew.class)
.setDefaultKey(prefix("fallback"))
.disableSaving()
.create();
.setName(prefix("brews"))
.setType(Brew.class)
.setDefaultKey(prefix("fallback"))
.disableSaving()
.create();
}
@SubscribeEvent
@@ -91,8 +91,8 @@ public class ModBrews {
allure = make(LibBrewNames.ALLURE, 2000, new EffectInstance(ModPotions.allure, 4800, 0));
clear = make(LibBrewNames.CLEAR, 4000, new EffectInstance(ModPotions.clear, 0, 0));
evt.getRegistry().registerAll(fallback, speed, strength, haste, healing, jumpBoost, regen, regenWeak, resistance,
fireResistance, waterBreathing, invisibility, nightVision, absorption, overload, soulCross, featherfeet,
emptiness, bloodthirst, allure, clear);
fireResistance, waterBreathing, invisibility, nightVision, absorption, overload, soulCross, featherfeet,
emptiness, bloodthirst, allure, clear);
Effect warpWardPotion = ForgeRegistries.POTIONS.getValue(new ResourceLocation("thaumcraft:warpward"));
@@ -11,6 +11,7 @@ package vazkii.botania.common.crafting.recipe;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
import net.minecraft.item.crafting.IRecipeSerializer;
@@ -22,15 +23,16 @@ import net.minecraft.util.text.TranslationTextComponent;
import net.minecraft.world.World;
import net.minecraftforge.common.crafting.CraftingHelper;
import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.items.wrapper.RecipeWrapper;
import net.minecraftforge.registries.ForgeRegistryEntry;
import vazkii.botania.api.recipe.RecipeRuneAltar;
import vazkii.botania.common.core.helper.ItemNBTHelper;
import vazkii.botania.common.crafting.ModRecipeTypes;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.List;
@@ -1,7 +1,16 @@
/*
* This class is distributed as part of the Botania Mod.
* Get the Source Code in github:
* https://github.com/Vazkii/Botania
*
* Botania is Open Source and distributed under the
* Botania License: http://botaniamod.net/license.php
*/
package vazkii.botania.data.recipes;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import net.minecraft.block.Blocks;
import net.minecraft.data.DataGenerator;
import net.minecraft.data.IFinishedRecipe;
@@ -13,6 +22,7 @@ import net.minecraft.item.crafting.Ingredient;
import net.minecraft.tags.ItemTags;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.registries.ForgeRegistries;
import vazkii.botania.api.brew.Brew;
import vazkii.botania.common.Botania;
import vazkii.botania.common.brew.ModBrews;
@@ -20,6 +30,7 @@ import vazkii.botania.common.crafting.ModRecipeTypes;
import vazkii.botania.common.item.ModItems;
import javax.annotation.Nullable;
import java.util.function.Consumer;
import static vazkii.botania.common.lib.ResourceLocationHelper.prefix;
@@ -67,7 +78,7 @@ public class BrewProvider extends RecipeProvider {
consumer.accept(new FinishedRecipe(idFor("warp_ward"), ModBrews.warpWard, Ingredient.fromItems(Items.NETHER_WART), Ingredient.fromItems(salisMundus), Ingredient.fromItems(bathSalts), Ingredient.fromItems(amber)));
}
}
private static ResourceLocation idFor(String s) {
return prefix("brew/" + s);
}
@@ -1,7 +1,16 @@
/*
* This class is distributed as part of the Botania Mod.
* Get the Source Code in github:
* https://github.com/Vazkii/Botania
*
* Botania is Open Source and distributed under the
* Botania License: http://botaniamod.net/license.php
*/
package vazkii.botania.data.recipes;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import net.minecraft.data.DataGenerator;
import net.minecraft.data.IFinishedRecipe;
import net.minecraft.data.RecipeProvider;
@@ -12,6 +21,7 @@ import net.minecraft.item.crafting.Ingredient;
import net.minecraft.tags.ItemTags;
import net.minecraft.util.IItemProvider;
import net.minecraft.util.ResourceLocation;
import vazkii.botania.common.Botania;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.core.handler.ConfigHandler;
@@ -21,6 +31,7 @@ import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.lib.LibMisc;
import javax.annotation.Nullable;
import java.util.Arrays;
import java.util.function.Consumer;
@@ -135,7 +146,7 @@ public class PetalProvider extends RecipeProvider {
private static FinishedRecipe make(IItemProvider item, Ingredient... ingredients) {
return new FinishedRecipe(idFor(item.asItem().getRegistryName()), new ItemStack(item), ingredients);
}
private static ResourceLocation idFor(ResourceLocation name) {
return new ResourceLocation(name.getNamespace(), "petal_apothecary/" + name.getPath());
}
@@ -1,7 +1,16 @@
/*
* This class is distributed as part of the Botania Mod.
* Get the Source Code in github:
* https://github.com/Vazkii/Botania
*
* Botania is Open Source and distributed under the
* Botania License: http://botaniamod.net/license.php
*/
package vazkii.botania.data.recipes;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import net.minecraft.block.Blocks;
import net.minecraft.data.DataGenerator;
import net.minecraft.data.IFinishedRecipe;
@@ -13,6 +22,7 @@ import net.minecraft.item.crafting.Ingredient;
import net.minecraft.tags.ItemTags;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.common.Tags;
import vazkii.botania.api.recipe.RecipeRuneAltar;
import vazkii.botania.common.core.helper.ItemNBTHelper;
import vazkii.botania.common.crafting.ModRecipeTypes;
@@ -21,6 +31,7 @@ import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.lib.ModTags;
import javax.annotation.Nullable;
import java.util.function.Consumer;
import static vazkii.botania.common.lib.ResourceLocationHelper.prefix;
@@ -85,7 +96,7 @@ public class RuneProvider extends RecipeProvider {
consumer.accept(new FinishedHeadRecipe(idFor("head"), new ItemStack(Items.PLAYER_HEAD), 22500, Ingredient.fromItems(Items.SKELETON_SKULL), Ingredient.fromItems(ModItems.pixieDust), Ingredient.fromItems(Items.PRISMARINE_CRYSTALS), Ingredient.fromItems(Items.NAME_TAG), Ingredient.fromItems(Items.GOLDEN_APPLE)));
}
private static ResourceLocation idFor(String s) {
return prefix("runic_altar/" + s);
}