mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-17 02:45:13 +00:00
Fully compiling, but probably doesn't run yet
This commit is contained in:
1 parent
ea50b40229
commit
9825900fe5
25 files changed
+189
-95
No files matched your search
@@ -827,7 +827,6 @@ public final class ModBlocks {
|
||||
r.register(new ItemBlockMod(infusedGrass, props).setRegistryName(infusedGrass.getRegistryName()));
|
||||
r.register(new ItemBlockMod(mutatedGrass, props).setRegistryName(mutatedGrass.getRegistryName()));
|
||||
r.register(new ItemBlockMod(animatedTorch, props).setRegistryName(animatedTorch.getRegistryName()));
|
||||
initOreDict();
|
||||
}
|
||||
|
||||
public static <V extends IForgeRegistryEntry<V>> void register(IForgeRegistry<V> reg, IForgeRegistryEntry<V> thing, String name) {
|
||||
@@ -842,10 +841,6 @@ public final class ModBlocks {
|
||||
SeedBehaviours.init();
|
||||
}
|
||||
|
||||
private static void initOreDict() {
|
||||
OreDictionary.registerOre(LibOreDict.BLAZE_BLOCK, blazeBlock);
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public static void initTileEntities(RegistryEvent.Register<TileEntityType<?>> evt) {
|
||||
IForgeRegistry<TileEntityType<?>> r = evt.getRegistry();
|
||||
|
||||
@@ -14,6 +14,8 @@ import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.crafting.Ingredient;
|
||||
import net.minecraft.tags.ItemTags;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.util.registry.IRegistry;
|
||||
import vazkii.botania.api.BotaniaAPI;
|
||||
@@ -49,27 +51,27 @@ public class ModBrewRecipes {
|
||||
public static RecipeBrew warpWardBrew;
|
||||
|
||||
public static void init() {
|
||||
speedBrew = BotaniaAPI.registerBrewRecipe(ModBrews.speed, new ItemStack(Items.NETHER_WART), new ItemStack(Items.SUGAR), new ItemStack(Items.REDSTONE));
|
||||
strengthBrew = BotaniaAPI.registerBrewRecipe(ModBrews.strength, new ItemStack(Items.NETHER_WART), new ItemStack(Items.BLAZE_POWDER), new ItemStack(Items.GLOWSTONE_DUST));
|
||||
hasteBrew = BotaniaAPI.registerBrewRecipe(ModBrews.haste, new ItemStack(Items.NETHER_WART), new ItemStack(Items.SUGAR), new ItemStack(Items.GOLD_NUGGET));
|
||||
healingBrew = BotaniaAPI.registerBrewRecipe(ModBrews.healing, new ItemStack(Items.NETHER_WART), new ItemStack(Items.GLISTERING_MELON_SLICE), new ItemStack(Items.POTATO));
|
||||
jumpBoostBrew = BotaniaAPI.registerBrewRecipe(ModBrews.jumpBoost, new ItemStack(Items.NETHER_WART), new ItemStack(Items.FEATHER), new ItemStack(Items.CARROT));
|
||||
regenerationBrew = BotaniaAPI.registerBrewRecipe(ModBrews.regen, new ItemStack(Items.NETHER_WART), new ItemStack(Items.GHAST_TEAR), new ItemStack(Items.GLOWSTONE_DUST));
|
||||
weakRegenerationBrew = BotaniaAPI.registerBrewRecipe(ModBrews.regenWeak, new ItemStack(Items.NETHER_WART), new ItemStack(Items.GHAST_TEAR), new ItemStack(Items.REDSTONE));
|
||||
resistanceBrew = BotaniaAPI.registerBrewRecipe(ModBrews.resistance, new ItemStack(Items.NETHER_WART), new ItemStack(Items.IRON_INGOT), new ItemStack(Items.LEATHER));
|
||||
fireResistanceBrew = BotaniaAPI.registerBrewRecipe(ModBrews.fireResistance, new ItemStack(Items.NETHER_WART), new ItemStack(Items.MAGMA_CREAM), new ItemStack(Blocks.NETHERRACK));
|
||||
waterBreathingBrew = BotaniaAPI.registerBrewRecipe(ModBrews.waterBreathing, new ItemStack(Items.NETHER_WART), "gemPrismarine", new ItemStack(Items.GLOWSTONE_DUST));
|
||||
invisibilityBrew = BotaniaAPI.registerBrewRecipe(ModBrews.invisibility, new ItemStack(Items.NETHER_WART), new ItemStack(Items.SNOWBALL), new ItemStack(Items.GLOWSTONE_DUST));
|
||||
nightVisionBrew = BotaniaAPI.registerBrewRecipe(ModBrews.nightVision, new ItemStack(Items.NETHER_WART), new ItemStack(Items.SPIDER_EYE), new ItemStack(Items.GOLDEN_CARROT));
|
||||
absorptionBrew = BotaniaAPI.registerBrewRecipe(ModBrews.absorption, new ItemStack(Items.NETHER_WART), new ItemStack(Items.GOLDEN_APPLE), new ItemStack(Items.POTATO));
|
||||
speedBrew = BotaniaAPI.registerBrewRecipe(ModBrews.speed, Ingredient.fromItems(Items.NETHER_WART), Ingredient.fromItems(Items.SUGAR), Ingredient.fromItems(Items.REDSTONE));
|
||||
strengthBrew = BotaniaAPI.registerBrewRecipe(ModBrews.strength, Ingredient.fromItems(Items.NETHER_WART), Ingredient.fromItems(Items.BLAZE_POWDER), Ingredient.fromItems(Items.GLOWSTONE_DUST));
|
||||
hasteBrew = BotaniaAPI.registerBrewRecipe(ModBrews.haste, Ingredient.fromItems(Items.NETHER_WART), Ingredient.fromItems(Items.SUGAR), Ingredient.fromItems(Items.GOLD_NUGGET));
|
||||
healingBrew = BotaniaAPI.registerBrewRecipe(ModBrews.healing, Ingredient.fromItems(Items.NETHER_WART), Ingredient.fromItems(Items.GLISTERING_MELON_SLICE), Ingredient.fromItems(Items.POTATO));
|
||||
jumpBoostBrew = BotaniaAPI.registerBrewRecipe(ModBrews.jumpBoost, Ingredient.fromItems(Items.NETHER_WART), Ingredient.fromItems(Items.FEATHER), Ingredient.fromItems(Items.CARROT));
|
||||
regenerationBrew = BotaniaAPI.registerBrewRecipe(ModBrews.regen, Ingredient.fromItems(Items.NETHER_WART), Ingredient.fromItems(Items.GHAST_TEAR), Ingredient.fromItems(Items.GLOWSTONE_DUST));
|
||||
weakRegenerationBrew = BotaniaAPI.registerBrewRecipe(ModBrews.regenWeak, Ingredient.fromItems(Items.NETHER_WART), Ingredient.fromItems(Items.GHAST_TEAR), Ingredient.fromItems(Items.REDSTONE));
|
||||
resistanceBrew = BotaniaAPI.registerBrewRecipe(ModBrews.resistance, Ingredient.fromItems(Items.NETHER_WART), Ingredient.fromItems(Items.IRON_INGOT), Ingredient.fromItems(Items.LEATHER));
|
||||
fireResistanceBrew = BotaniaAPI.registerBrewRecipe(ModBrews.fireResistance, Ingredient.fromItems(Items.NETHER_WART), Ingredient.fromItems(Items.MAGMA_CREAM), Ingredient.fromItems(Blocks.NETHERRACK));
|
||||
waterBreathingBrew = BotaniaAPI.registerBrewRecipe(ModBrews.waterBreathing, Ingredient.fromItems(Items.NETHER_WART), Ingredient.fromItems(Items.PRISMARINE_CRYSTALS), Ingredient.fromItems(Items.GLOWSTONE_DUST));
|
||||
invisibilityBrew = BotaniaAPI.registerBrewRecipe(ModBrews.invisibility, Ingredient.fromItems(Items.NETHER_WART), Ingredient.fromItems(Items.SNOWBALL), Ingredient.fromItems(Items.GLOWSTONE_DUST));
|
||||
nightVisionBrew = BotaniaAPI.registerBrewRecipe(ModBrews.nightVision, Ingredient.fromItems(Items.NETHER_WART), Ingredient.fromItems(Items.SPIDER_EYE), Ingredient.fromItems(Items.GOLDEN_CARROT));
|
||||
absorptionBrew = BotaniaAPI.registerBrewRecipe(ModBrews.absorption, Ingredient.fromItems(Items.NETHER_WART), Ingredient.fromItems(Items.GOLDEN_APPLE), Ingredient.fromItems(Items.POTATO));
|
||||
|
||||
overloadBrew = BotaniaAPI.registerBrewRecipe(ModBrews.overload, new ItemStack(Items.NETHER_WART), new ItemStack(Items.BLAZE_POWDER), new ItemStack(Items.SUGAR), new ItemStack(Items.GLOWSTONE_DUST), new ItemStack(ModItems.manaSteel), new ItemStack(Items.SPIDER_EYE));
|
||||
soulCrossBrew = BotaniaAPI.registerBrewRecipe(ModBrews.soulCross, new ItemStack(Items.NETHER_WART), new ItemStack(Blocks.SOUL_SAND), new ItemStack(Items.PAPER), new ItemStack(Items.APPLE), new ItemStack(Items.BONE));
|
||||
featherFeetBrew = BotaniaAPI.registerBrewRecipe(ModBrews.featherfeet, new ItemStack(Items.NETHER_WART), new ItemStack(Items.FEATHER), new ItemStack(Items.LEATHER), new ItemStack(Blocks.WOOL, 1, -1));
|
||||
emptinessBrew = BotaniaAPI.registerBrewRecipe(ModBrews.emptiness, new ItemStack(Items.NETHER_WART), new ItemStack(Items.GUNPOWDER), new ItemStack(Items.ROTTEN_FLESH), new ItemStack(Items.BONE), new ItemStack(Items.STRING), new ItemStack(Items.ENDER_PEARL));
|
||||
bloodthirstBrew = BotaniaAPI.registerBrewRecipe(ModBrews.bloodthirst, new ItemStack(Items.NETHER_WART), new ItemStack(Items.FERMENTED_SPIDER_EYE), new ItemStack(Items.LAPIS_LAZULI), new ItemStack(Items.FIRE_CHARGE), new ItemStack(Items.IRON_INGOT));
|
||||
allureBrew = BotaniaAPI.registerBrewRecipe(ModBrews.allure, new ItemStack(Items.NETHER_WART), new ItemStack(Items.COD), new ItemStack(Items.QUARTZ), new ItemStack(Items.GOLDEN_CARROT));
|
||||
clearBrew = BotaniaAPI.registerBrewRecipe(ModBrews.clear, new ItemStack(Items.NETHER_WART), new ItemStack(Items.QUARTZ), new ItemStack(Items.EMERALD), new ItemStack(Items.MELON_SLICE));
|
||||
overloadBrew = BotaniaAPI.registerBrewRecipe(ModBrews.overload, Ingredient.fromItems(Items.NETHER_WART), Ingredient.fromItems(Items.BLAZE_POWDER), Ingredient.fromItems(Items.SUGAR), Ingredient.fromItems(Items.GLOWSTONE_DUST), Ingredient.fromItems(ModItems.manaSteel), Ingredient.fromItems(Items.SPIDER_EYE));
|
||||
soulCrossBrew = BotaniaAPI.registerBrewRecipe(ModBrews.soulCross, Ingredient.fromItems(Items.NETHER_WART), Ingredient.fromItems(Blocks.SOUL_SAND), Ingredient.fromItems(Items.PAPER), Ingredient.fromItems(Items.APPLE), Ingredient.fromItems(Items.BONE));
|
||||
featherFeetBrew = BotaniaAPI.registerBrewRecipe(ModBrews.featherfeet, Ingredient.fromItems(Items.NETHER_WART), Ingredient.fromItems(Items.FEATHER), Ingredient.fromItems(Items.LEATHER), Ingredient.fromTag(ItemTags.WOOL));
|
||||
emptinessBrew = BotaniaAPI.registerBrewRecipe(ModBrews.emptiness, Ingredient.fromItems(Items.NETHER_WART), Ingredient.fromItems(Items.GUNPOWDER), Ingredient.fromItems(Items.ROTTEN_FLESH), Ingredient.fromItems(Items.BONE), Ingredient.fromItems(Items.STRING), Ingredient.fromItems(Items.ENDER_PEARL));
|
||||
bloodthirstBrew = BotaniaAPI.registerBrewRecipe(ModBrews.bloodthirst, Ingredient.fromItems(Items.NETHER_WART), Ingredient.fromItems(Items.FERMENTED_SPIDER_EYE), Ingredient.fromItems(Items.LAPIS_LAZULI), Ingredient.fromItems(Items.FIRE_CHARGE), Ingredient.fromItems(Items.IRON_INGOT));
|
||||
allureBrew = BotaniaAPI.registerBrewRecipe(ModBrews.allure, Ingredient.fromItems(Items.NETHER_WART), Ingredient.fromItems(Items.COD), Ingredient.fromItems(Items.QUARTZ), Ingredient.fromItems(Items.GOLDEN_CARROT));
|
||||
clearBrew = BotaniaAPI.registerBrewRecipe(ModBrews.clear, Ingredient.fromItems(Items.NETHER_WART), Ingredient.fromItems(Items.QUARTZ), Ingredient.fromItems(Items.EMERALD), Ingredient.fromItems(Items.MELON_SLICE));
|
||||
}
|
||||
|
||||
public static void initTC() {
|
||||
@@ -77,7 +79,7 @@ public class ModBrewRecipes {
|
||||
Item bathSalts = IRegistry.ITEM.get(new ResourceLocation("thaumcraft", "bath_salts"));
|
||||
Item amber = IRegistry.ITEM.get(new ResourceLocation("thaumcraft", "amber"));
|
||||
|
||||
warpWardBrew = BotaniaAPI.registerBrewRecipe(ModBrews.warpWard, new ItemStack(Items.NETHER_WART), new ItemStack(salisMundus), new ItemStack(bathSalts), new ItemStack(amber));
|
||||
warpWardBrew = BotaniaAPI.registerBrewRecipe(ModBrews.warpWard, Ingredient.fromItems(Items.NETHER_WART), Ingredient.fromItems(salisMundus), Ingredient.fromItems(bathSalts), Ingredient.fromItems(amber));
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -4,10 +4,13 @@ import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.crafting.Ingredient;
|
||||
import net.minecraft.tags.ItemTags;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import vazkii.botania.api.BotaniaAPI;
|
||||
import vazkii.botania.api.recipe.RecipeElvenTrade;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.item.ModItems;
|
||||
import vazkii.botania.common.lib.LibMisc;
|
||||
import vazkii.botania.common.lib.LibOreDict;
|
||||
|
||||
import java.util.ArrayList;
|
||||
@@ -23,15 +26,18 @@ public class ModElvenTradeRecipes {
|
||||
public static RecipeElvenTrade alfglassRecipe;
|
||||
|
||||
public static void init() {
|
||||
dreamwoodRecipe = BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModBlocks.dreamwood), LibOreDict.LIVING_WOOD);
|
||||
Ingredient livingwood = Ingredient.fromTag(new ItemTags.Wrapper(new ResourceLocation(LibMisc.MOD_ID, "livingwood")));
|
||||
dreamwoodRecipe = BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModBlocks.dreamwood), livingwood);
|
||||
|
||||
Ingredient manaDiamond = Ingredient.fromTag(new ItemTags.Wrapper(new ResourceLocation("forge", "gems/mana_diamond")));
|
||||
Ingredient manaSteel = Ingredient.fromTag(new ItemTags.Wrapper(new ResourceLocation("forge", "ingots/manasteel")));
|
||||
elementiumRecipes = new ArrayList<>();
|
||||
elementiumRecipes.add(BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModItems.elementium), LibOreDict.MANA_STEEL, LibOreDict.MANA_STEEL));
|
||||
elementiumRecipes.add(BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModItems.elementium), manaSteel, manaSteel));
|
||||
elementiumRecipes.add(BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModBlocks.elementiumBlock), Ingredient.fromItems(ModBlocks.manasteelBlock), Ingredient.fromItems(ModBlocks.manasteelBlock)));
|
||||
|
||||
pixieDustRecipe = BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModItems.pixieDust), LibOreDict.MANA_PEARL);
|
||||
pixieDustRecipe = BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModItems.pixieDust), Ingredient.fromItems(ModItems.manaPearl));
|
||||
dragonstoneRecipes = new ArrayList<>();
|
||||
dragonstoneRecipes.add(BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModItems.dragonstone), LibOreDict.MANA_DIAMOND));
|
||||
dragonstoneRecipes.add(BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModItems.dragonstone), manaDiamond));
|
||||
dragonstoneRecipes.add(BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModBlocks.dragonstoneBlock), Ingredient.fromItems(ModBlocks.manaDiamondBlock)));
|
||||
|
||||
elvenQuartzRecipe = BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModItems.elfQuartz), Ingredient.fromItems(Items.QUARTZ));
|
||||
|
||||
@@ -20,20 +20,14 @@ import vazkii.botania.api.recipe.RecipePetals;
|
||||
import vazkii.botania.common.Botania;
|
||||
import vazkii.botania.common.core.handler.ConfigHandler;
|
||||
import vazkii.botania.common.core.helper.ItemNBTHelper;
|
||||
import vazkii.botania.common.item.ModItems;
|
||||
import vazkii.botania.common.item.block.ItemBlockSpecialFlower;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
import vazkii.botania.common.lib.LibMisc;
|
||||
import vazkii.botania.common.lib.LibOreDict;
|
||||
|
||||
import java.util.Arrays;
|
||||
|
||||
public final class ModPetalRecipes {
|
||||
|
||||
public static final String redstoneRoot = LibOreDict.REDSTONE_ROOT;
|
||||
public static final String pixieDust = LibOreDict.PIXIE_DUST;
|
||||
public static final String gaiaSpirit = LibOreDict.LIFE_ESSENCE;
|
||||
public static final String manaPowder = LibOreDict.MANA_POWDER;
|
||||
|
||||
public static RecipePetals pureDaisyRecipe;
|
||||
public static RecipePetals manastarRecipe;
|
||||
|
||||
@@ -112,6 +106,10 @@ public final class ModPetalRecipes {
|
||||
Ingredient runeEnvy = tagIngr("runes/envy");
|
||||
Ingredient runePride = tagIngr("runes/pride");
|
||||
|
||||
Ingredient redstoneRoot = Ingredient.fromItems(ModItems.redstoneRoot);
|
||||
Ingredient pixieDust = Ingredient.fromItems(ModItems.pixieDust);
|
||||
Ingredient gaiaSpirit = Ingredient.fromItems(ModItems.lifeEssence);
|
||||
|
||||
pureDaisyRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_PUREDAISY), white, white, white, white);
|
||||
manastarRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_MANASTAR), lightBlue, green, red, cyan);
|
||||
|
||||
|
||||
@@ -13,10 +13,15 @@ package vazkii.botania.common.crafting;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
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.BotaniaAPI;
|
||||
import vazkii.botania.api.recipe.RecipeRuneAltar;
|
||||
import vazkii.botania.common.crafting.recipe.HeadRecipe;
|
||||
import vazkii.botania.common.item.ModItems;
|
||||
import vazkii.botania.common.lib.LibMisc;
|
||||
import vazkii.botania.common.lib.LibOreDict;
|
||||
|
||||
import java.util.ArrayList;
|
||||
@@ -43,41 +48,57 @@ public final class ModRuneRecipes {
|
||||
|
||||
public static RecipeRuneAltar recipeHead;
|
||||
|
||||
// todo 1.13 re-tagify these once the community settles down on some names
|
||||
public static void init() {
|
||||
final int costTier1 = 5200;
|
||||
final int costTier2 = 8000;
|
||||
final int costTier3 = 12000;
|
||||
|
||||
recipeWaterRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeWater, 2), costTier1, LibOreDict.MANA_POWDER, LibOreDict.MANA_STEEL, new ItemStack(Items.BONE_MEAL), "sugarcane", new ItemStack(Items.FISHING_ROD));
|
||||
recipeFireRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeFire, 2), costTier1, LibOreDict.MANA_POWDER, LibOreDict.MANA_STEEL, "ingotBrickNether", "gunpowder", "cropNetherWart");
|
||||
Ingredient manaSteel = Ingredient.fromTag(new ItemTags.Wrapper(new ResourceLocation("forge", "ingots/manasteel")));
|
||||
Ingredient manaDiamond = Ingredient.fromTag(new ItemTags.Wrapper(new ResourceLocation("forge", "gems/mana_diamond")));
|
||||
Ingredient manaPowder = Ingredient.fromTag(new ItemTags.Wrapper(new ResourceLocation("forge", "dusts/mana")));
|
||||
recipeWaterRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeWater, 2), costTier1, manaPowder, manaSteel, Ingredient.fromItems(Items.BONE_MEAL), Ingredient.fromItems(Blocks.SUGAR_CANE), Ingredient.fromItems(Items.FISHING_ROD));
|
||||
recipeFireRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeFire, 2), costTier1, manaPowder, manaSteel, Ingredient.fromItems(Items.NETHER_BRICK), Ingredient.fromItems(Items.GUNPOWDER), Ingredient.fromItems(Items.NETHER_WART));
|
||||
|
||||
Ingredient stone = Ingredient.fromTag(Tags.Items.STONE);
|
||||
Ingredient coalBlock = Ingredient.fromTag(Tags.Items.STORAGE_BLOCKS_COAL);
|
||||
recipesEarthRune = new ArrayList<>();
|
||||
recipesEarthRune.add(BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeEarth, 2), costTier1, LibOreDict.MANA_POWDER, LibOreDict.MANA_STEEL, "stone", "blockCoal", new ItemStack(Blocks.BROWN_MUSHROOM)));
|
||||
recipesEarthRune.add(BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeEarth, 2), costTier1, LibOreDict.MANA_POWDER, LibOreDict.MANA_STEEL, "stone", "blockCoal", new ItemStack(Blocks.RED_MUSHROOM)));
|
||||
recipesEarthRune.add(BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeEarth, 2), costTier1, manaPowder, manaSteel, stone, coalBlock, Ingredient.fromItems(Blocks.BROWN_MUSHROOM, Blocks.RED_MUSHROOM)));
|
||||
|
||||
recipesAirRune = new ArrayList<>();
|
||||
for(int i = 0; i < 16; i++)
|
||||
recipesAirRune.add(BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeAir, 2), costTier1, LibOreDict.MANA_POWDER, LibOreDict.MANA_STEEL, new ItemStack(Blocks.CARPET, 1, i), "feather", "string"));
|
||||
recipesAirRune.add(BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeAir, 2), costTier1, manaPowder, manaSteel, Ingredient.fromTag(ItemTags.CARPETS), Ingredient.fromItems(Items.FEATHER), Ingredient.fromItems(Items.STRING)));
|
||||
|
||||
Ingredient fire = Ingredient.fromTag(new ItemTags.Wrapper(new ResourceLocation(LibMisc.MOD_ID, "runes/fire")));
|
||||
Ingredient water = Ingredient.fromTag(new ItemTags.Wrapper(new ResourceLocation(LibMisc.MOD_ID, "runes/water")));
|
||||
Ingredient earth = Ingredient.fromTag(new ItemTags.Wrapper(new ResourceLocation(LibMisc.MOD_ID, "runes/earth")));
|
||||
Ingredient air = Ingredient.fromTag(new ItemTags.Wrapper(new ResourceLocation(LibMisc.MOD_ID, "runes/air")));
|
||||
|
||||
recipeSpringRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeSpring), costTier2, LibOreDict.RUNE[0], LibOreDict.RUNE[1], "treeSapling", "treeSapling", "treeSapling", "cropWheat");
|
||||
recipeSummerRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeSummer), costTier2, LibOreDict.RUNE[2], LibOreDict.RUNE[3], new ItemStack(Blocks.SAND), new ItemStack(Blocks.SAND), "slimeball", new ItemStack(Items.MELON_SLICE));
|
||||
recipeAutumnRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeAutumn), costTier2, LibOreDict.RUNE[1], LibOreDict.RUNE[3], "treeLeaves", "treeLeaves", "treeLeaves", new ItemStack(Items.SPIDER_EYE));
|
||||
Ingredient sapling = Ingredient.fromTag(ItemTags.SAPLINGS);
|
||||
Ingredient leaves = Ingredient.fromTag(ItemTags.LEAVES);
|
||||
Ingredient sand = Ingredient.fromTag(ItemTags.SAND);
|
||||
recipeSpringRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeSpring), costTier2, water, fire, sapling, sapling, sapling, Ingredient.fromItems(Items.WHEAT));
|
||||
recipeSummerRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeSummer), costTier2, earth, air, sand, sand, Ingredient.fromItems(Items.SLIME_BALL), Ingredient.fromItems(Items.MELON_SLICE));
|
||||
recipeAutumnRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeAutumn), costTier2, fire, air, leaves, leaves, leaves, Ingredient.fromItems(Items.SPIDER_EYE));
|
||||
|
||||
recipesWinterRune = new ArrayList<>();
|
||||
for(int i = 0; i < 16; i++)
|
||||
recipesWinterRune.add(BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeWinter), costTier2, LibOreDict.RUNE[0], LibOreDict.RUNE[2], new ItemStack(Blocks.SNOW), new ItemStack(Blocks.SNOW), new ItemStack(Blocks.WOOL, 1, i), new ItemStack(Blocks.CAKE)));
|
||||
recipesWinterRune.add(BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeWinter), costTier2, water, earth, Ingredient.fromItems(Blocks.SNOW), Ingredient.fromItems(Blocks.SNOW), Ingredient.fromTag(ItemTags.WOOL), Ingredient.fromItems(Blocks.CAKE)));
|
||||
|
||||
recipeManaRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeMana), costTier2, LibOreDict.MANA_STEEL, LibOreDict.MANA_STEEL, LibOreDict.MANA_STEEL, LibOreDict.MANA_STEEL, LibOreDict.MANA_STEEL, LibOreDict.MANA_PEARL);
|
||||
Ingredient spring = Ingredient.fromTag(new ItemTags.Wrapper(new ResourceLocation(LibMisc.MOD_ID, "runes/spring")));
|
||||
Ingredient summer = Ingredient.fromTag(new ItemTags.Wrapper(new ResourceLocation(LibMisc.MOD_ID, "runes/summer")));
|
||||
Ingredient autumn = Ingredient.fromTag(new ItemTags.Wrapper(new ResourceLocation(LibMisc.MOD_ID, "runes/autumn")));
|
||||
Ingredient winter = Ingredient.fromTag(new ItemTags.Wrapper(new ResourceLocation(LibMisc.MOD_ID, "runes/winter")));
|
||||
|
||||
recipeManaRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeMana), costTier2, manaSteel, manaSteel, manaSteel, manaSteel, manaSteel, Ingredient.fromItems(ModItems.manaPearl));
|
||||
|
||||
recipeLustRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeLust), costTier3, LibOreDict.MANA_DIAMOND, LibOreDict.MANA_DIAMOND, LibOreDict.RUNE[5], LibOreDict.RUNE[3]);
|
||||
recipeGluttonyRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeGluttony), costTier3, LibOreDict.MANA_DIAMOND, LibOreDict.MANA_DIAMOND, LibOreDict.RUNE[7], LibOreDict.RUNE[1]);
|
||||
recipeGreedRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeGreed), costTier3, LibOreDict.MANA_DIAMOND, LibOreDict.MANA_DIAMOND, LibOreDict.RUNE[4], LibOreDict.RUNE[0]);
|
||||
recipeSlothRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeSloth), costTier3, LibOreDict.MANA_DIAMOND, LibOreDict.MANA_DIAMOND, LibOreDict.RUNE[6], LibOreDict.RUNE[3]);
|
||||
recipeWrathRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeWrath), costTier3, LibOreDict.MANA_DIAMOND, LibOreDict.MANA_DIAMOND, LibOreDict.RUNE[7], LibOreDict.RUNE[2]);
|
||||
recipeEnvyRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeEnvy), costTier3, LibOreDict.MANA_DIAMOND, LibOreDict.MANA_DIAMOND, LibOreDict.RUNE[7], LibOreDict.RUNE[0]);
|
||||
recipePrideRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runePride), costTier3, LibOreDict.MANA_DIAMOND, LibOreDict.MANA_DIAMOND, LibOreDict.RUNE[5], LibOreDict.RUNE[1]);
|
||||
recipeLustRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeLust), costTier3, manaDiamond, manaDiamond, summer, air);
|
||||
recipeGluttonyRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeGluttony), costTier3, manaDiamond, manaDiamond, winter, fire);
|
||||
recipeGreedRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeGreed), costTier3, manaDiamond, manaDiamond, spring, water);
|
||||
recipeSlothRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeSloth), costTier3, manaDiamond, manaDiamond, autumn, air);
|
||||
recipeWrathRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeWrath), costTier3, manaDiamond, manaDiamond, winter, earth);
|
||||
recipeEnvyRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeEnvy), costTier3, manaDiamond, manaDiamond, winter, water);
|
||||
recipePrideRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runePride), costTier3, manaDiamond, manaDiamond, summer, fire);
|
||||
|
||||
recipeHead = new HeadRecipe(new ItemStack(Items.PLAYER_HEAD), 22500, new ItemStack(Items.SKELETON_SKULL), LibOreDict.PIXIE_DUST, "gemPrismarine", new ItemStack(Items.NAME_TAG), new ItemStack(Items.GOLDEN_APPLE));
|
||||
recipeHead = new HeadRecipe(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));
|
||||
BotaniaAPI.runeAltarRecipes.add(recipeHead);
|
||||
}
|
||||
}
|
||||
@@ -217,9 +217,8 @@ public class ItemAstrolabe extends ItemMod {
|
||||
|
||||
BlockPos newPos = new BlockPos(xp, yp, zp);
|
||||
IBlockState state1 = player.world.getBlockState(newPos);
|
||||
Block block1 = state1.getBlock();
|
||||
if(player.world.getWorldBorder().contains(newPos)
|
||||
&& (block1.isAir(state1, player.world, newPos) || block1.isReplaceable(player.world, newPos)))
|
||||
&& (state1.isAir(player.world, newPos) || state1.getMaterial().isReplaceable()))
|
||||
coords.add(newPos);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -630,34 +630,28 @@ public final class ModItems {
|
||||
|
||||
registerOreDictionary();
|
||||
}
|
||||
|
||||
|
||||
|
||||
private static void registerOreDictionary() {
|
||||
/* TODO 1.13 reevaluate these
|
||||
OreDictionary.registerOre(LibOreDict.PESTLE_AND_MORTAR, pestleAndMortar);
|
||||
OreDictionary.registerOre(LibOreDict.MANA_STEEL, new ItemStack(manaSteel));
|
||||
OreDictionary.registerOre(LibOreDict.MANA_PEARL, new ItemStack(manaPearl));
|
||||
OreDictionary.registerOre(LibOreDict.MANA_DIAMOND, new ItemStack(manaDiamond));
|
||||
OreDictionary.registerOre(LibOreDict.LIVINGWOOD_TWIG, new ItemStack(livingwoodTwig));
|
||||
OreDictionary.registerOre(LibOreDict.TERRA_STEEL, new ItemStack(terrasteel));
|
||||
OreDictionary.registerOre(LibOreDict.LIFE_ESSENCE, new ItemStack(lifeEssence));
|
||||
OreDictionary.registerOre(LibOreDict.REDSTONE_ROOT, new ItemStack(redstoneRoot));
|
||||
OreDictionary.registerOre(LibOreDict.ELEMENTIUM, new ItemStack(elementium));
|
||||
OreDictionary.registerOre(LibOreDict.PIXIE_DUST, new ItemStack(pixieDust));
|
||||
OreDictionary.registerOre(LibOreDict.DRAGONSTONE, new ItemStack(dragonstone));
|
||||
OreDictionary.registerOre(LibOreDict.PLACEHOLDER, new ItemStack(placeholder));
|
||||
OreDictionary.registerOre(LibOreDict.RED_STRING, new ItemStack(redString));
|
||||
OreDictionary.registerOre(LibOreDict.DREAMWOOD_TWIG, new ItemStack(dreamwoodTwig));
|
||||
OreDictionary.registerOre(LibOreDict.GAIA_INGOT, new ItemStack(gaiaIngot));
|
||||
OreDictionary.registerOre(LibOreDict.ENDER_AIR_BOTTLE, new ItemStack(enderAirBottle));
|
||||
OreDictionary.registerOre(LibOreDict.MANA_STRING, new ItemStack(manaString));
|
||||
OreDictionary.registerOre(LibOreDict.MANASTEEL_NUGGET, new ItemStack(manasteelNugget));
|
||||
OreDictionary.registerOre(LibOreDict.TERRASTEEL_NUGGET, new ItemStack(terrasteelNugget));
|
||||
OreDictionary.registerOre(LibOreDict.ELEMENTIUM_NUGGET, new ItemStack(elementiumNugget));
|
||||
OreDictionary.registerOre(LibOreDict.ROOT, new ItemStack(livingroot));
|
||||
OreDictionary.registerOre(LibOreDict.PEBBLE, new ItemStack(pebble));
|
||||
OreDictionary.registerOre(LibOreDict.MANAWEAVE_CLOTH, new ItemStack(manaweaveCloth));
|
||||
OreDictionary.registerOre(LibOreDict.MANA_POWDER, new ItemStack(manaPowder));
|
||||
|
||||
OreDictionary.registerOre("rodBlaze", Items.BLAZE_ROD);
|
||||
OreDictionary.registerOre("powderBlaze", Items.BLAZE_POWDER);
|
||||
OreDictionary.registerOre(LibOreDict.BLAZE_BLOCK, blazeBlock);
|
||||
*/
|
||||
}
|
||||
}
|
||||
@@ -11,6 +11,7 @@
|
||||
package vazkii.botania.common.item.lens;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.entity.projectile.EntityThrowable;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -26,17 +27,17 @@ public class LensLight extends Lens {
|
||||
@Override
|
||||
public boolean collideBurst(IManaBurst burst, EntityThrowable entity, RayTraceResult pos, boolean isManaBlock, boolean dead, ItemStack stack) {
|
||||
BlockPos coords = burst.getBurstSourceBlockPos();
|
||||
if(!entity.world.isRemote && pos.getBlockPos() != null && !coords.equals(pos.getBlockPos()) && !burst.isFake() && !isManaBlock) {
|
||||
BlockPos pos_ = pos.getBlockPos().offset(pos.sideHit);
|
||||
if(!entity.world.isRemote && pos.type == RayTraceResult.Type.BLOCK && !coords.equals(pos.getBlockPos()) && !burst.isFake() && !isManaBlock) {
|
||||
BlockPos neighborPos = pos.getBlockPos().offset(pos.sideHit);
|
||||
|
||||
Block blockAt = entity.world.getBlockState(pos.getBlockPos()).getBlock();
|
||||
Block blockAt_ = entity.world.getBlockState(pos_).getBlock();
|
||||
IBlockState neighbor = entity.world.getBlockState(neighborPos);
|
||||
|
||||
if(blockAt == ModBlocks.manaFlame)
|
||||
entity.world.setBlockState(pos.getBlockPos(), Blocks.AIR.getDefaultState());
|
||||
else if(blockAt_.isAir(entity.world.getBlockState(pos_), entity.world, pos_) || blockAt_.isReplaceable(entity.world, pos_)) {
|
||||
entity.world.setBlockState(pos_, ModBlocks.manaFlame.getDefaultState());
|
||||
TileEntity tile = entity.world.getTileEntity(pos_);
|
||||
else if(neighbor.isAir(entity.world, neighborPos) || neighbor.getMaterial().isReplaceable()) {
|
||||
entity.world.setBlockState(neighborPos, ModBlocks.manaFlame.getDefaultState());
|
||||
TileEntity tile = entity.world.getTileEntity(neighborPos);
|
||||
|
||||
if(tile instanceof TileManaFlame)
|
||||
((TileManaFlame) tile).setColor(burst.getColor());
|
||||
|
||||
@@ -62,12 +62,14 @@ public class PageCraftingRecipe extends PageRecipe {
|
||||
|
||||
@Override
|
||||
public void onPageAdded(LexiconEntry entry, int index) {
|
||||
/* todo 1.13
|
||||
for(ResourceLocation name : recipes) {
|
||||
IRecipe recipe = ForgeRegistries.RECIPES.getValue(name);
|
||||
if(recipe != null && !recipe.getRecipeOutput().isEmpty()) {
|
||||
LexiconRecipeMappings.map(recipe.getRecipeOutput(), entry, index);
|
||||
}
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -75,7 +77,7 @@ public class PageCraftingRecipe extends PageRecipe {
|
||||
public void renderRecipe(IGuiLexiconEntry gui, int mx, int my) {
|
||||
shapelessRecipe = false;
|
||||
|
||||
IRecipe recipe = ForgeRegistries.RECIPES.getValue(recipes.get(recipeAt));
|
||||
IRecipe recipe = Minecraft.getInstance().world.getRecipeManager().getRecipe(recipes.get(recipeAt));
|
||||
renderCraftingRecipe(gui, recipe);
|
||||
|
||||
TextureManager render = Minecraft.getInstance().textureManager;
|
||||
@@ -162,11 +164,14 @@ public class PageCraftingRecipe extends PageRecipe {
|
||||
|
||||
@Override
|
||||
public List<ItemStack> getDisplayedRecipes() {
|
||||
/* todo 1.13
|
||||
return recipes.stream()
|
||||
.map(ForgeRegistries.RECIPES::getValue)
|
||||
.filter(Objects::nonNull)
|
||||
.map(IRecipe::getRecipeOutput)
|
||||
.filter(s -> !s.isEmpty())
|
||||
.collect(Collectors.toList());
|
||||
*/
|
||||
return Collections.emptyList();
|
||||
}
|
||||
}
|
||||
@@ -11,30 +11,13 @@
|
||||
package vazkii.botania.common.lib;
|
||||
|
||||
public final class LibOreDict {
|
||||
public static final String PESTLE_AND_MORTAR = "pestleAndMortar";
|
||||
public static final String TWIG_WAND = "twigWand";
|
||||
public static final String MANA_STEEL = "ingotManasteel";
|
||||
public static final String MANA_PEARL = "manaPearl";
|
||||
public static final String MANA_DIAMOND = "manaDiamond";
|
||||
public static final String LIVINGWOOD_TWIG = "livingwoodTwig";
|
||||
public static final String TERRA_STEEL = "ingotTerrasteel";
|
||||
public static final String LIFE_ESSENCE = "eternalLifeEssence";
|
||||
public static final String REDSTONE_ROOT = "redstoneRoot";
|
||||
public static final String ELEMENTIUM = "ingotElvenElementium";
|
||||
public static final String PIXIE_DUST = "elvenPixieDust";
|
||||
public static final String DRAGONSTONE = "elvenDragonstone";
|
||||
public static final String PLACEHOLDER = "bPlaceholder";
|
||||
public static final String RED_STRING = "bRedString";
|
||||
public static final String DREAMWOOD_TWIG = "dreamwoodTwig";
|
||||
public static final String GAIA_INGOT = "gaiaIngot";
|
||||
public static final String ENDER_AIR_BOTTLE = "bEnderAirBottle";
|
||||
public static final String MANA_STRING = "manaString";
|
||||
public static final String MANASTEEL_NUGGET = "nuggetManasteel";
|
||||
public static final String TERRASTEEL_NUGGET = "nuggetTerrasteel";
|
||||
public static final String ELEMENTIUM_NUGGET = "nuggetElvenElementium";
|
||||
public static final String ROOT = "livingRoot";
|
||||
public static final String PEBBLE = "pebble";
|
||||
public static final String MANAWEAVE_CLOTH = "clothManaweave";
|
||||
public static final String MANA_POWDER = "powderMana";
|
||||
|
||||
public static final String BLAZE_BLOCK = "blockBlaze";
|
||||
|
||||
Reference in new issue
Block a user