mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-21 20:52:20 +00:00
Beginning of work to flatten all special flowers. not compiling yet
more work. almost done. Compiling and launching worlds Fix models and other bugs Cleanup ,fix flower langs and tooltips remove old specialflower blockstate json
This commit is contained in:
1 parent
bd095808b7
commit
bf6dccfcd2
335 files changed
+4240
-4364
No files matched your search
@@ -18,6 +18,7 @@ import net.minecraft.util.ResourceLocation;
|
||||
import vazkii.botania.api.BotaniaAPI;
|
||||
import vazkii.botania.api.recipe.RecipePetals;
|
||||
import vazkii.botania.common.Botania;
|
||||
import vazkii.botania.common.block.ModSubtiles;
|
||||
import vazkii.botania.common.core.handler.ConfigHandler;
|
||||
import vazkii.botania.common.core.helper.ItemNBTHelper;
|
||||
import vazkii.botania.common.item.ModItems;
|
||||
@@ -110,54 +111,54 @@ public final class ModPetalRecipes {
|
||||
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);
|
||||
pureDaisyRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.pureDaisy), white, white, white, white);
|
||||
manastarRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.manastar), lightBlue, green, red, cyan);
|
||||
|
||||
endoflameRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_ENDOFLAME), brown, brown, red, lightGray);
|
||||
hydroangeasRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_HYDROANGEAS), blue, blue, cyan, cyan);
|
||||
thermalilyRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_THERMALILY), red, orange, orange, runeEarth, runeFire);
|
||||
arcaneRoseRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_ARCANE_ROSE), pink, pink, purple, purple, lime, runeMana);
|
||||
munchdewRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_MUNCHDEW), lime, lime, red, red, green, runeGluttony);
|
||||
entropinnyumRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_ENTROPINNYUM), red, red, gray, gray, white, white, runeWrath, runeFire);
|
||||
kekimurusRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_KEKIMURUS), white, white, orange, orange, brown, brown,runeGluttony, pixieDust);
|
||||
gourmaryllisRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_GOURMARYLLIS), lightGray, lightGray, yellow, yellow, red, runeFire, runeSummer);
|
||||
narslimmusRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_NARSLIMMUS), lime, lime, green, green, black, runeSummer, runeWater);
|
||||
spectrolusRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_SPECTROLUS), red, red, green, green, blue, blue, white, white, runeWinter, runeAir, pixieDust);
|
||||
rafflowsiaRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_RAFFLOWSIA), purple, purple, green, green, black, runeEarth, runePride, pixieDust);
|
||||
shulkMeNotRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_SHULK_ME_NOT), purple, purple, magenta, magenta, lightGray, gaiaSpirit, runeEnvy, runeWrath);
|
||||
dandelifeonRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_DANDELIFEON), purple, purple, lime, green, runeWater, runeFire, runeEarth, runeAir, gaiaSpirit);
|
||||
endoflameRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.endoflame), brown, brown, red, lightGray);
|
||||
hydroangeasRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.hydroangeas), blue, blue, cyan, cyan);
|
||||
thermalilyRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.thermalily), red, orange, orange, runeEarth, runeFire);
|
||||
arcaneRoseRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.rosaArcana), pink, pink, purple, purple, lime, runeMana);
|
||||
munchdewRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.munchdew), lime, lime, red, red, green, runeGluttony);
|
||||
entropinnyumRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.entropinnyum), red, red, gray, gray, white, white, runeWrath, runeFire);
|
||||
kekimurusRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.kekimurus), white, white, orange, orange, brown, brown,runeGluttony, pixieDust);
|
||||
gourmaryllisRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.gourmaryllis), lightGray, lightGray, yellow, yellow, red, runeFire, runeSummer);
|
||||
narslimmusRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.narslimmus), lime, lime, green, green, black, runeSummer, runeWater);
|
||||
spectrolusRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.spectrolus), red, red, green, green, blue, blue, white, white, runeWinter, runeAir, pixieDust);
|
||||
rafflowsiaRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.rafflowsia), purple, purple, green, green, black, runeEarth, runePride, pixieDust);
|
||||
shulkMeNotRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.shulkMeNot), purple, purple, magenta, magenta, lightGray, gaiaSpirit, runeEnvy, runeWrath);
|
||||
dandelifeonRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.dandelifeon), purple, purple, lime, green, runeWater, runeFire, runeEarth, runeAir, gaiaSpirit);
|
||||
|
||||
jadedAmaranthusRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_JADED_AMARANTHUS), purple, lime, green, runeSpring, redstoneRoot);
|
||||
bellethorneRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_BELLETHORN), red, red, red, cyan, cyan, redstoneRoot);
|
||||
dreadthorneRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_DREADTHORN), black, black, black, cyan, cyan, redstoneRoot);
|
||||
heiseiDreamRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_HEISEI_DREAM), magenta, magenta, purple, pink, runeWrath, pixieDust);
|
||||
tigerseyeRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_TIGERSEYE), yellow, brown, orange, lime, runeAutumn);
|
||||
jadedAmaranthusRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.jadedAmaranthus), purple, lime, green, runeSpring, redstoneRoot);
|
||||
bellethorneRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.bellethorn), red, red, red, cyan, cyan, redstoneRoot);
|
||||
dreadthorneRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.dreadthorn), black, black, black, cyan, cyan, redstoneRoot);
|
||||
heiseiDreamRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.heiseiDream), magenta, magenta, purple, pink, runeWrath, pixieDust);
|
||||
tigerseyeRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.tigerseye), yellow, brown, orange, lime, runeAutumn);
|
||||
|
||||
if(Botania.gardenOfGlassLoaded)
|
||||
orechidRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_ORECHID), gray, gray, yellow, yellow, green, green, red, red);
|
||||
else orechidRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_ORECHID), gray, gray, yellow, green, red, runePride, runeGreed, redstoneRoot, pixieDust);
|
||||
orechidRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.orechid), gray, gray, yellow, yellow, green, green, red, red);
|
||||
else orechidRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.orechid), gray, gray, yellow, green, red, runePride, runeGreed, redstoneRoot, pixieDust);
|
||||
|
||||
orechidIgnemRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_ORECHID_IGNEM), red, red, white, white, pink, runePride, runeGreed, redstoneRoot, pixieDust);
|
||||
orechidIgnemRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.orechidIgnem), red, red, white, white, pink, runePride, runeGreed, redstoneRoot, pixieDust);
|
||||
if(ConfigHandler.COMMON.fallenKanadeEnabled.get())
|
||||
fallenKanadeRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_FALLEN_KANADE), white, white, yellow, yellow, orange, runeSpring);
|
||||
exoflameRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_EXOFLAME), red, red, gray, lightGray, runeFire, runeSummer);
|
||||
agricarnationRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_AGRICARNATION), lime, lime, green, yellow, runeSpring, redstoneRoot);
|
||||
hopperhockRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_HOPPERHOCK), gray, gray, lightGray, lightGray, runeAir, redstoneRoot);
|
||||
tangleberrieRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_TANGLEBERRIE), cyan, cyan, gray, lightGray, runeAir, runeEarth);
|
||||
jiyuuliaRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_JIYUULIA), pink, pink, purple, lightGray, runeWater, runeAir);
|
||||
rannuncarpusRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_RANNUNCARPUS), orange, orange, yellow, runeEarth, redstoneRoot);
|
||||
hyacidusRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_HYACIDUS), purple, purple, magenta, magenta, green, runeWater, runeAutumn, redstoneRoot);
|
||||
pollidisiacRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_POLLIDISIAC), red, red, pink, pink, orange, runeLust, runeFire);
|
||||
clayconiaRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_CLAYCONIA), lightGray, lightGray, gray, cyan, runeEarth);
|
||||
looniumRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_LOONIUM), green, green, green, green, gray, runeSloth, runeGluttony, runeEnvy, redstoneRoot, pixieDust);
|
||||
daffomillRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_DAFFOMILL), white, white, brown, yellow, runeAir, redstoneRoot);
|
||||
vinculotusRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_VINCULOTUS), black, black, purple, purple, green, runeWater, runeSloth, runeLust, redstoneRoot);
|
||||
spectranthemumRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_SPECTRANTHEMUM), white, white, lightGray, lightGray, cyan, runeEnvy, runeWater, redstoneRoot, pixieDust);
|
||||
medumoneRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_MEDUMONE), brown, brown, gray, gray, runeEarth, redstoneRoot);
|
||||
marimorphosisRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_MARIMORPHOSIS), gray, yellow, green, red, runeEarth, runeFire, redstoneRoot);
|
||||
bubbellRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_BUBBELL), cyan, cyan, lightBlue, lightBlue, blue, blue, runeWater, runeSummer, pixieDust);
|
||||
solegnoliaRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_SOLEGNOLIA), brown, brown, red, blue, redstoneRoot);
|
||||
bergamuteRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_BERGAMUTE), orange, green, green, redstoneRoot);
|
||||
fallenKanadeRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.fallenKanade), white, white, yellow, yellow, orange, runeSpring);
|
||||
exoflameRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.exoflame), red, red, gray, lightGray, runeFire, runeSummer);
|
||||
agricarnationRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.agricarnation), lime, lime, green, yellow, runeSpring, redstoneRoot);
|
||||
hopperhockRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.hopperhock), gray, gray, lightGray, lightGray, runeAir, redstoneRoot);
|
||||
tangleberrieRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.tangleberrie), cyan, cyan, gray, lightGray, runeAir, runeEarth);
|
||||
jiyuuliaRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.jiyuulia), pink, pink, purple, lightGray, runeWater, runeAir);
|
||||
rannuncarpusRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.rannuncarpus), orange, orange, yellow, runeEarth, redstoneRoot);
|
||||
hyacidusRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.hyacidus), purple, purple, magenta, magenta, green, runeWater, runeAutumn, redstoneRoot);
|
||||
pollidisiacRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.pollidisiac), red, red, pink, pink, orange, runeLust, runeFire);
|
||||
clayconiaRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.clayconia), lightGray, lightGray, gray, cyan, runeEarth);
|
||||
looniumRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.loonium), green, green, green, green, gray, runeSloth, runeGluttony, runeEnvy, redstoneRoot, pixieDust);
|
||||
daffomillRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.daffomill), white, white, brown, yellow, runeAir, redstoneRoot);
|
||||
vinculotusRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.vinculotus), black, black, purple, purple, green, runeWater, runeSloth, runeLust, redstoneRoot);
|
||||
spectranthemumRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.spectranthemum), white, white, lightGray, lightGray, cyan, runeEnvy, runeWater, redstoneRoot, pixieDust);
|
||||
medumoneRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.medumone), brown, brown, gray, gray, runeEarth, redstoneRoot);
|
||||
marimorphosisRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.marimorphosis), gray, yellow, green, red, runeEarth, runeFire, redstoneRoot);
|
||||
bubbellRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.bubbell), cyan, cyan, lightBlue, lightBlue, blue, blue, runeWater, runeSummer, pixieDust);
|
||||
solegnoliaRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.solegnolia), brown, brown, red, blue, redstoneRoot);
|
||||
bergamuteRecipe = BotaniaAPI.registerPetalRecipe(new ItemStack(ModSubtiles.bergamute), orange, green, green, redstoneRoot);
|
||||
|
||||
ItemStack stack = new ItemStack(Items.PLAYER_HEAD);
|
||||
ItemNBTHelper.setString(stack, "SkullOwner", "Vazkii");
|
||||
|
||||
Reference in new issue
Block a user