mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-18 11:19:19 +00:00
Make lexicon usable, search for recipes instead of hardcoding ids
Make dice of fate function again, fix most remaining crafting recipes, fix lexicon images
This commit is contained in:
1 parent
fb2cac4bf0
commit
290c69443d
44 files changed
+1209
-1616
No files matched your search
@@ -12,7 +12,6 @@ package vazkii.botania.api.internal;
|
||||
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
@@ -21,15 +20,11 @@ import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.items.IItemHandlerModifiable;
|
||||
import vazkii.botania.api.brew.Brew;
|
||||
import vazkii.botania.api.corporea.IWrappedInventory;
|
||||
import vazkii.botania.api.corporea.InvWithLocation;
|
||||
import vazkii.botania.api.lexicon.LexiconPage;
|
||||
import vazkii.botania.api.lexicon.multiblock.MultiblockSet;
|
||||
import vazkii.botania.api.recipe.RecipeBrew;
|
||||
import vazkii.botania.api.recipe.RecipeElvenTrade;
|
||||
import vazkii.botania.api.recipe.RecipeManaInfusion;
|
||||
import vazkii.botania.api.recipe.RecipePetals;
|
||||
import vazkii.botania.api.recipe.RecipeRuneAltar;
|
||||
import vazkii.botania.api.subtile.TileEntitySpecialFlower;
|
||||
|
||||
import java.util.List;
|
||||
@@ -52,57 +47,32 @@ public class DummyMethodHandler implements IInternalMethodHandler {
|
||||
}
|
||||
|
||||
@Override
|
||||
public LexiconPage craftingRecipesPage(String key, List<ResourceLocation> recipes) {
|
||||
public LexiconPage craftingRecipePage(String key, Item... outputItems) {
|
||||
return dummyPage(key);
|
||||
}
|
||||
|
||||
@Override
|
||||
public LexiconPage craftingRecipePage(String key, ResourceLocation recipe) {
|
||||
public LexiconPage petalRecipePage(String key, Item... outputItems) {
|
||||
return dummyPage(key);
|
||||
}
|
||||
|
||||
@Override
|
||||
public LexiconPage petalRecipesPage(String key, List<RecipePetals> recipes) {
|
||||
public LexiconPage runeRecipePage(String key, Item... outputItems) {
|
||||
return dummyPage(key);
|
||||
}
|
||||
|
||||
@Override
|
||||
public LexiconPage petalRecipePage(String key, RecipePetals recipe) {
|
||||
public LexiconPage manaInfusionRecipePage(String key, Item... outputItems) {
|
||||
return dummyPage(key);
|
||||
}
|
||||
|
||||
@Override
|
||||
public LexiconPage runeRecipesPage(String key, List<RecipeRuneAltar> recipes) {
|
||||
public LexiconPage elvenTradePage(String key, Item... outputItems) {
|
||||
return dummyPage(key);
|
||||
}
|
||||
|
||||
@Override
|
||||
public LexiconPage runeRecipePage(String key, RecipeRuneAltar recipe) {
|
||||
return dummyPage(key);
|
||||
}
|
||||
|
||||
@Override
|
||||
public LexiconPage manaInfusionRecipesPage(String key, List<RecipeManaInfusion> recipes) {
|
||||
return dummyPage(key);
|
||||
}
|
||||
|
||||
@Override
|
||||
public LexiconPage manaInfusionRecipePage(String key, RecipeManaInfusion recipe) {
|
||||
return dummyPage(key);
|
||||
}
|
||||
|
||||
@Override
|
||||
public LexiconPage elvenTradePage(String key, List<RecipeElvenTrade> recipes) {
|
||||
return dummyPage(key);
|
||||
}
|
||||
|
||||
@Override
|
||||
public LexiconPage elvenTradesPage(String key, RecipeElvenTrade recipe) {
|
||||
return dummyPage(key);
|
||||
}
|
||||
|
||||
@Override
|
||||
public LexiconPage brewPage(String key, String bottomText, RecipeBrew recipe) {
|
||||
public LexiconPage brewPage(String key, String bottomText, Brew outputBrew) {
|
||||
return dummyPage(key);
|
||||
}
|
||||
|
||||
|
||||
@@ -10,10 +10,8 @@
|
||||
*/
|
||||
package vazkii.botania.api.internal;
|
||||
|
||||
import net.minecraft.client.renderer.model.ModelResourceLocation;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
@@ -24,15 +22,11 @@ import net.minecraft.world.World;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||
import net.minecraftforge.items.IItemHandlerModifiable;
|
||||
import vazkii.botania.api.brew.Brew;
|
||||
import vazkii.botania.api.corporea.IWrappedInventory;
|
||||
import vazkii.botania.api.corporea.InvWithLocation;
|
||||
import vazkii.botania.api.lexicon.LexiconPage;
|
||||
import vazkii.botania.api.lexicon.multiblock.MultiblockSet;
|
||||
import vazkii.botania.api.recipe.RecipeBrew;
|
||||
import vazkii.botania.api.recipe.RecipeElvenTrade;
|
||||
import vazkii.botania.api.recipe.RecipeManaInfusion;
|
||||
import vazkii.botania.api.recipe.RecipePetals;
|
||||
import vazkii.botania.api.recipe.RecipeRuneAltar;
|
||||
import vazkii.botania.api.subtile.TileEntitySpecialFlower;
|
||||
|
||||
import java.util.List;
|
||||
@@ -52,27 +46,17 @@ public interface IInternalMethodHandler {
|
||||
|
||||
public LexiconPage imagePage(String key, String resource);
|
||||
|
||||
public LexiconPage craftingRecipesPage(String key, List<ResourceLocation> recipes);
|
||||
public LexiconPage craftingRecipePage(String key, Item... outputItems);
|
||||
|
||||
public LexiconPage craftingRecipePage(String key, ResourceLocation recipe);
|
||||
public LexiconPage petalRecipePage(String key, Item... outputItems);
|
||||
|
||||
public LexiconPage petalRecipesPage(String key, List<RecipePetals> recipes);
|
||||
public LexiconPage runeRecipePage(String key, Item... outputItems);
|
||||
|
||||
public LexiconPage petalRecipePage(String key, RecipePetals recipe);
|
||||
public LexiconPage manaInfusionRecipePage(String key, Item... outputItems);
|
||||
|
||||
public LexiconPage runeRecipesPage(String key, List<RecipeRuneAltar> recipes);
|
||||
public LexiconPage elvenTradePage(String key, Item... outputItems);
|
||||
|
||||
public LexiconPage runeRecipePage(String key, RecipeRuneAltar recipe);
|
||||
|
||||
public LexiconPage manaInfusionRecipesPage(String key, List<RecipeManaInfusion> recipes);
|
||||
|
||||
public LexiconPage manaInfusionRecipePage(String key, RecipeManaInfusion recipe);
|
||||
|
||||
public LexiconPage elvenTradePage(String key, List<RecipeElvenTrade> recipes);
|
||||
|
||||
public LexiconPage elvenTradesPage(String key, RecipeElvenTrade recipe);
|
||||
|
||||
public LexiconPage brewPage(String key, String bottomText, RecipeBrew recipe);
|
||||
public LexiconPage brewPage(String key, String bottomText, Brew outputBrew);
|
||||
|
||||
public LexiconPage multiblockPage(String key, MultiblockSet mb);
|
||||
|
||||
|
||||
@@ -28,6 +28,9 @@ public final class LexiconRecipeMappings {
|
||||
* Maps the given stack to the given page of the entry.
|
||||
*/
|
||||
public static void map(ItemStack stack, LexiconEntry entry, int page, boolean force) {
|
||||
if(stack.isEmpty())
|
||||
return;
|
||||
|
||||
EntryData data = new EntryData(entry, page);
|
||||
String str = stackToString(stack);
|
||||
|
||||
@@ -46,9 +49,6 @@ public final class LexiconRecipeMappings {
|
||||
}
|
||||
|
||||
public static EntryData getDataForStack(ItemStack stack) {
|
||||
String wildKey = stackToString(stack);
|
||||
if (mappings.containsKey(wildKey))
|
||||
return mappings.get(wildKey);
|
||||
return mappings.get(stackToString(stack));
|
||||
}
|
||||
|
||||
@@ -62,6 +62,10 @@ public final class LexiconRecipeMappings {
|
||||
return stack.getTranslationKey();
|
||||
}
|
||||
|
||||
public static void clear() {
|
||||
mappings.clear();
|
||||
}
|
||||
|
||||
public static class EntryData {
|
||||
|
||||
public final LexiconEntry entry;
|
||||
|
||||
@@ -148,18 +148,21 @@ public class GuiLexicon extends Screen {
|
||||
int guiScale = mc.gameSettings.guiScale;
|
||||
int persistentScale = Math.min(PersistentVariableHelper.lexiconGuiScale, getMaxAllowedScale());
|
||||
|
||||
if(persistentScale > 0 && persistentScale != guiScale) {
|
||||
// Fake the scale temporarily so we can get the scaled width from mainWindow
|
||||
mc.gameSettings.guiScale = persistentScale;
|
||||
mc.updateWindowSize();
|
||||
if(persistentScale > 0 && persistentScale != guiScale) { //todo changing gui scale with this now results in endless recursion
|
||||
// // Fake the scale temporarily so we can get the scaled width from mainWindow
|
||||
// mc.gameSettings.guiScale = persistentScale;
|
||||
// mc.updateWindowSize();
|
||||
|
||||
// mc.mainWindow.setGuiScale(mc.mainWindow.calcGuiScale(persistentScale, Minecraft.getInstance().getForceUnicodeFont()));
|
||||
|
||||
// Get the info
|
||||
width = mc.mainWindow.getScaledWidth();
|
||||
height = mc.mainWindow.getScaledHeight();
|
||||
|
||||
// Change it back
|
||||
mc.gameSettings.guiScale = guiScale;
|
||||
mc.updateWindowSize();
|
||||
|
||||
// mc.mainWindow.setGuiScale(guiScale);
|
||||
// // Change it back
|
||||
// mc.gameSettings.guiScale = guiScale;
|
||||
// mc.updateWindowSize();
|
||||
}
|
||||
|
||||
List<LexiconCategory> allCategories = new ArrayList<>(BotaniaAPI.getAllCategories());
|
||||
@@ -177,7 +180,7 @@ public class GuiLexicon extends Screen {
|
||||
int x = 18;
|
||||
for(int i = 0; i < 12; i++) {
|
||||
int y = 16 + i * 12;
|
||||
buttons.add(new GuiButtonIndexEntry((GuiLexiconIndex) this, i, left + x, top + y, 110, 10, ""));
|
||||
addButton(new GuiButtonIndexEntry((GuiLexiconIndex) this, i, left + x, top + y, 110, 10, ""));
|
||||
}
|
||||
populateIndex();
|
||||
} else if(isCategoryIndex()) {
|
||||
@@ -191,18 +194,18 @@ public class GuiLexicon extends Screen {
|
||||
|
||||
int size = 22;
|
||||
GuiButtonCategory button = new GuiButtonCategory(left + 18 + x * size, top + 50 + y * size, this, category);
|
||||
buttons.add(button);
|
||||
addButton(button);
|
||||
}
|
||||
}
|
||||
populateBookmarks();
|
||||
if(isMainPage()) {
|
||||
buttons.add(new GuiButtonOptions(left + 20, top + guiHeight - 25));
|
||||
buttons.add(new GuiButtonAchievement(left + 33, top + guiHeight - 25));
|
||||
buttons.add(new GuiButtonChallenges(left + 45, top + guiHeight - 25));
|
||||
buttons.add(new GuiButtonScaleChange(left + 57, top + guiHeight - 25));
|
||||
addButton(new GuiButtonOptions(left + 20, top + guiHeight - 25));
|
||||
addButton(new GuiButtonAchievement(left + 33, top + guiHeight - 25));
|
||||
addButton(new GuiButtonChallenges(left + 45, top + guiHeight - 25));
|
||||
addButton(new GuiButtonScaleChange(left + 57, top + guiHeight - 25));
|
||||
|
||||
GuiButtonUpdateWarning button = new GuiButtonUpdateWarning(left - 6, top + guiHeight - 70);
|
||||
buttons.add(button);
|
||||
addButton(button);
|
||||
|
||||
if(PersistentVariableHelper.lastBotaniaVersion.equals(LibMisc.VERSION)) {
|
||||
button.active = false;
|
||||
@@ -212,10 +215,10 @@ public class GuiLexicon extends Screen {
|
||||
LocalDateTime now = LocalDateTime.now();
|
||||
|
||||
if(now.getMonth() == Month.NOVEMBER && now.getDayOfMonth() == 22)
|
||||
buttons.add(new GuiButtonDoot(left + 100, top + 12));
|
||||
addButton(new GuiButtonDoot(left + 100, top + 12));
|
||||
}
|
||||
|
||||
buttons.add(new GuiButtonNotes(this, left - 4, top - 4));
|
||||
addButton(new GuiButtonNotes(this, left - 4, top - 4));
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -487,13 +490,13 @@ public class GuiLexicon extends Screen {
|
||||
for(int i = 0; i < len + (addEnabled ? 1 : 0); i++) {
|
||||
boolean isAdd = i == bookmarks.size();
|
||||
GuiLexicon destination = isAdd ? null : bookmarks.get(i);
|
||||
buttons.add(new GuiButtonBookmark(i, left + 138, top + 18 + 14 * i, destination == null ? this : destination, destination == null ? "+" : destination.getTitle().getFormattedText()));
|
||||
addButton(new GuiButtonBookmark(i, left + 138, top + 18 + 14 * i, destination == null ? this : destination, destination == null ? "+" : destination.getTitle().getFormattedText()));
|
||||
}
|
||||
|
||||
if(isMainPage())
|
||||
buttons.add(new GuiButtonHistory(left + 138, top + guiHeight - 24, I18n.format("botaniamisc.history"), this));
|
||||
addButton(new GuiButtonHistory(left + 138, top + guiHeight - 24, I18n.format("botaniamisc.history"), this));
|
||||
else if(isChallenge())
|
||||
buttons.add(new GuiButtonChallengeInfo(left + 138, top + guiHeight - 24, I18n.format("botaniamisc.info"), this));
|
||||
addButton(new GuiButtonChallengeInfo(left + 138, top + guiHeight - 24, I18n.format("botaniamisc.info"), this));
|
||||
}
|
||||
|
||||
public static void startTutorial() {
|
||||
|
||||
@@ -50,11 +50,11 @@ public class GuiLexiconChallenge extends GuiLexicon implements IParented {
|
||||
public void onInitGui() {
|
||||
super.onInitGui();
|
||||
|
||||
buttons.add(backButton = new GuiButtonBack(left + guiWidth / 2 - 8, top + guiHeight + 2, b -> {
|
||||
addButton(backButton = new GuiButtonBack(left + guiWidth / 2 - 8, top + guiHeight + 2, b -> {
|
||||
mc.displayGuiScreen(parent);
|
||||
ClientTickHandler.notifyPageChange();
|
||||
}));
|
||||
buttons.add(completeButton = new Button(left + 20, top + guiHeight - 35, guiWidth - 40, 20, "", b -> {
|
||||
addButton(completeButton = new Button(left + 20, top + guiHeight - 35, guiWidth - 40, 20, "", b -> {
|
||||
challenge.complete = !challenge.complete;
|
||||
setCompleteButtonTitle();
|
||||
PersistentVariableHelper.saveSafe();
|
||||
|
||||
@@ -40,7 +40,7 @@ public class GuiLexiconChallengesList extends GuiLexicon implements IParented {
|
||||
public void onInitGui() {
|
||||
super.onInitGui();
|
||||
|
||||
buttons.add(backButton = new GuiButtonBack(left + guiWidth / 2 - 8, top + guiHeight + 2, b -> {
|
||||
addButton(backButton = new GuiButtonBack(left + guiWidth / 2 - 8, top + guiHeight + 2, b -> {
|
||||
mc.displayGuiScreen(parent);
|
||||
ClientTickHandler.notifyPageChange();
|
||||
}));
|
||||
@@ -51,7 +51,7 @@ public class GuiLexiconChallengesList extends GuiLexicon implements IParented {
|
||||
for(EnumChallengeLevel level : EnumChallengeLevel.class.getEnumConstants()) {
|
||||
int j = 0;
|
||||
for(Challenge c : ModChallenges.challenges.get(level)) {
|
||||
buttons.add(new GuiButtonChallengeIcon(left + 20 + j % perline * 18, y + j / perline * 17, c, this));
|
||||
addButton(new GuiButtonChallengeIcon(left + 20 + j % perline * 18, y + j / perline * 17, c, this));
|
||||
i++;
|
||||
j++;
|
||||
}
|
||||
|
||||
@@ -80,12 +80,12 @@ public class GuiLexiconEntry extends GuiLexicon implements IGuiLexiconEntry, IPa
|
||||
public void onInitGui() {
|
||||
super.onInitGui();
|
||||
|
||||
buttons.add(backButton = new GuiButtonBackWithShift(left + guiWidth / 2 - 8, top + guiHeight + 2, b -> {
|
||||
addButton(backButton = new GuiButtonBackWithShift(left + guiWidth / 2 - 8, top + guiHeight + 2, b -> {
|
||||
entry.pages.get(page).onClosed(GuiLexiconEntry.this);
|
||||
mc.displayGuiScreen(Screen.hasShiftDown() ? new GuiLexicon() : parent);
|
||||
ClientTickHandler.notifyPageChange();
|
||||
}));
|
||||
buttons.add(leftButton = new GuiButtonPage(left, top + guiHeight - 10, false, b -> {
|
||||
addButton(leftButton = new GuiButtonPage(left, top + guiHeight - 10, false, b -> {
|
||||
entry.pages.get(page).onClosed(GuiLexiconEntry.this);
|
||||
page--;
|
||||
entry.pages.get(page).onOpened(GuiLexiconEntry.this);
|
||||
@@ -93,7 +93,7 @@ public class GuiLexiconEntry extends GuiLexicon implements IGuiLexiconEntry, IPa
|
||||
ClientTickHandler.notifyPageChange();
|
||||
updatePageButtons();
|
||||
}));
|
||||
buttons.add(rightButton = new GuiButtonPage(left + guiWidth - 18, top + guiHeight - 10, true, b -> {
|
||||
addButton(rightButton = new GuiButtonPage(left + guiWidth - 18, top + guiHeight - 10, true, b -> {
|
||||
entry.pages.get(page).onClosed(GuiLexiconEntry.this);
|
||||
page++;
|
||||
entry.pages.get(page).onOpened(GuiLexiconEntry.this);
|
||||
@@ -101,7 +101,7 @@ public class GuiLexiconEntry extends GuiLexicon implements IGuiLexiconEntry, IPa
|
||||
ClientTickHandler.notifyPageChange();
|
||||
updatePageButtons();
|
||||
}));
|
||||
buttons.add(new GuiButtonShare(left + guiWidth - 6, top - 2, b -> {
|
||||
addButton(new GuiButtonShare(left + guiWidth - 6, top - 2, b -> {
|
||||
Minecraft mc = Minecraft.getInstance();
|
||||
String cmd = "/botania-share " + entry.getUnlocalizedName();
|
||||
|
||||
@@ -109,7 +109,7 @@ public class GuiLexiconEntry extends GuiLexicon implements IGuiLexiconEntry, IPa
|
||||
mc.player.sendChatMessage(cmd);
|
||||
}));
|
||||
if(entry.getWebLink() != null)
|
||||
buttons.add(new GuiButtonViewOnline(left - 8, top + 12, b -> {
|
||||
addButton(new GuiButtonViewOnline(left - 8, top + 12, b -> {
|
||||
try {
|
||||
if(Desktop.isDesktopSupported())
|
||||
Desktop.getDesktop().browse(new URI(entry.getWebLink()));
|
||||
|
||||
@@ -95,17 +95,17 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented {
|
||||
return;
|
||||
}
|
||||
|
||||
buttons.add(backButton = new GuiButtonBack(left + guiWidth / 2 - 8, top + guiHeight + 2, b -> {
|
||||
addButton(backButton = new GuiButtonBack(left + guiWidth / 2 - 8, top + guiHeight + 2, b -> {
|
||||
mc.displayGuiScreen(parent);
|
||||
ClientTickHandler.notifyPageChange();
|
||||
}));
|
||||
buttons.add(leftButton = new GuiButtonPage(left, top + guiHeight - 10, false, b -> {
|
||||
addButton(leftButton = new GuiButtonPage(left, top + guiHeight - 10, false, b -> {
|
||||
page--;
|
||||
updatePageButtons();
|
||||
populateIndex();
|
||||
ClientTickHandler.notifyPageChange();
|
||||
}));
|
||||
buttons.add(rightButton = new GuiButtonPage(left + guiWidth - 18, top + guiHeight - 10, true, b -> {
|
||||
addButton(rightButton = new GuiButtonPage(left + guiWidth - 18, top + guiHeight - 10, true, b -> {
|
||||
page++;
|
||||
updatePageButtons();
|
||||
populateIndex();
|
||||
|
||||
@@ -58,7 +58,6 @@ public final class LibResources {
|
||||
public static final String ENTRY_SPREADER = PREFIX_ENTRIES + "spreader.png";
|
||||
public static final String ENTRY_BAUBLES = PREFIX_ENTRIES + "baubles.png";
|
||||
public static final String ENTRY_ELVEN_GARDE = PREFIX_ENTRIES + "elven_garde.png";
|
||||
public static final String ENTRY_DIMINISHING_RETURNS = PREFIX_ENTRIES + "diminishing_returns.png";
|
||||
public static final String ENTRY_HYDROANGEAS = PREFIX_ENTRIES + "hydroangeas.png";
|
||||
public static final String ENTRY_CRAFT_CRATE = PREFIX_ENTRIES + "craft_crate.png";
|
||||
public static final String ENTRY_AZULEJOS = PREFIX_ENTRIES + "azulejos.png";
|
||||
|
||||
@@ -119,6 +119,7 @@ public class Botania {
|
||||
MinecraftForge.EVENT_BUS.addListener(this::serverAboutToStart);
|
||||
MinecraftForge.EVENT_BUS.addListener(this::serverStarting);
|
||||
MinecraftForge.EVENT_BUS.addListener(this::serverStopping);
|
||||
// MinecraftForge.EVENT_BUS.addListener(LexiconData::reload);
|
||||
}
|
||||
|
||||
private void commonSetup(FMLCommonSetupEvent event) {
|
||||
@@ -135,7 +136,6 @@ public class Botania {
|
||||
PacketHandler.init();
|
||||
ModBrews.init();
|
||||
ModMultiblocks.init();
|
||||
ModCraftingRecipes.init();
|
||||
|
||||
if(Botania.thaumcraftLoaded) {
|
||||
if(ConfigHandler.COMMON.enableThaumcraftAspects.get()) {
|
||||
|
||||
@@ -1060,5 +1060,25 @@ public final class ModBlocks {
|
||||
case BLACK: return doubleFlowerBlack;
|
||||
}
|
||||
}
|
||||
|
||||
public static Block getPetalBlock(DyeColor color) {
|
||||
switch (color) {
|
||||
default:
|
||||
case WHITE: return petalBlockWhite;
|
||||
case ORANGE: return petalBlockOrange;
|
||||
case MAGENTA: return petalBlockMagenta;
|
||||
case LIGHT_BLUE: return petalBlockLightBlue;
|
||||
case YELLOW: return petalBlockYellow;
|
||||
case LIME: return petalBlockLime;
|
||||
case PINK: return petalBlockPink;
|
||||
case GRAY: return petalBlockGray;
|
||||
case LIGHT_GRAY: return petalBlockSilver;
|
||||
case CYAN: return petalBlockCyan;
|
||||
case PURPLE: return petalBlockPurple;
|
||||
case BLUE: return petalBlockBlue;
|
||||
case BROWN: return petalBlockBrown;
|
||||
case GREEN: return petalBlockGreen;
|
||||
case RED: return petalBlockRed;
|
||||
case BLACK: return petalBlockBlack;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -13,18 +13,17 @@ package vazkii.botania.common.core.handler;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.Direction;
|
||||
import net.minecraft.util.Direction;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.util.LazyOptional;
|
||||
import net.minecraftforge.items.IItemHandlerModifiable;
|
||||
import net.minecraftforge.items.wrapper.EmptyHandler;
|
||||
import vazkii.botania.api.brew.Brew;
|
||||
import vazkii.botania.api.corporea.CorporeaHelper;
|
||||
import vazkii.botania.api.corporea.ICorporeaSpark;
|
||||
import vazkii.botania.api.corporea.IWrappedInventory;
|
||||
@@ -33,11 +32,6 @@ import vazkii.botania.api.internal.DummyMethodHandler;
|
||||
import vazkii.botania.api.internal.IManaNetwork;
|
||||
import vazkii.botania.api.lexicon.LexiconPage;
|
||||
import vazkii.botania.api.lexicon.multiblock.MultiblockSet;
|
||||
import vazkii.botania.api.recipe.RecipeBrew;
|
||||
import vazkii.botania.api.recipe.RecipeElvenTrade;
|
||||
import vazkii.botania.api.recipe.RecipeManaInfusion;
|
||||
import vazkii.botania.api.recipe.RecipePetals;
|
||||
import vazkii.botania.api.recipe.RecipeRuneAltar;
|
||||
import vazkii.botania.api.subtile.ISpecialFlower;
|
||||
import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
|
||||
import vazkii.botania.api.subtile.TileEntityGeneratingFlower;
|
||||
@@ -85,58 +79,33 @@ public class InternalMethodHandler extends DummyMethodHandler {
|
||||
}
|
||||
|
||||
@Override
|
||||
public LexiconPage craftingRecipesPage(String key, List<ResourceLocation> recipes) {
|
||||
return new PageCraftingRecipe(key, recipes);
|
||||
public LexiconPage craftingRecipePage(String key, Item... outputItems) {
|
||||
return new PageCraftingRecipe(key, outputItems);
|
||||
}
|
||||
|
||||
@Override
|
||||
public LexiconPage craftingRecipePage(String key, ResourceLocation recipe) {
|
||||
return new PageCraftingRecipe(key, recipe);
|
||||
public LexiconPage petalRecipePage(String key, Item... outputItems) {
|
||||
return new PagePetalRecipe(key, outputItems);
|
||||
}
|
||||
|
||||
@Override
|
||||
public LexiconPage petalRecipesPage(String key, List<RecipePetals> recipes) {
|
||||
return new PagePetalRecipe<>(key, recipes);
|
||||
public LexiconPage runeRecipePage(String key, Item... outputItems) {
|
||||
return new PageRuneRecipe(key, outputItems);
|
||||
}
|
||||
|
||||
@Override
|
||||
public LexiconPage petalRecipePage(String key, RecipePetals recipe) {
|
||||
return new PagePetalRecipe<>(key, recipe);
|
||||
public LexiconPage manaInfusionRecipePage(String key, Item... outputItems) {
|
||||
return new PageManaInfusionRecipe(key, outputItems);
|
||||
}
|
||||
|
||||
@Override
|
||||
public LexiconPage runeRecipesPage(String key, List<RecipeRuneAltar> recipes) {
|
||||
return new PageRuneRecipe(key, recipes);
|
||||
public LexiconPage elvenTradePage(String key, Item... outputItems) {
|
||||
return new PageElvenRecipe(key, outputItems);
|
||||
}
|
||||
|
||||
@Override
|
||||
public LexiconPage runeRecipePage(String key, RecipeRuneAltar recipe) {
|
||||
return new PageRuneRecipe(key, recipe);
|
||||
}
|
||||
|
||||
@Override
|
||||
public LexiconPage manaInfusionRecipesPage(String key, List<RecipeManaInfusion> recipes) {
|
||||
return new PageManaInfusionRecipe(key, recipes);
|
||||
}
|
||||
|
||||
@Override
|
||||
public LexiconPage manaInfusionRecipePage(String key, RecipeManaInfusion recipe) {
|
||||
return new PageManaInfusionRecipe(key, recipe);
|
||||
}
|
||||
|
||||
@Override
|
||||
public LexiconPage elvenTradePage(String key, List<RecipeElvenTrade> recipes) {
|
||||
return new PageElvenRecipe(key, recipes);
|
||||
}
|
||||
|
||||
@Override
|
||||
public LexiconPage elvenTradesPage(String key, RecipeElvenTrade recipe) {
|
||||
return new PageElvenRecipe(key, recipe);
|
||||
}
|
||||
|
||||
@Override
|
||||
public LexiconPage brewPage(String key, String bottomText, RecipeBrew recipe) {
|
||||
return new PageBrew(recipe, key, bottomText);
|
||||
public LexiconPage brewPage(String key, String bottomText, Brew outputBrew) {
|
||||
return new PageBrew(outputBrew, key, bottomText);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -37,30 +37,6 @@ import static vazkii.botania.common.lib.ResourceLocationHelper.prefix;
|
||||
@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID)
|
||||
public class ModBrewRecipes {
|
||||
|
||||
public static RecipeBrew speedBrew;
|
||||
public static RecipeBrew strengthBrew;
|
||||
public static RecipeBrew hasteBrew;
|
||||
public static RecipeBrew healingBrew;
|
||||
public static RecipeBrew jumpBoostBrew;
|
||||
public static RecipeBrew regenerationBrew;
|
||||
public static RecipeBrew weakRegenerationBrew;
|
||||
public static RecipeBrew resistanceBrew;
|
||||
public static RecipeBrew fireResistanceBrew;
|
||||
public static RecipeBrew waterBreathingBrew;
|
||||
public static RecipeBrew invisibilityBrew;
|
||||
public static RecipeBrew nightVisionBrew;
|
||||
public static RecipeBrew absorptionBrew;
|
||||
|
||||
public static RecipeBrew overloadBrew;
|
||||
public static RecipeBrew soulCrossBrew;
|
||||
public static RecipeBrew featherFeetBrew;
|
||||
public static RecipeBrew emptinessBrew;
|
||||
public static RecipeBrew bloodthirstBrew;
|
||||
public static RecipeBrew allureBrew;
|
||||
public static RecipeBrew clearBrew;
|
||||
|
||||
public static RecipeBrew warpWardBrew;
|
||||
|
||||
@SubscribeEvent
|
||||
public static void register(RegisterRecipesEvent evt) {
|
||||
evt.brew().accept(new RecipeBrew(prefix("speed"), ModBrews.speed, Ingredient.fromItems(Items.NETHER_WART), Ingredient.fromItems(Items.SUGAR), Ingredient.fromItems(Items.REDSTONE)));
|
||||
|
||||
@@ -10,571 +10,22 @@
|
||||
*/
|
||||
package vazkii.botania.common.crafting;
|
||||
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import net.minecraft.item.crafting.ICraftingRecipe;
|
||||
import net.minecraft.item.crafting.IRecipe;
|
||||
import net.minecraft.item.crafting.IRecipeType;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.fml.server.ServerLifecycleHooks;
|
||||
import vazkii.botania.common.Botania;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.item.ModItems;
|
||||
import vazkii.botania.common.item.equipment.bauble.ItemBaubleCosmetic;
|
||||
import vazkii.botania.common.lib.LibItemNames;
|
||||
import vazkii.botania.common.lib.LibMisc;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.IntStream;
|
||||
|
||||
public final class ModCraftingRecipes {
|
||||
|
||||
public static ResourceLocation recipeLexicon;
|
||||
public static List<ResourceLocation> recipesPetals;
|
||||
public static List<ResourceLocation> recipesDyes;
|
||||
public static List<ResourceLocation> recipesPetalBlocks;
|
||||
public static List<ResourceLocation> recipesReversePetalBlocks;
|
||||
public static ResourceLocation recipePestleAndMortar;
|
||||
public static List<ResourceLocation> recipesTwigWand;
|
||||
public static ResourceLocation recipeApothecary;
|
||||
public static List<ResourceLocation> recipesSpreader;
|
||||
public static List<ResourceLocation> recipesManaLens;
|
||||
public static ResourceLocation recipePool;
|
||||
public static ResourceLocation recipePoolDiluted;
|
||||
public static ResourceLocation recipePoolFabulous;
|
||||
public static ResourceLocation recipeRuneAltar;
|
||||
public static ResourceLocation recipeLensVelocity;
|
||||
public static ResourceLocation recipeLensPotency;
|
||||
public static ResourceLocation recipeLensResistance;
|
||||
public static ResourceLocation recipeLensEfficiency;
|
||||
public static ResourceLocation recipeLensBounce;
|
||||
public static ResourceLocation recipeLensGravity;
|
||||
public static ResourceLocation recipeLensBore;
|
||||
public static ResourceLocation recipeLensDamaging;
|
||||
public static ResourceLocation recipeLensPhantom;
|
||||
public static ResourceLocation recipeLensMagnet;
|
||||
public static ResourceLocation recipeLensExplosive;
|
||||
public static ResourceLocation recipePylon;
|
||||
public static ResourceLocation recipeDistributor;
|
||||
public static ResourceLocation recipeLivingrockDecor1;
|
||||
public static ResourceLocation recipeLivingrockDecor2;
|
||||
public static ResourceLocation recipeLivingrockDecor3;
|
||||
public static ResourceLocation recipeLivingrockDecor4;
|
||||
public static ResourceLocation recipeLivingwoodDecor1;
|
||||
public static ResourceLocation recipeLivingwoodDecor2;
|
||||
public static ResourceLocation recipeLivingwoodDecor3;
|
||||
public static ResourceLocation recipeLivingwoodDecor4;
|
||||
public static ResourceLocation recipeLivingwoodDecor5;
|
||||
public static ResourceLocation recipeManaVoid;
|
||||
public static ResourceLocation recipeManaTablet;
|
||||
public static ResourceLocation recipeManaDetector;
|
||||
public static ResourceLocation recipeManaBlaster;
|
||||
public static ResourceLocation recipeTurntable;
|
||||
public static ResourceLocation recipeFertilizerPowder;
|
||||
public static ResourceLocation recipeFerilizerDye;
|
||||
public static ResourceLocation recipeLivingwoodTwig;
|
||||
public static ResourceLocation recipeDirtRod;
|
||||
public static ResourceLocation recipeTerraformRod;
|
||||
public static ResourceLocation recipeRedstoneSpreader;
|
||||
public static ResourceLocation recipeManaMirror;
|
||||
public static ResourceLocation recipeManasteelHelm;
|
||||
public static ResourceLocation recipeManasteelChest;
|
||||
public static ResourceLocation recipeManasteelLegs;
|
||||
public static ResourceLocation recipeManasteelBoots;
|
||||
public static ResourceLocation recipeManasteelPick;
|
||||
public static ResourceLocation recipeManasteelShovel;
|
||||
public static ResourceLocation recipeManasteelAxe;
|
||||
public static ResourceLocation recipeManasteelShears;
|
||||
public static ResourceLocation recipeManasteelSword;
|
||||
public static ResourceLocation recipeGrassHorn;
|
||||
public static ResourceLocation recipeTerrasteelHelm;
|
||||
public static ResourceLocation recipeTerrasteelChest;
|
||||
public static ResourceLocation recipeTerrasteelLegs;
|
||||
public static ResourceLocation recipeTerrasteelBoots;
|
||||
public static ResourceLocation recipeTerraSword;
|
||||
public static ResourceLocation recipeTinyPlanet;
|
||||
public static ResourceLocation recipeManaRing;
|
||||
public static ResourceLocation recipeAuraRing;
|
||||
public static ResourceLocation recipeGreaterManaRing;
|
||||
public static ResourceLocation recipeGreaterAuraRing;
|
||||
public static ResourceLocation recipeTravelBelt;
|
||||
public static ResourceLocation recipeKnockbackBelt;
|
||||
public static ResourceLocation recipeIcePendant;
|
||||
public static ResourceLocation recipeLavaPendant;
|
||||
public static ResourceLocation recipeTinyPlanetBlock;
|
||||
public static ResourceLocation recipeAlchemyCatalyst;
|
||||
public static ResourceLocation recipeOpenCrate;
|
||||
public static ResourceLocation recipeForestEye;
|
||||
public static ResourceLocation recipeRedstoneRoot;
|
||||
public static ResourceLocation recipeForestDrum;
|
||||
public static ResourceLocation recipeWaterRing;
|
||||
public static ResourceLocation recipeMiningRing;
|
||||
public static ResourceLocation recipeMagnetRing;
|
||||
public static ResourceLocation recipeTerraPick;
|
||||
public static ResourceLocation recipeDivaCharm;
|
||||
public static ResourceLocation recipeFlightTiara;
|
||||
public static List<ResourceLocation> recipesShinyFlowers;
|
||||
public static ResourceLocation recipePlatform;
|
||||
public static ResourceLocation recipeEnderDagger;
|
||||
public static ResourceLocation recipeDarkQuartz;
|
||||
public static ResourceLocation recipeBlazeQuartz;
|
||||
public static ResourceLocation recipeLavenderQuartz;
|
||||
public static ResourceLocation recipeRedQuartz;
|
||||
public static ResourceLocation recipeSunnyQuartz;
|
||||
public static ResourceLocation recipeAlfPortal;
|
||||
public static ResourceLocation recipeNaturaPylon;
|
||||
public static ResourceLocation recipeWaterRod;
|
||||
public static ResourceLocation recipeElementiumHelm;
|
||||
public static ResourceLocation recipeElementiumChest;
|
||||
public static ResourceLocation recipeElementiumLegs;
|
||||
public static ResourceLocation recipeElementiumBoots;
|
||||
public static ResourceLocation recipeElementiumPick;
|
||||
public static ResourceLocation recipeElementiumShovel;
|
||||
public static ResourceLocation recipeElementiumAxe;
|
||||
public static ResourceLocation recipeElementiumShears;
|
||||
public static ResourceLocation recipeElementiumSword;
|
||||
public static ResourceLocation recipeOpenBucket;
|
||||
public static ResourceLocation recipeConjurationCatalyst;
|
||||
public static ResourceLocation recipeSpawnerMover;
|
||||
public static ResourceLocation recipePixieRing;
|
||||
public static ResourceLocation recipeSuperTravelBelt;
|
||||
public static ResourceLocation recipeRainbowRod;
|
||||
public static ResourceLocation recipeSpectralPlatform;
|
||||
public static ResourceLocation recipeDreamwoodSpreader;
|
||||
public static ResourceLocation recipeTornadoRod;
|
||||
public static ResourceLocation recipeFireRod;
|
||||
public static ResourceLocation recipeVineBall;
|
||||
public static ResourceLocation recipeSlingshot;
|
||||
public static ResourceLocation recipeLensInfluence;
|
||||
public static ResourceLocation recipeLensWeight;
|
||||
public static ResourceLocation recipeLensPaint;
|
||||
public static ResourceLocation recipeLensWarp;
|
||||
public static ResourceLocation recipeLensRedirect;
|
||||
public static ResourceLocation recipeLensFirework;
|
||||
public static ResourceLocation recipeLensFlare;
|
||||
public static ResourceLocation recipeLensMessenger;
|
||||
public static ResourceLocation recipeLensTripwire;
|
||||
public static List<ResourceLocation> recipesMiniIsland;
|
||||
public static ResourceLocation recipeGaiaPylon;
|
||||
public static ResourceLocation recipeGatherDrum;
|
||||
public static ResourceLocation recipeLensFire;
|
||||
public static ResourceLocation recipeLensPiston;
|
||||
public static ResourceLocation recipeLaputaShard;
|
||||
public static List<ResourceLocation> recipesLaputaShardUpgrade;
|
||||
public static ResourceLocation recipeVirusZombie;
|
||||
public static ResourceLocation recipeVirusSkeleton;
|
||||
public static ResourceLocation recipeReachRing;
|
||||
public static ResourceLocation recipeSkyDirtRod;
|
||||
public static ResourceLocation recipeSpawnerClaw;
|
||||
public static ResourceLocation recipeCraftCrate;
|
||||
public static ResourceLocation recipePlaceholder;
|
||||
public static ResourceLocation recipeAzulejo;
|
||||
public static List<ResourceLocation> recipesAzulejoCycling;
|
||||
public static ResourceLocation recipeEnderEyeBlock;
|
||||
public static ResourceLocation recipeItemFinder;
|
||||
public static ResourceLocation recipeSuperLavaPendant;
|
||||
public static ResourceLocation recipeEnderHand;
|
||||
public static ResourceLocation recipeGlassPick;
|
||||
public static ResourceLocation recipeStarfield;
|
||||
public static ResourceLocation recipeSpark;
|
||||
public static List<ResourceLocation> recipesSparkUpgrades;
|
||||
public static ResourceLocation recipeLeafHorn;
|
||||
public static ResourceLocation recipeDiviningRod;
|
||||
public static List<ResourceLocation> recipesWings;
|
||||
public static ResourceLocation recipeRFGenerator;
|
||||
public static ResourceLocation recipeGravityRod;
|
||||
public static ResourceLocation recipeUltraSpreader;
|
||||
public static List<ResourceLocation> recipeHelmetOfRevealing;
|
||||
public static ResourceLocation recipeVial;
|
||||
public static ResourceLocation recipeFlask;
|
||||
public static ResourceLocation recipeBrewery;
|
||||
public static ResourceLocation recipeBloodPendant;
|
||||
public static ResourceLocation recipeTerraPlate;
|
||||
public static ResourceLocation recipeRedString;
|
||||
public static ResourceLocation recipeRedStringContainer;
|
||||
public static ResourceLocation recipeRedStringDispenser;
|
||||
public static ResourceLocation recipeRedStringFertilizer;
|
||||
public static ResourceLocation recipeRedStringComparator;
|
||||
public static ResourceLocation recipeRedStringRelay;
|
||||
public static ResourceLocation recipeRedStringInterceptor;
|
||||
public static ResourceLocation recipeMissileRod;
|
||||
public static ResourceLocation recipeHolyCloak;
|
||||
public static ResourceLocation recipeUnholyCloak;
|
||||
public static ResourceLocation recipeBalanceCloak;
|
||||
public static ResourceLocation recipeCraftingHalo;
|
||||
public static List<ResourceLocation> recipesLensFlash;
|
||||
public static ResourceLocation recipePrism;
|
||||
public static ResourceLocation recipeDreamwoodTwig;
|
||||
public static ResourceLocation recipeMonocle;
|
||||
public static ResourceLocation recipeClip;
|
||||
public static ResourceLocation recipeCobbleRod;
|
||||
public static ResourceLocation recipeSmeltRod;
|
||||
public static ResourceLocation recipeWorldSeed;
|
||||
public static ResourceLocation recipeSpellCloth;
|
||||
public static ResourceLocation recipeThornChakram;
|
||||
public static ResourceLocation recipeDirtPathSlab;
|
||||
public static List<ResourceLocation> recipesPatterns;
|
||||
public static ResourceLocation recipeGaiaIngot;
|
||||
public static ResourceLocation recipeCorporeaSpark;
|
||||
public static ResourceLocation recipeMasterCorporeaSpark;
|
||||
public static ResourceLocation recipeCorporeaIndex;
|
||||
public static ResourceLocation recipeCorporeaFunnel;
|
||||
public static ResourceLocation recipeCorporeaInterceptor;
|
||||
public static ResourceLocation recipeLivingwoodBow;
|
||||
public static ResourceLocation recipeCrystalBow;
|
||||
public static List<ResourceLocation> recipesCosmeticItems;
|
||||
public static List<ResourceLocation> recipesMushrooms;
|
||||
public static ResourceLocation recipeSwapRing;
|
||||
public static ResourceLocation recipeSnowHorn;
|
||||
public static ResourceLocation recipeFlowerBag;
|
||||
public static ResourceLocation recipePhantomInk;
|
||||
public static ResourceLocation recipePoolCart;
|
||||
public static ResourceLocation recipePump;
|
||||
public static List<ResourceLocation> recipesPetalsDouble;
|
||||
public static ResourceLocation recipeKeepIvy;
|
||||
public static ResourceLocation recipeBlackHoleTalisman;
|
||||
public static ResourceLocation recipeBlazeBlock;
|
||||
public static List<ResourceLocation> recipesAltarMeta;
|
||||
public static ResourceLocation recipeCorporeaCrystalCube;
|
||||
public static ResourceLocation recipeTemperanceStone;
|
||||
public static ResourceLocation recipeIncenseStick;
|
||||
public static ResourceLocation recipeIncensePlate;
|
||||
public static ResourceLocation recipeTerraAxe;
|
||||
public static ResourceLocation recipeHourglass;
|
||||
public static ResourceLocation recipeGhostRail;
|
||||
public static ResourceLocation recipeCanopyDrum;
|
||||
public static ResourceLocation recipeSparkChanger;
|
||||
public static ResourceLocation recipeCocoon;
|
||||
public static ResourceLocation recipeLuminizer;
|
||||
public static ResourceLocation recipeDetectorLuminizer;
|
||||
public static ResourceLocation recipeLuminizerLauncher;
|
||||
public static ResourceLocation recipeObedienceStick;
|
||||
public static ResourceLocation recipeCacophonium;
|
||||
public static ResourceLocation recipeManaBomb;
|
||||
public static ResourceLocation recipeCobweb;
|
||||
public static ResourceLocation recipeSlimeBottle;
|
||||
public static ResourceLocation recipeStarSword;
|
||||
public static ResourceLocation recipeExchangeRod;
|
||||
public static ResourceLocation recipeGreaterMagnetRing;
|
||||
public static ResourceLocation recipeFireChakram;
|
||||
public static ResourceLocation recipeThunderSword;
|
||||
public static ResourceLocation recipeBellows;
|
||||
public static ResourceLocation recipeManaweaveCloth;
|
||||
public static ResourceLocation recipeManaweaveHelm;
|
||||
public static ResourceLocation recipeManaweaveChest;
|
||||
public static ResourceLocation recipeManaweaveLegs;
|
||||
public static ResourceLocation recipeManaweaveBoots;
|
||||
public static ResourceLocation recipeBifrost;
|
||||
public static ResourceLocation recipeShimmerrock;
|
||||
public static ResourceLocation recipeShimmerwoodPlanks;
|
||||
public static ResourceLocation recipeAutocraftingHalo;
|
||||
public static List<ResourceLocation> recipesPavement;
|
||||
public static ResourceLocation recipeCellBlock;
|
||||
public static ResourceLocation recipeCorporeaRetainer;
|
||||
public static ResourceLocation recipeTeruTeruBozu;
|
||||
public static ResourceLocation recipeAvatar;
|
||||
public static ResourceLocation recipeSextant;
|
||||
public static List<ResourceLocation> recipesAltGrassSeeds;
|
||||
public static ResourceLocation recipeSpeedUpBelt;
|
||||
public static ResourceLocation recipeBaubleCase;
|
||||
public static ResourceLocation recipeDodgeRing;
|
||||
public static ResourceLocation recipeAnimatedTorch;
|
||||
public static ResourceLocation recipeForkLuminizer;
|
||||
public static ResourceLocation recipeToggleLuminizer;
|
||||
public static ResourceLocation recipeInvisibilityCloak;
|
||||
public static ResourceLocation recipeCloudPendant;
|
||||
public static ResourceLocation recipeSuperCloudPendant;
|
||||
public static ResourceLocation recipeThirdEye;
|
||||
public static ResourceLocation recipeAstrolabe;
|
||||
public static ResourceLocation recipeGoddessCharm;
|
||||
|
||||
// Garden of Glass
|
||||
public static ResourceLocation recipeRootToSapling;
|
||||
public static ResourceLocation recipeRootToFertilizer;
|
||||
public static ResourceLocation recipePebbleCobblestone;
|
||||
public static ResourceLocation recipeMagmaToSlimeball;
|
||||
public static ResourceLocation recipeFelPumpkin;
|
||||
public static ResourceLocation recipeEndPortal;
|
||||
|
||||
public static void init() {
|
||||
// Can't do this in RegistryEvent.Register event handler since it seems JSON recipes aren't loaded yet
|
||||
recipesPetals = allOfGroup(new ResourceLocation(LibMisc.MOD_ID, LibItemNames.PETAL));
|
||||
recipePestleAndMortar = ModItems.pestleAndMortar.getRegistryName();
|
||||
recipesDyes = allOfGroup(new ResourceLocation(LibMisc.MOD_ID, LibItemNames.DYE));
|
||||
recipeFertilizerPowder = gogPath("fertilizer_powder");
|
||||
recipeFerilizerDye = path("fertilizer_dye");
|
||||
recipesPetalsDouble = allOfGroup("petal_double");
|
||||
recipesPetalBlocks = allOfGroup("petal_block");
|
||||
recipesReversePetalBlocks = allOfGroup("petal_block_deconstruct");
|
||||
|
||||
recipeApothecary = ModBlocks.defaultAltar.getRegistryName();
|
||||
recipeLexicon = ModItems.lexicon.getRegistryName();
|
||||
recipesTwigWand = allOfGroup(ModItems.twigWand.getRegistryName());
|
||||
recipeLivingwoodTwig = ModItems.livingwoodTwig.getRegistryName();
|
||||
recipeRuneAltar = ModBlocks.runeAltar.getRegistryName();
|
||||
recipeTerraPlate = ModBlocks.terraPlate.getRegistryName();
|
||||
recipeFlowerBag = ModItems.flowerBag.getRegistryName();
|
||||
|
||||
if(Botania.gardenOfGlassLoaded) {
|
||||
recipeRootToSapling = gogPath("root_to_sapling");
|
||||
recipeRootToFertilizer = gogPath("root_to_fertilizer");
|
||||
recipePebbleCobblestone = gogPath("pebble_to_cobblestone");
|
||||
recipeMagmaToSlimeball = gogPath("magma_cream_to_slime_ball");
|
||||
recipeEndPortal = gogPath("end_portal_frame");
|
||||
}
|
||||
|
||||
recipesSpreader = allOfGroup("spreader");
|
||||
|
||||
recipePool = ModBlocks.manaPool.getRegistryName();
|
||||
recipePoolDiluted = ModBlocks.dilutedPool.getRegistryName();
|
||||
recipePoolFabulous = ModBlocks.fabulousPool.getRegistryName();
|
||||
recipeCobweb = path("web");
|
||||
|
||||
recipeSpark = ModItems.spark.getRegistryName();
|
||||
recipesSparkUpgrades = allOfGroup("spark_upgrade");
|
||||
recipeRFGenerator = ModBlocks.rfGenerator.getRegistryName();
|
||||
|
||||
ResourceLocation name = ModItems.lensNormal.getRegistryName();
|
||||
recipesManaLens = ImmutableList.of(path(name.getPath() + "_glass_block"), path(name.getPath() + "_glass_pane"));
|
||||
recipeLensVelocity = ModItems.lensSpeed.getRegistryName();
|
||||
recipeLensPotency = ModItems.lensPower.getRegistryName();
|
||||
recipeLensResistance = ModItems.lensTime.getRegistryName();
|
||||
recipeLensEfficiency = ModItems.lensEfficiency.getRegistryName();
|
||||
recipeLensBounce = ModItems.lensBounce.getRegistryName();
|
||||
recipeLensGravity = ModItems.lensGravity.getRegistryName();
|
||||
recipeLensBore = ModItems.lensMine.getRegistryName();
|
||||
recipeLensDamaging = ModItems.lensDamage.getRegistryName();
|
||||
recipeLensPhantom = ModItems.lensPhantom.getRegistryName();
|
||||
recipeLensMagnet = ModItems.lensMagnet.getRegistryName();
|
||||
recipeLensExplosive = ModItems.lensExplosive.getRegistryName();
|
||||
recipeLensInfluence = ModItems.lensInfluence.getRegistryName();
|
||||
recipeLensWeight = ModItems.lensWeight.getRegistryName();
|
||||
recipeLensPaint = ModItems.lensPaint.getRegistryName();
|
||||
recipeLensFire = ModItems.lensFire.getRegistryName();
|
||||
recipeLensPiston = ModItems.lensPiston.getRegistryName();
|
||||
name = ModItems.lensLight.getRegistryName();
|
||||
recipesLensFlash = ImmutableList.of(name, path(name.getPath() + "_alt"));
|
||||
recipeLensWarp = ModItems.lensWarp.getRegistryName();
|
||||
recipeLensRedirect = ModItems.lensRedirect.getRegistryName();
|
||||
recipeLensFirework = ModItems.lensFirework.getRegistryName();
|
||||
recipeLensFlare = ModItems.lensFlare.getRegistryName();
|
||||
recipeLensMessenger = ModItems.lensMessenger.getRegistryName();
|
||||
recipeLensTripwire = ModItems.lensTripwire.getRegistryName();
|
||||
|
||||
recipeDistributor = ModBlocks.distributor.getRegistryName();
|
||||
recipeManaVoid = ModBlocks.manaVoid.getRegistryName();
|
||||
recipeManaTablet = ModItems.manaTablet.getRegistryName();
|
||||
recipeManaMirror = ModItems.manaMirror.getRegistryName();
|
||||
recipeManaDetector = ModBlocks.manaDetector.getRegistryName();
|
||||
recipeRedstoneSpreader = ModBlocks.redstoneSpreader.getRegistryName();
|
||||
recipeDreamwoodSpreader = ModBlocks.elvenSpreader.getRegistryName();
|
||||
recipeUltraSpreader = ModBlocks.gaiaSpreader.getRegistryName();
|
||||
recipeHelmetOfRevealing = allOfGroup("helm_revealing");
|
||||
recipePrism = ModBlocks.prism.getRegistryName();
|
||||
recipePoolCart = ModItems.poolMinecart.getRegistryName();
|
||||
recipePump = ModBlocks.pump.getRegistryName();
|
||||
recipeSparkChanger = ModBlocks.sparkChanger.getRegistryName();
|
||||
recipeBellows = ModBlocks.bellows.getRegistryName();
|
||||
recipeRedstoneRoot = ModItems.redstoneRoot.getRegistryName();
|
||||
recipesAltarMeta = allOfGroup("metamorphic_apothecary");
|
||||
recipePylon = ModBlocks.manaPylon.getRegistryName();
|
||||
recipeTurntable = ModBlocks.turntable.getRegistryName();
|
||||
recipeAlchemyCatalyst = ModBlocks.alchemyCatalyst.getRegistryName();
|
||||
recipeOpenCrate = ModBlocks.openCrate.getRegistryName();
|
||||
recipeForestEye = ModBlocks.forestEye.getRegistryName();
|
||||
recipeForestDrum = ModBlocks.wildDrum.getRegistryName();
|
||||
recipePlatform = ModBlocks.abstrusePlatform.getRegistryName();
|
||||
recipeConjurationCatalyst = ModBlocks.conjurationCatalyst.getRegistryName();
|
||||
recipeSpectralPlatform = ModBlocks.spectralPlatform.getRegistryName();
|
||||
recipeGatherDrum = ModBlocks.gatheringDrum.getRegistryName();
|
||||
recipePlaceholder = ModItems.placeholder.getRegistryName();
|
||||
recipeCraftCrate = ModBlocks.craftCrate.getRegistryName();
|
||||
recipesPatterns = allOfGroup("craft_pattern");
|
||||
recipeBrewery = ModBlocks.brewery.getRegistryName();
|
||||
recipeVial = ModItems.vial.getRegistryName();
|
||||
recipeFlask = ModItems.flask.getRegistryName();
|
||||
recipeIncenseStick = ModItems.incenseStick.getRegistryName();
|
||||
recipeIncensePlate = ModBlocks.incensePlate.getRegistryName();
|
||||
recipeHourglass = ModBlocks.hourglass.getRegistryName();
|
||||
recipeGhostRail = ModBlocks.ghostRail.getRegistryName();
|
||||
recipeCanopyDrum = ModBlocks.canopyDrum.getRegistryName();
|
||||
recipeCocoon = gogPath("cocoon");
|
||||
recipeManaBomb = ModBlocks.manaBomb.getRegistryName();
|
||||
recipeTeruTeruBozu = ModBlocks.teruTeruBozu.getRegistryName();
|
||||
recipeAvatar = ModBlocks.avatar.getRegistryName();
|
||||
recipeFelPumpkin = ModBlocks.felPumpkin.getRegistryName();
|
||||
recipeAnimatedTorch = ModBlocks.animatedTorch.getRegistryName();
|
||||
recipeManaBlaster = ModItems.manaGun.getRegistryName();
|
||||
recipesAltGrassSeeds = allOfGroup(new ResourceLocation(LibMisc.MOD_ID, LibItemNames.GRASS_SEEDS));
|
||||
recipeDirtRod = ModItems.dirtRod.getRegistryName();
|
||||
recipeTerraformRod = ModItems.terraformRod.getRegistryName();
|
||||
recipeManasteelPick = ModItems.manasteelPick.getRegistryName();
|
||||
recipeManasteelShovel = ModItems.manasteelShovel.getRegistryName();
|
||||
recipeManasteelAxe = ModItems.manasteelAxe.getRegistryName();
|
||||
recipeManasteelShears = ModItems.manasteelShears.getRegistryName();
|
||||
recipeManasteelSword = ModItems.manasteelSword.getRegistryName();
|
||||
recipeManasteelHelm = ModItems.manasteelHelm.getRegistryName();
|
||||
recipeManasteelChest = ModItems.manasteelChest.getRegistryName();
|
||||
recipeManasteelLegs = ModItems.manasteelLegs.getRegistryName();
|
||||
recipeManasteelBoots = ModItems.manasteelBoots.getRegistryName();
|
||||
recipeTerrasteelHelm = ModItems.terrasteelHelm.getRegistryName();
|
||||
recipeTerrasteelChest = ModItems.terrasteelChest.getRegistryName();
|
||||
recipeTerrasteelLegs = ModItems.terrasteelLegs.getRegistryName();
|
||||
recipeTerrasteelBoots = ModItems.terrasteelBoots.getRegistryName();
|
||||
recipeGrassHorn = ModItems.grassHorn.getRegistryName();
|
||||
recipeLeafHorn = ModItems.leavesHorn.getRegistryName();
|
||||
recipeSnowHorn = ModItems.snowHorn.getRegistryName();
|
||||
recipeTerraSword = ModItems.terraSword.getRegistryName();
|
||||
recipeTerraPick = ModItems.terraPick.getRegistryName();
|
||||
recipeWaterRod = ModItems.waterRod.getRegistryName();
|
||||
recipeElementiumPick = ModItems.elementiumPick.getRegistryName();
|
||||
recipeElementiumShovel = ModItems.elementiumShovel.getRegistryName();
|
||||
recipeElementiumAxe = ModItems.elementiumAxe.getRegistryName();
|
||||
recipeElementiumShears = ModItems.elementiumShears.getRegistryName();
|
||||
recipeElementiumSword = ModItems.elementiumSword.getRegistryName();
|
||||
recipeElementiumHelm = ModItems.elementiumHelm.getRegistryName();
|
||||
recipeElementiumChest = ModItems.elementiumChest.getRegistryName();
|
||||
recipeElementiumLegs = ModItems.elementiumLegs.getRegistryName();
|
||||
recipeElementiumBoots = ModItems.elementiumBoots.getRegistryName();
|
||||
recipeOpenBucket = ModItems.openBucket.getRegistryName();
|
||||
recipeRainbowRod = ModItems.rainbowRod.getRegistryName();
|
||||
recipeBifrost = ModBlocks.bifrostPerm.getRegistryName();
|
||||
recipeShimmerrock = ModBlocks.shimmerrock.getRegistryName();
|
||||
recipeShimmerwoodPlanks = ModBlocks.shimmerwoodPlanks.getRegistryName();
|
||||
recipeTornadoRod = ModItems.tornadoRod.getRegistryName();
|
||||
recipeFireRod = ModItems.fireRod.getRegistryName();
|
||||
recipeVineBall = ModItems.vineBall.getRegistryName();
|
||||
recipeSlingshot = ModItems.slingshot.getRegistryName();
|
||||
recipeLaputaShard = path("laputashard_0");
|
||||
recipesLaputaShardUpgrade = allOfGroup("laputashard_upgrade");
|
||||
recipeVirusZombie = ModItems.necroVirus.getRegistryName();
|
||||
recipeVirusSkeleton = ModItems.nullVirus.getRegistryName();
|
||||
recipeSkyDirtRod = ModItems.skyDirtRod.getRegistryName();
|
||||
recipeGlassPick = ModItems.glassPick.getRegistryName();
|
||||
recipeDiviningRod = ModItems.diviningRod.getRegistryName();
|
||||
recipeGravityRod = ModItems.gravityRod.getRegistryName();
|
||||
recipeMissileRod = ModItems.missileRod.getRegistryName();
|
||||
recipeCraftingHalo = ModItems.craftingHalo.getRegistryName();
|
||||
recipeClip = ModItems.clip.getRegistryName();
|
||||
recipeCobbleRod = ModItems.cobbleRod.getRegistryName();
|
||||
recipeSmeltRod = ModItems.smeltRod.getRegistryName();
|
||||
recipeWorldSeed = ModItems.worldSeed.getRegistryName();
|
||||
recipeSpellCloth = ModItems.spellCloth.getRegistryName();
|
||||
recipeThornChakram = ModItems.thornChakram.getRegistryName();
|
||||
recipeFireChakram = ModItems.flareChakram.getRegistryName();
|
||||
recipeLivingwoodBow = ModItems.livingwoodBow.getRegistryName();
|
||||
recipeCrystalBow = ModItems.crystalBow.getRegistryName();
|
||||
recipeTemperanceStone = ModItems.temperanceStone.getRegistryName();
|
||||
recipeTerraAxe = ModItems.terraAxe.getRegistryName();
|
||||
recipeObedienceStick = ModItems.obedienceStick.getRegistryName();
|
||||
recipeSlimeBottle = ModItems.slimeBottle.getRegistryName();
|
||||
recipeExchangeRod = ModItems.exchangeRod.getRegistryName();
|
||||
recipeManaweaveCloth = ModItems.manaweaveCloth.getRegistryName();
|
||||
recipeManaweaveHelm = ModItems.manaweaveHelm.getRegistryName();
|
||||
recipeManaweaveChest = ModItems.manaweaveChest.getRegistryName();
|
||||
recipeManaweaveLegs = ModItems.manaweaveLegs.getRegistryName();
|
||||
recipeManaweaveBoots = ModItems.manaweaveBoots.getRegistryName();
|
||||
recipeAutocraftingHalo = ModItems.autocraftingHalo.getRegistryName();
|
||||
recipeSextant = ModItems.sextant.getRegistryName();
|
||||
recipeAstrolabe = ModItems.astrolabe.getRegistryName();
|
||||
recipeEnderEyeBlock = ModBlocks.enderEye.getRegistryName();
|
||||
recipeEnderHand = ModItems.enderHand.getRegistryName();
|
||||
recipeEnderDagger = ModItems.enderDagger.getRegistryName();
|
||||
recipeSpawnerClaw = ModBlocks.spawnerClaw.getRegistryName();
|
||||
recipeRedString = ModItems.redString.getRegistryName();
|
||||
recipeRedStringContainer = ModBlocks.redStringContainer.getRegistryName();
|
||||
recipeRedStringDispenser = ModBlocks.redStringDispenser.getRegistryName();
|
||||
recipeRedStringFertilizer = ModBlocks.redStringFertilizer.getRegistryName();
|
||||
recipeRedStringComparator = ModBlocks.redStringComparator.getRegistryName();
|
||||
recipeRedStringRelay = ModBlocks.redStringRelay.getRegistryName();
|
||||
recipeRedStringInterceptor = ModBlocks.redStringInterceptor.getRegistryName();
|
||||
recipeFlightTiara = path("flighttiara_0");
|
||||
recipesWings = allOfGroup("flighttiara_wings");
|
||||
recipeCorporeaSpark = ModItems.corporeaSpark.getRegistryName();
|
||||
recipeMasterCorporeaSpark = ModItems.corporeaSparkMaster.getRegistryName();
|
||||
recipeCorporeaIndex = ModBlocks.corporeaIndex.getRegistryName();
|
||||
recipeCorporeaFunnel = ModBlocks.corporeaFunnel.getRegistryName();
|
||||
recipeCorporeaInterceptor = ModBlocks.corporeaInterceptor.getRegistryName();
|
||||
recipeSpawnerMover = ModItems.spawnerMover.getRegistryName();
|
||||
recipeKeepIvy = ModItems.keepIvy.getRegistryName();
|
||||
recipeBlackHoleTalisman = path("blackholetalisman_0");
|
||||
recipeCorporeaCrystalCube = ModBlocks.corporeaCrystalCube.getRegistryName();
|
||||
recipeLuminizer = path("lightrelay_0");
|
||||
recipeDetectorLuminizer = path("lightrelay_1");
|
||||
recipeToggleLuminizer = path("lightrelay_2");
|
||||
recipeForkLuminizer = path("lightrelay_3");
|
||||
recipeLuminizerLauncher = ModBlocks.lightLauncher.getRegistryName();
|
||||
recipeStarSword = ModItems.starSword.getRegistryName();
|
||||
recipeThunderSword = ModItems.thunderSword.getRegistryName();
|
||||
recipeCorporeaRetainer = ModBlocks.corporeaRetainer.getRegistryName();
|
||||
recipesCosmeticItems = IntStream.range(0, ItemBaubleCosmetic.SUBTYPES).mapToObj(i -> path("cosmetic_" + i)).collect(Collectors.toList());
|
||||
recipeTinyPlanet = ModItems.tinyPlanet.getRegistryName();
|
||||
recipeTinyPlanetBlock = ModBlocks.tinyPlanet.getRegistryName();
|
||||
recipeManaRing = ModItems.manaRing.getRegistryName();
|
||||
recipeAuraRing = ModItems.auraRing.getRegistryName();
|
||||
recipeGreaterManaRing = ModItems.manaRingGreater.getRegistryName();
|
||||
recipeGreaterAuraRing = ModItems.auraRingGreater.getRegistryName();
|
||||
recipeTravelBelt = ModItems.travelBelt.getRegistryName();
|
||||
recipeKnockbackBelt = ModItems.knockbackBelt.getRegistryName();
|
||||
recipeIcePendant = ModItems.icePendant.getRegistryName();
|
||||
recipeLavaPendant = ModItems.lavaPendant.getRegistryName();
|
||||
recipeWaterRing = ModItems.waterRing.getRegistryName();
|
||||
recipeMiningRing = ModItems.miningRing.getRegistryName();
|
||||
recipeMagnetRing = ModItems.magnetRing.getRegistryName();
|
||||
recipeGreaterMagnetRing = ModItems.magnetRingGreater.getRegistryName();
|
||||
recipeDivaCharm = ModItems.divaCharm.getRegistryName();
|
||||
recipePixieRing = ModItems.pixieRing.getRegistryName();
|
||||
recipeSuperTravelBelt = ModItems.superTravelBelt.getRegistryName();
|
||||
recipeReachRing = ModItems.reachRing.getRegistryName();
|
||||
recipeItemFinder = ModItems.itemFinder.getRegistryName();
|
||||
recipeSuperLavaPendant = ModItems.superLavaPendant.getRegistryName();
|
||||
recipeBloodPendant = ModItems.bloodPendant.getRegistryName();
|
||||
recipeHolyCloak = ModItems.holyCloak.getRegistryName();
|
||||
recipeUnholyCloak = ModItems.unholyCloak.getRegistryName();
|
||||
recipeBalanceCloak = ModItems.balanceCloak.getRegistryName();
|
||||
recipeMonocle = ModItems.monocle.getRegistryName();
|
||||
recipeSwapRing = ModItems.swapRing.getRegistryName();
|
||||
recipeSpeedUpBelt = ModItems.speedUpBelt.getRegistryName();
|
||||
recipeBaubleCase = ModItems.baubleBox.getRegistryName();
|
||||
recipeDodgeRing = ModItems.dodgeRing.getRegistryName();
|
||||
recipeInvisibilityCloak = ModItems.invisibilityCloak.getRegistryName();
|
||||
recipeCloudPendant = ModItems.cloudPendant.getRegistryName();
|
||||
recipeSuperCloudPendant = ModItems.superCloudPendant.getRegistryName();
|
||||
recipeThirdEye = ModItems.thirdEye.getRegistryName();
|
||||
recipeGoddessCharm = ModItems.goddessCharm.getRegistryName();
|
||||
recipeAlfPortal = ModBlocks.alfPortal.getRegistryName();
|
||||
recipeNaturaPylon = ModBlocks.naturaPylon.getRegistryName();
|
||||
recipeDreamwoodTwig = ModItems.dreamwoodTwig.getRegistryName();
|
||||
recipeGaiaPylon = ModBlocks.gaiaPylon.getRegistryName();
|
||||
recipeGaiaIngot = ModItems.gaiaIngot.getRegistryName();
|
||||
recipeLivingrockDecor1 = path("livingrock_1");
|
||||
recipeLivingrockDecor2 = path("livingrock_2");
|
||||
recipeLivingrockDecor3 = path("livingrock_3");
|
||||
recipeLivingrockDecor4 = path("livingrock_4");
|
||||
recipeLivingwoodDecor1 = path("livingwood_1");
|
||||
recipeLivingwoodDecor2 = path("livingwood_2");
|
||||
recipeLivingwoodDecor3 = path("livingwood_3");
|
||||
recipeLivingwoodDecor4 = path("livingwood_4");
|
||||
recipeLivingwoodDecor5 = path("livingwood_5");
|
||||
recipeDarkQuartz = ModItems.darkQuartz.getRegistryName();
|
||||
recipeBlazeQuartz = ModItems.blazeQuartz.getRegistryName();
|
||||
recipeLavenderQuartz = ModItems.lavenderQuartz.getRegistryName();
|
||||
recipeRedQuartz = ModItems.redQuartz.getRegistryName();
|
||||
recipeSunnyQuartz = ModItems.sunnyQuartz.getRegistryName();
|
||||
recipesShinyFlowers = allOfGroup("shiny_flower");
|
||||
recipesMiniIsland = allOfGroup("mini_island");
|
||||
recipeAzulejo = ModBlocks.azulejo0.getRegistryName();
|
||||
recipesAzulejoCycling = allOfGroup("azulejo_cycling");
|
||||
recipeStarfield = ModBlocks.starfield.getRegistryName();
|
||||
recipesMushrooms = allOfGroup("mushroom");
|
||||
recipePhantomInk = ModItems.phantomInk.getRegistryName();
|
||||
recipeBlazeBlock = gogPath("blazeblock");
|
||||
recipeCacophonium = ModItems.cacophonium.getRegistryName();
|
||||
recipesPavement = allOfGroup("pavement");
|
||||
recipeCellBlock = ModBlocks.cellBlock.getRegistryName();
|
||||
|
||||
}
|
||||
|
||||
private static ResourceLocation gogPath(String path) {
|
||||
|
||||
@@ -26,13 +26,6 @@ import static vazkii.botania.common.lib.ResourceLocationHelper.prefix;
|
||||
@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID)
|
||||
public class ModElvenTradeRecipes {
|
||||
|
||||
public static RecipeElvenTrade dreamwoodRecipe;
|
||||
public static List<RecipeElvenTrade> elementiumRecipes;
|
||||
public static RecipeElvenTrade pixieDustRecipe;
|
||||
public static List<RecipeElvenTrade> dragonstoneRecipes;
|
||||
public static RecipeElvenTrade elvenQuartzRecipe;
|
||||
public static RecipeElvenTrade alfglassRecipe;
|
||||
|
||||
@SubscribeEvent
|
||||
public static void register(RegisterRecipesEvent evt) {
|
||||
Ingredient livingwood = Ingredient.fromTag(new ItemTags.Wrapper(new ResourceLocation(LibMisc.MOD_ID, "livingwood")));
|
||||
|
||||
@@ -11,8 +11,6 @@
|
||||
package vazkii.botania.common.crafting;
|
||||
|
||||
import net.minecraft.block.Blocks;
|
||||
import net.minecraft.block.Blocks;
|
||||
import net.minecraft.item.Items;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.Items;
|
||||
@@ -22,53 +20,19 @@ import net.minecraft.util.IItemProvider;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
import vazkii.botania.api.imc.IMC;
|
||||
import vazkii.botania.api.recipe.RecipeManaInfusion;
|
||||
import vazkii.botania.api.recipe.RegisterRecipesEvent;
|
||||
import vazkii.botania.common.Botania;
|
||||
import vazkii.botania.common.block.ModFluffBlocks;
|
||||
import vazkii.botania.common.block.ModSubtiles;
|
||||
import vazkii.botania.common.core.handler.IMCSender;
|
||||
import vazkii.botania.common.item.ModItems;
|
||||
import vazkii.botania.common.item.block.ItemBlockSpecialFlower;
|
||||
import vazkii.botania.common.lib.LibMisc;
|
||||
|
||||
import java.util.List;
|
||||
import static vazkii.botania.common.lib.ResourceLocationHelper.prefix;
|
||||
|
||||
@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID)
|
||||
public final class ModManaAlchemyRecipes {
|
||||
|
||||
public static RecipeManaInfusion leatherRecipe;
|
||||
public static List<RecipeManaInfusion> woodRecipes;
|
||||
public static List<RecipeManaInfusion> saplingRecipes;
|
||||
public static RecipeManaInfusion glowstoneDustRecipe;
|
||||
public static List<RecipeManaInfusion> quartzRecipes;
|
||||
public static RecipeManaInfusion chiseledBrickRecipe;
|
||||
public static RecipeManaInfusion iceRecipe;
|
||||
public static List<RecipeManaInfusion> swampFolliageRecipes;
|
||||
public static List<RecipeManaInfusion> fishRecipes;
|
||||
public static List<RecipeManaInfusion> cropRecipes;
|
||||
public static RecipeManaInfusion potatoRecipe;
|
||||
public static RecipeManaInfusion netherWartRecipe;
|
||||
public static List<RecipeManaInfusion> gunpowderAndFlintRecipes;
|
||||
public static RecipeManaInfusion nameTagRecipe;
|
||||
public static List<RecipeManaInfusion> stringRecipes;
|
||||
public static List<RecipeManaInfusion> slimeballCactusRecipes;
|
||||
public static RecipeManaInfusion enderPearlRecipe;
|
||||
public static List<RecipeManaInfusion> redstoneToGlowstoneRecipes;
|
||||
public static RecipeManaInfusion sandRecipe;
|
||||
public static RecipeManaInfusion redSandRecipe;
|
||||
public static List<RecipeManaInfusion> clayBreakdownRecipes;
|
||||
public static RecipeManaInfusion coarseDirtRecipe;
|
||||
public static List<RecipeManaInfusion> stoneRecipes;
|
||||
public static List<RecipeManaInfusion> tallgrassRecipes;
|
||||
public static List<RecipeManaInfusion> flowersRecipes;
|
||||
public static RecipeManaInfusion chorusRecipe;
|
||||
|
||||
// Garden of Glass
|
||||
public static List<RecipeManaInfusion> prismarineRecipes;
|
||||
|
||||
@SubscribeEvent
|
||||
public static void register(RegisterRecipesEvent evt) {
|
||||
evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("rotten_flesh_to_leather"), new ItemStack(Items.LEATHER), Ingredient.fromItems(Items.ROTTEN_FLESH), 600));
|
||||
|
||||
@@ -11,9 +11,6 @@
|
||||
package vazkii.botania.common.crafting;
|
||||
|
||||
import net.minecraft.block.Blocks;
|
||||
import net.minecraft.block.Blocks;
|
||||
import net.minecraft.item.DyeColor;
|
||||
import net.minecraft.item.Items;
|
||||
import net.minecraft.item.DyeColor;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -24,41 +21,20 @@ import net.minecraftforge.common.Tags;
|
||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
import net.minecraftforge.registries.ForgeRegistries;
|
||||
import vazkii.botania.api.imc.IMC;
|
||||
import vazkii.botania.api.recipe.RecipeManaInfusion;
|
||||
import vazkii.botania.api.recipe.RegisterRecipesEvent;
|
||||
import vazkii.botania.common.Botania;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.core.handler.IMCSender;
|
||||
import vazkii.botania.common.item.ModItems;
|
||||
import vazkii.botania.common.lib.LibMisc;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
import static vazkii.botania.common.lib.ResourceLocationHelper.prefix;
|
||||
|
||||
@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID)
|
||||
public final class ModManaInfusionRecipes {
|
||||
|
||||
public static List<RecipeManaInfusion> manasteelRecipes;
|
||||
public static RecipeManaInfusion manaPearlRecipe;
|
||||
public static List<RecipeManaInfusion> manaDiamondRecipes;
|
||||
public static List<RecipeManaInfusion> manaPowderRecipes;
|
||||
public static RecipeManaInfusion pistonRelayRecipe;
|
||||
public static RecipeManaInfusion manaCookieRecipe;
|
||||
public static RecipeManaInfusion grassSeedsRecipe;
|
||||
public static RecipeManaInfusion podzolSeedsRecipe;
|
||||
public static List<RecipeManaInfusion> mycelSeedsRecipes;
|
||||
public static RecipeManaInfusion manaQuartzRecipe;
|
||||
public static RecipeManaInfusion tinyPotatoRecipe;
|
||||
public static RecipeManaInfusion manaInkwellRecipe;
|
||||
public static RecipeManaInfusion managlassRecipe;
|
||||
public static RecipeManaInfusion manaStringRecipe;
|
||||
|
||||
public static RecipeManaInfusion sugarCaneRecipe;
|
||||
|
||||
@SubscribeEvent
|
||||
public static void register(RegisterRecipesEvent evt) {
|
||||
evt.manaInfusion().accept(new RecipeManaInfusion(prefix("manasteel"), new ItemStack(ModItems.manaSteel), Ingredient.fromTag(Tags.Items.INGOTS_IRON), 3000));
|
||||
|
||||
@@ -11,8 +11,6 @@
|
||||
package vazkii.botania.common.crafting;
|
||||
|
||||
import net.minecraft.block.Blocks;
|
||||
import net.minecraft.block.Blocks;
|
||||
import net.minecraft.item.Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.Items;
|
||||
import net.minecraft.item.crafting.Ingredient;
|
||||
@@ -21,41 +19,17 @@ import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.common.Tags;
|
||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
import vazkii.botania.api.BotaniaAPI;
|
||||
import vazkii.botania.api.recipe.RecipeRuneAltar;
|
||||
import vazkii.botania.api.recipe.RegisterRecipesEvent;
|
||||
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;
|
||||
import java.util.List;
|
||||
|
||||
import static vazkii.botania.common.lib.ResourceLocationHelper.prefix;
|
||||
|
||||
@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID)
|
||||
public final class ModRuneRecipes {
|
||||
|
||||
public static RecipeRuneAltar recipeWaterRune;
|
||||
public static RecipeRuneAltar recipeFireRune;
|
||||
public static List<RecipeRuneAltar> recipesEarthRune;
|
||||
public static List<RecipeRuneAltar> recipesAirRune;
|
||||
public static RecipeRuneAltar recipeSpringRune;
|
||||
public static RecipeRuneAltar recipeSummerRune;
|
||||
public static RecipeRuneAltar recipeAutumnRune;
|
||||
public static List<RecipeRuneAltar> recipesWinterRune;
|
||||
public static RecipeRuneAltar recipeManaRune;
|
||||
public static RecipeRuneAltar recipeLustRune;
|
||||
public static RecipeRuneAltar recipeGluttonyRune;
|
||||
public static RecipeRuneAltar recipeGreedRune;
|
||||
public static RecipeRuneAltar recipeSlothRune;
|
||||
public static RecipeRuneAltar recipeWrathRune;
|
||||
public static RecipeRuneAltar recipeEnvyRune;
|
||||
public static RecipeRuneAltar recipePrideRune;
|
||||
|
||||
public static RecipeRuneAltar recipeHead;
|
||||
|
||||
// todo 1.13 re-tagify these once the community settles down on some names
|
||||
@SubscribeEvent
|
||||
public static void register(RegisterRecipesEvent evt) {
|
||||
@@ -104,7 +78,6 @@ public final class ModRuneRecipes {
|
||||
evt.runeAltar().accept(new RecipeRuneAltar(prefix("envy"), new ItemStack(ModItems.runeEnvy), costTier3, manaDiamond, manaDiamond, winter, water));
|
||||
evt.runeAltar().accept(new RecipeRuneAltar(prefix("pride"), new ItemStack(ModItems.runePride), costTier3, manaDiamond, manaDiamond, summer, fire));
|
||||
|
||||
recipeHead = new HeadRecipe(prefix("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));
|
||||
evt.runeAltar().accept(recipeHead);
|
||||
evt.runeAltar().accept(new HeadRecipe(prefix("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)));
|
||||
}
|
||||
}
|
||||
@@ -18,11 +18,11 @@ import net.minecraft.client.util.ITooltipFlag;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.entity.player.ServerPlayerEntity;
|
||||
import net.minecraft.item.Rarity;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemGroup;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.ItemUseContext;
|
||||
import net.minecraft.item.Rarity;
|
||||
import net.minecraft.util.ActionResult;
|
||||
import net.minecraft.util.ActionResultType;
|
||||
import net.minecraft.util.Hand;
|
||||
@@ -31,13 +31,11 @@ import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.util.SoundCategory;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.BlockRayTraceResult;
|
||||
import net.minecraft.util.math.RayTraceResult;
|
||||
import net.minecraft.util.math.Vec3d;
|
||||
import net.minecraft.util.text.ITextComponent;
|
||||
import net.minecraft.util.text.StringTextComponent;
|
||||
import net.minecraft.util.text.Style;
|
||||
import net.minecraft.util.text.TranslationTextComponent;
|
||||
import net.minecraft.util.text.TextFormatting;
|
||||
import net.minecraft.util.text.TranslationTextComponent;
|
||||
import net.minecraft.world.server.ServerWorld;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
@@ -175,8 +173,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem {
|
||||
Botania.proxy.setToTutorialIfFirstLaunch();
|
||||
|
||||
if(!l.isKnowledgeUnlocked(stack, BotaniaAPI.relicKnowledge) && l.isKnowledgeUnlocked(stack, BotaniaAPI.elvenKnowledge))
|
||||
for(ItemStack rstack : ItemDice.relicStacks) {
|
||||
Item item = rstack.getItem();
|
||||
for(Item item : ItemDice.getRelics()) {
|
||||
if(PlayerHelper.hasItem(player, s -> s != null && s.getItem() == item)) {
|
||||
l.unlockKnowledge(stack, BotaniaAPI.relicKnowledge);
|
||||
break;
|
||||
@@ -184,7 +181,8 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem {
|
||||
}
|
||||
|
||||
Botania.proxy.setLexiconStack(stack);
|
||||
DistExecutor.runWhenOn(Dist.CLIENT, () -> () -> Minecraft.getInstance().displayGuiScreen(GuiLexicon.currentOpenLexicon));
|
||||
if(world.isRemote)
|
||||
DistExecutor.runWhenOn(Dist.CLIENT, () -> () -> Minecraft.getInstance().displayGuiScreen(GuiLexicon.currentOpenLexicon));
|
||||
if(!world.isRemote) {
|
||||
if(!skipSound)
|
||||
world.playSound(null, player.posX, player.posY, player.posZ, ModSounds.lexiconOpen, SoundCategory.PLAYERS, 0.5F, 1F);
|
||||
|
||||
@@ -13,17 +13,17 @@ package vazkii.botania.common.item.relic;
|
||||
import net.minecraft.advancements.Advancement;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.entity.player.ServerPlayerEntity;
|
||||
import net.minecraft.util.ActionResultType;
|
||||
import net.minecraft.util.SoundEvents;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.ActionResult;
|
||||
import net.minecraft.util.ActionResultType;
|
||||
import net.minecraft.util.Hand;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.util.SoundCategory;
|
||||
import net.minecraft.util.SoundEvents;
|
||||
import net.minecraft.util.text.Style;
|
||||
import net.minecraft.util.text.TranslationTextComponent;
|
||||
import net.minecraft.util.text.TextFormatting;
|
||||
import net.minecraft.util.text.TranslationTextComponent;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.fml.server.ServerLifecycleHooks;
|
||||
import vazkii.botania.api.item.IRelic;
|
||||
@@ -34,18 +34,18 @@ import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class ItemDice extends ItemRelic {
|
||||
public static ItemStack[] relicStacks;
|
||||
|
||||
public ItemDice(Properties props) {
|
||||
super(props);
|
||||
}
|
||||
|
||||
relicStacks = new ItemStack[] {
|
||||
new ItemStack(ModItems.infiniteFruit),
|
||||
new ItemStack(ModItems.kingKey),
|
||||
new ItemStack(ModItems.flugelEye),
|
||||
new ItemStack(ModItems.thorRing),
|
||||
new ItemStack(ModItems.odinRing),
|
||||
new ItemStack(ModItems.lokiRing)
|
||||
public static Item[] getRelics() {
|
||||
return new Item[]{
|
||||
ModItems.infiniteFruit,
|
||||
ModItems.kingKey,
|
||||
ModItems.flugelEye,
|
||||
ModItems.thorRing,
|
||||
ModItems.odinRing,
|
||||
ModItems.lokiRing
|
||||
};
|
||||
}
|
||||
|
||||
@@ -73,7 +73,7 @@ public class ItemDice extends ItemRelic {
|
||||
} else {
|
||||
int relic = possible.get(world.rand.nextInt(possible.size()));
|
||||
player.sendMessage(new TranslationTextComponent("botaniamisc.diceRoll", relic + 1).setStyle(new Style().setColor(TextFormatting.DARK_GREEN)));
|
||||
return ActionResult.newResult(ActionResultType.SUCCESS, relicStacks[relic].copy());
|
||||
return ActionResult.newResult(ActionResultType.SUCCESS, new ItemStack(getRelics()[relic]));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -86,11 +86,11 @@ public class ItemDice extends ItemRelic {
|
||||
}
|
||||
|
||||
private boolean hasRelicAlready(PlayerEntity player, int relic) {
|
||||
if(relic < 0 || relic > relicStacks.length || !(player instanceof ServerPlayerEntity))
|
||||
if(relic < 0 || relic > 6 || !(player instanceof ServerPlayerEntity))
|
||||
return true;
|
||||
|
||||
ServerPlayerEntity mpPlayer = (ServerPlayerEntity) player;
|
||||
Item item = relicStacks[relic].getItem();
|
||||
Item item = getRelics()[relic];
|
||||
ResourceLocation advId = ((IRelic) item).getAdvancement();
|
||||
|
||||
if(advId != null) {
|
||||
|
||||
File diff suppressed because it is too large.
Load diff
@@ -15,6 +15,7 @@ import net.minecraft.client.gui.FontRenderer;
|
||||
import net.minecraft.client.resources.I18n;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.crafting.Ingredient;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.util.text.TextFormatting;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||
@@ -26,18 +27,20 @@ import vazkii.botania.api.lexicon.ITwoNamedPage;
|
||||
import vazkii.botania.api.recipe.RecipeBrew;
|
||||
import vazkii.botania.common.core.helper.PlayerHelper;
|
||||
import vazkii.botania.common.item.ModItems;
|
||||
import vazkii.botania.common.lib.LibMisc;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class PageBrew extends PageRecipe implements ITwoNamedPage {
|
||||
private static final RecipeBrew DUMMY = new RecipeBrew(new ResourceLocation(LibMisc.MOD_ID, "dummy"), BotaniaAPI.fallbackBrew);
|
||||
|
||||
final RecipeBrew recipe;
|
||||
String text;
|
||||
private final RecipeBrew recipe;
|
||||
private String text;
|
||||
|
||||
public PageBrew(RecipeBrew recipe, String unlocalizedName, String bottomText) {
|
||||
public PageBrew(Brew brew, String unlocalizedName, String bottomText) {
|
||||
super(bottomText);
|
||||
this.recipe = recipe;
|
||||
recipe = BotaniaAPI.brewRecipes.values().stream().filter(recipe -> recipe.getBrew() == brew).findFirst().orElse(DUMMY);
|
||||
text = unlocalizedName;
|
||||
}
|
||||
|
||||
|
||||
@@ -10,76 +10,75 @@
|
||||
*/
|
||||
package vazkii.botania.common.lexicon.page;
|
||||
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.screen.Screen;
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import net.minecraft.client.renderer.texture.TextureManager;
|
||||
import net.minecraft.client.resources.I18n;
|
||||
import net.minecraft.inventory.CraftingInventory;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.crafting.IRecipe;
|
||||
import net.minecraft.item.crafting.IRecipeType;
|
||||
import net.minecraft.item.crafting.Ingredient;
|
||||
import net.minecraft.item.crafting.ShapedRecipe;
|
||||
import net.minecraft.item.crafting.ShapelessRecipe;
|
||||
import net.minecraft.util.NonNullList;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||
import net.minecraftforge.fml.server.ServerLifecycleHooks;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import vazkii.botania.api.internal.IGuiLexiconEntry;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.api.lexicon.LexiconRecipeMappings;
|
||||
import vazkii.botania.client.core.helper.RenderHelper;
|
||||
import vazkii.botania.client.lib.LibResources;
|
||||
import vazkii.botania.common.Botania;
|
||||
import vazkii.botania.common.lib.LibMisc;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import java.util.function.Predicate;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
public class PageCraftingRecipe extends PageRecipe {
|
||||
|
||||
private static final ResourceLocation craftingOverlay = new ResourceLocation(LibResources.GUI_CRAFTING_OVERLAY);
|
||||
private static final List<IRecipe<?>> DUMMY = Collections.singletonList(new ShapedRecipe(new ResourceLocation(LibMisc.MOD_ID, "dummy"), "", 1, 1, NonNullList.withSize(1, Ingredient.EMPTY), ItemStack.EMPTY));
|
||||
|
||||
final List<ResourceLocation> recipes;
|
||||
int ticksElapsed = 0;
|
||||
int recipeAt = 0;
|
||||
private final Item[] outputItems;
|
||||
private final Predicate<IRecipe<?>> recipeFilter;
|
||||
|
||||
private List<IRecipe<?>> recipes;
|
||||
|
||||
private int ticksElapsed = 0;
|
||||
private int recipeAt = 0;
|
||||
|
||||
boolean shapelessRecipe;
|
||||
|
||||
public PageCraftingRecipe(String unlocalizedName, List<ResourceLocation> recipes) {
|
||||
super(unlocalizedName);
|
||||
this.recipes = recipes;
|
||||
|
||||
for(ResourceLocation res : recipes)
|
||||
if(res == null)
|
||||
throw new IllegalArgumentException("Null recipes arent allowed");
|
||||
public PageCraftingRecipe(String unlocalizedName, Item... outputs) {
|
||||
this(unlocalizedName, r -> true, outputs);
|
||||
}
|
||||
|
||||
public PageCraftingRecipe(String unlocalizedName, ResourceLocation recipe) {
|
||||
this(unlocalizedName, Collections.singletonList(recipe));
|
||||
public PageCraftingRecipe(String unlocalizedName, Predicate<IRecipe<?>> filter, Item... outputs) {
|
||||
super(unlocalizedName);
|
||||
this.outputItems = outputs;
|
||||
this.recipeFilter = filter;
|
||||
}
|
||||
|
||||
@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);
|
||||
}
|
||||
for(Item item : outputItems) {
|
||||
LexiconRecipeMappings.map(new ItemStack(item), entry, index);
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
@Override
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
public void renderRecipe(IGuiLexiconEntry gui, int mx, int my) {
|
||||
shapelessRecipe = false;
|
||||
|
||||
ResourceLocation recipeId = recipes.get(recipeAt);
|
||||
IRecipe recipe = Minecraft.getInstance().world.getRecipeManager().getRecipes(IRecipeType.CRAFTING).get(recipeId);
|
||||
IRecipe<?> recipe = getRecipes().get(recipeAt);
|
||||
renderCraftingRecipe(gui, recipe);
|
||||
|
||||
TextureManager render = Minecraft.getInstance().textureManager;
|
||||
@@ -96,13 +95,11 @@ public class PageCraftingRecipe extends PageRecipe {
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
|
||||
if(shapelessRecipe) {
|
||||
if(recipe instanceof ShapelessRecipe) {
|
||||
((Screen) gui).blit(iconX, iconY, 240, 0, 16, 16);
|
||||
|
||||
if(mx >= iconX && my >= iconY && mx < iconX + 16 && my < iconY + 16)
|
||||
RenderHelper.renderTooltip(mx, my, Collections.singletonList(I18n.format("botaniamisc.shapeless")));
|
||||
|
||||
iconY += 20;
|
||||
}
|
||||
|
||||
render.bindTexture(craftingOverlay);
|
||||
@@ -117,14 +114,14 @@ public class PageCraftingRecipe extends PageRecipe {
|
||||
if(ticksElapsed % 20 == 0) {
|
||||
recipeAt++;
|
||||
|
||||
if(recipeAt == recipes.size())
|
||||
if(recipeAt == getRecipes().size())
|
||||
recipeAt = 0;
|
||||
}
|
||||
++ticksElapsed;
|
||||
}
|
||||
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
public void renderCraftingRecipe(IGuiLexiconEntry gui, IRecipe recipe) {
|
||||
public void renderCraftingRecipe(IGuiLexiconEntry gui, IRecipe<?> recipe) {
|
||||
if(recipe == null)
|
||||
return;
|
||||
|
||||
@@ -135,14 +132,13 @@ public class PageCraftingRecipe extends PageRecipe {
|
||||
|
||||
for(int y = 0; y < height; y++)
|
||||
for(int x = 0; x < width; x++) {
|
||||
Ingredient input = (Ingredient) recipe.getIngredients().get(y * width + x);
|
||||
Ingredient input = recipe.getIngredients().get(y * width + x);
|
||||
ItemStack[] stacks = input.getMatchingStacks();
|
||||
if(stacks.length > 0) {
|
||||
renderItemAtGridPos(gui, 1 + x, 1 + y, stacks[(ticksElapsed / 40) % stacks.length], true);
|
||||
}
|
||||
}
|
||||
} else if(recipe instanceof ShapelessRecipe) {
|
||||
shapelessRecipe = true;
|
||||
|
||||
drawGrid : {
|
||||
for(int y = 0; y < 3; y++)
|
||||
@@ -152,7 +148,7 @@ public class PageCraftingRecipe extends PageRecipe {
|
||||
if(index >= recipe.getIngredients().size())
|
||||
break drawGrid;
|
||||
|
||||
Ingredient input = (Ingredient) recipe.getIngredients().get(index);
|
||||
Ingredient input = recipe.getIngredients().get(index);
|
||||
if(input != Ingredient.EMPTY) {
|
||||
ItemStack[] stacks = input.getMatchingStacks();
|
||||
renderItemAtGridPos(gui, 1 + x, 1 + y, stacks[(ticksElapsed / 40) % stacks.length], true);
|
||||
@@ -164,16 +160,33 @@ public class PageCraftingRecipe extends PageRecipe {
|
||||
renderItemAtGridPos(gui, 2, 0, recipe.getRecipeOutput(), false);
|
||||
}
|
||||
|
||||
public List<IRecipe<?>> getRecipes() {
|
||||
if(recipes == null) {
|
||||
recipes = findRecipes();
|
||||
}
|
||||
return recipes;
|
||||
}
|
||||
|
||||
private List<IRecipe<?>> findRecipes() {
|
||||
List<IRecipe<?>> list = new ArrayList<>();
|
||||
for(IRecipe<CraftingInventory> recipe : ServerLifecycleHooks.getCurrentServer().getRecipeManager().getRecipes(IRecipeType.CRAFTING).values()) {
|
||||
if(recipeFilter.test(recipe)) {
|
||||
for(Item output : outputItems) {
|
||||
if(recipe.getRecipeOutput().getItem() == output) {
|
||||
list.add(recipe);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if(list.isEmpty()) {
|
||||
Botania.LOGGER.info("Could not find mana infusion recipes for items {}, using dummy", (Object) this.outputItems);
|
||||
return DUMMY;
|
||||
}
|
||||
return list;
|
||||
}
|
||||
|
||||
@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();
|
||||
return Arrays.stream(outputItems).map(ItemStack::new).collect(Collectors.toList());
|
||||
}
|
||||
}
|
||||
@@ -1,25 +1,28 @@
|
||||
package vazkii.botania.common.lexicon.page;
|
||||
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.AbstractGui;
|
||||
import net.minecraft.client.gui.screen.Screen;
|
||||
import net.minecraft.client.gui.screen.Screen;
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import net.minecraft.client.renderer.texture.AtlasTexture;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.renderer.texture.TextureManager;
|
||||
import net.minecraft.client.renderer.texture.AtlasTexture;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.crafting.Ingredient;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import vazkii.botania.api.BotaniaAPI;
|
||||
import vazkii.botania.api.internal.IGuiLexiconEntry;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.api.lexicon.LexiconRecipeMappings;
|
||||
import vazkii.botania.api.recipe.RecipeElvenTrade;
|
||||
import vazkii.botania.client.core.handler.MiscellaneousIcons;
|
||||
import vazkii.botania.client.lib.LibResources;
|
||||
import vazkii.botania.common.Botania;
|
||||
import vazkii.botania.common.lib.ResourceLocationHelper;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
@@ -28,31 +31,30 @@ import java.util.List;
|
||||
public class PageElvenRecipe extends PageRecipe {
|
||||
|
||||
private static final ResourceLocation elvenTradeOverlay = new ResourceLocation(LibResources.GUI_ELVEN_TRADE_OVERLAY);
|
||||
private static final List<RecipeElvenTrade> DUMMY = Collections.singletonList(new RecipeElvenTrade(ResourceLocationHelper.prefix("dummy"), ItemStack.EMPTY, Ingredient.EMPTY));
|
||||
|
||||
private final List<RecipeElvenTrade> recipes;
|
||||
private final Item[] outputItems;
|
||||
private List<RecipeElvenTrade> recipes;
|
||||
private int ticksElapsed = 0;
|
||||
private int recipeAt = 0;
|
||||
|
||||
public PageElvenRecipe(String unlocalizedName, List<RecipeElvenTrade> recipes) {
|
||||
super(unlocalizedName);
|
||||
this.recipes = recipes;
|
||||
}
|
||||
|
||||
public PageElvenRecipe(String unlocalizedName, RecipeElvenTrade recipe) {
|
||||
this(unlocalizedName, Collections.singletonList(recipe));
|
||||
public PageElvenRecipe(String unlocalizedName, Item... outputs) {
|
||||
super(unlocalizedName);
|
||||
this.outputItems = outputs;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onPageAdded(LexiconEntry entry, int index) {
|
||||
for(RecipeElvenTrade recipe : recipes)
|
||||
for(ItemStack output : recipe.getOutputs())
|
||||
LexiconRecipeMappings.map(output, entry, index);
|
||||
for(Item item : outputItems) {
|
||||
LexiconRecipeMappings.map(new ItemStack(item), entry, index);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
public void renderRecipe(IGuiLexiconEntry gui, int mx, int my) {
|
||||
RecipeElvenTrade recipe = recipes.get(recipeAt);
|
||||
RecipeElvenTrade recipe = getRecipes().get(recipeAt);
|
||||
TextureManager render = Minecraft.getInstance().textureManager;
|
||||
render.bindTexture(elvenTradeOverlay);
|
||||
GlStateManager.enableBlend();
|
||||
@@ -110,19 +112,44 @@ public class PageElvenRecipe extends PageRecipe {
|
||||
if(ticksElapsed % 20 == 0) {
|
||||
recipeAt++;
|
||||
|
||||
if(recipeAt == recipes.size())
|
||||
if(recipeAt == getRecipes().size())
|
||||
recipeAt = 0;
|
||||
}
|
||||
++ticksElapsed;
|
||||
}
|
||||
|
||||
public List<RecipeElvenTrade> getRecipes() {
|
||||
if(recipes == null) {
|
||||
recipes = findRecipes();
|
||||
}
|
||||
return recipes;
|
||||
}
|
||||
|
||||
private List<RecipeElvenTrade> findRecipes() {
|
||||
List<RecipeElvenTrade> list = new ArrayList<>();
|
||||
for(RecipeElvenTrade recipe : BotaniaAPI.elvenTradeRecipes.values()) {
|
||||
recipe: for(ItemStack output : recipe.getOutputs()) {
|
||||
for(Item item : outputItems) {
|
||||
if(output.getItem() == item) {
|
||||
list.add(recipe);
|
||||
break recipe;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if(list.isEmpty()) {
|
||||
Botania.LOGGER.warn("Could not find elven trade recipes for item {}, using dummy", (Object) outputItems);
|
||||
return DUMMY;
|
||||
}
|
||||
return list;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ItemStack> getDisplayedRecipes() {
|
||||
ArrayList<ItemStack> list = new ArrayList<>();
|
||||
for(RecipeElvenTrade r : recipes)
|
||||
for(RecipeElvenTrade r : getRecipes())
|
||||
list.addAll(r.getOutputs());
|
||||
|
||||
return list;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -10,22 +10,24 @@
|
||||
*/
|
||||
package vazkii.botania.common.lexicon.page;
|
||||
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.FontRenderer;
|
||||
import net.minecraft.client.gui.screen.Screen;
|
||||
import net.minecraft.client.gui.screen.Screen;
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import net.minecraft.client.renderer.texture.TextureManager;
|
||||
import net.minecraft.client.resources.I18n;
|
||||
import net.minecraft.item.Items;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.Items;
|
||||
import net.minecraft.item.crafting.Ingredient;
|
||||
import net.minecraft.tags.Tag;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.util.text.TextFormatting;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import vazkii.botania.api.BotaniaAPI;
|
||||
import vazkii.botania.api.internal.IGuiLexiconEntry;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.api.lexicon.LexiconRecipeMappings;
|
||||
@@ -33,45 +35,58 @@ import vazkii.botania.api.recipe.RecipeManaInfusion;
|
||||
import vazkii.botania.client.core.handler.HUDHandler;
|
||||
import vazkii.botania.client.core.helper.RenderHelper;
|
||||
import vazkii.botania.client.lib.LibResources;
|
||||
import vazkii.botania.common.Botania;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.block.tile.mana.TilePool;
|
||||
import vazkii.botania.common.core.helper.ItemNBTHelper;
|
||||
import vazkii.botania.common.lib.LibMisc;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.function.Predicate;
|
||||
|
||||
public class PageManaInfusionRecipe extends PageRecipe {
|
||||
|
||||
private static final ResourceLocation manaInfusionOverlay = new ResourceLocation(LibResources.GUI_MANA_INFUSION_OVERLAY);
|
||||
private static final List<RecipeManaInfusion> DUMMY = Collections.singletonList(new RecipeManaInfusion(new ResourceLocation(LibMisc.MOD_ID, "dummy"), ItemStack.EMPTY, Ingredient.EMPTY, 0));
|
||||
|
||||
private final List<RecipeManaInfusion> recipes;
|
||||
private List<RecipeManaInfusion> recipes = null;
|
||||
private final Item[] outputItems;
|
||||
private final Predicate<RecipeManaInfusion> recipeFilter;
|
||||
private int ticksElapsed = 0;
|
||||
private int recipeAt = 0;
|
||||
private final ItemStack renderStack;
|
||||
|
||||
public PageManaInfusionRecipe(String unlocalizedName, List<RecipeManaInfusion> recipes) {
|
||||
|
||||
public PageManaInfusionRecipe(String unlocalizedName, Item... outputs) {
|
||||
this(unlocalizedName, r -> true, outputs);
|
||||
}
|
||||
|
||||
public PageManaInfusionRecipe(String unlocalizedName, Predicate<RecipeManaInfusion> filter, Item... outputs) {
|
||||
super(unlocalizedName);
|
||||
this.recipes = recipes;
|
||||
this.outputItems = outputs;
|
||||
this.recipeFilter = filter;
|
||||
renderStack = new ItemStack(ModBlocks.manaPool);
|
||||
ItemNBTHelper.setBoolean(renderStack, "RenderFull", true);
|
||||
}
|
||||
|
||||
public PageManaInfusionRecipe(String unlocalizedName, RecipeManaInfusion recipe) {
|
||||
this(unlocalizedName, Collections.singletonList(recipe));
|
||||
public PageManaInfusionRecipe(String unlocalizedName, Predicate<RecipeManaInfusion> filter, Tag<Item> tag) {
|
||||
this(unlocalizedName, filter, tag.getAllElements().toArray(new Item[0]));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onPageAdded(LexiconEntry entry, int index) {
|
||||
for(RecipeManaInfusion recipe : recipes)
|
||||
LexiconRecipeMappings.map(recipe.getOutput(), entry, index);
|
||||
for(Item item : outputItems) {
|
||||
LexiconRecipeMappings.map(new ItemStack(item), entry, index);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
public void renderRecipe(IGuiLexiconEntry gui, int mx, int my) {
|
||||
RecipeManaInfusion recipe = recipes.get(recipeAt);
|
||||
RecipeManaInfusion recipe = getRecipes().get(recipeAt);
|
||||
TextureManager render = Minecraft.getInstance().textureManager;
|
||||
FontRenderer font = Minecraft.getInstance().fontRenderer;
|
||||
|
||||
@@ -145,7 +160,7 @@ public class PageManaInfusionRecipe extends PageRecipe {
|
||||
if(ticksElapsed % 20 == 0) {
|
||||
recipeAt++;
|
||||
|
||||
if(recipeAt == recipes.size())
|
||||
if(recipeAt == getRecipes().size())
|
||||
recipeAt = 0;
|
||||
}
|
||||
++ticksElapsed;
|
||||
@@ -154,10 +169,36 @@ public class PageManaInfusionRecipe extends PageRecipe {
|
||||
@Override
|
||||
public List<ItemStack> getDisplayedRecipes() {
|
||||
ArrayList<ItemStack> list = new ArrayList<>();
|
||||
for(RecipeManaInfusion r : recipes)
|
||||
for(RecipeManaInfusion r : getRecipes())
|
||||
list.add(r.getOutput());
|
||||
|
||||
return list;
|
||||
}
|
||||
|
||||
private List<RecipeManaInfusion> findRecipes() {
|
||||
List<RecipeManaInfusion> list = new ArrayList<>();
|
||||
for(RecipeManaInfusion recipe : BotaniaAPI.manaInfusionRecipes.values()) {
|
||||
if(recipeFilter.test(recipe)) {
|
||||
Item recipeOutput = recipe.getOutput().getItem();
|
||||
for(Item output : outputItems) {
|
||||
if(recipeOutput == output) {
|
||||
list.add(recipe);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if(list.isEmpty()) {
|
||||
Botania.LOGGER.warn("Could not find mana infusion recipes for items {}, using dummy", (Object) outputItems);
|
||||
return DUMMY;
|
||||
}
|
||||
return list;
|
||||
}
|
||||
|
||||
public List<RecipeManaInfusion> getRecipes() {
|
||||
if(recipes == null) {
|
||||
recipes = findRecipes();
|
||||
}
|
||||
return recipes;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,175 @@
|
||||
/**
|
||||
* This class was created by <Hubry>. It's 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
|
||||
*
|
||||
* File Created @ [sie 08 2019, 11:43]
|
||||
*/
|
||||
package vazkii.botania.common.lexicon.page;
|
||||
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.FontRenderer;
|
||||
import net.minecraft.client.gui.screen.Screen;
|
||||
import net.minecraft.client.renderer.texture.TextureManager;
|
||||
import net.minecraft.client.resources.I18n;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.crafting.Ingredient;
|
||||
import net.minecraft.tags.Tag;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import vazkii.botania.api.internal.IGuiLexiconEntry;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.api.lexicon.LexiconRecipeMappings;
|
||||
import vazkii.botania.api.recipe.IModRecipe;
|
||||
import vazkii.botania.client.core.handler.ClientTickHandler;
|
||||
import vazkii.botania.client.lib.LibResources;
|
||||
import vazkii.botania.common.core.handler.ConfigHandler;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.function.Predicate;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
public abstract class PageModRecipe<T extends IModRecipe> extends PageRecipe {
|
||||
private static final ResourceLocation petalOverlay = new ResourceLocation(LibResources.GUI_PETAL_OVERLAY);
|
||||
|
||||
protected final Item[] outputItems;
|
||||
private final Predicate<T> recipeFilter;
|
||||
|
||||
private List<T> recipes = null;
|
||||
private int ticksElapsed = 0;
|
||||
private int recipeAt = 0;
|
||||
|
||||
public PageModRecipe(String unlocalizedName, Predicate<T> filter, Item... outputs) {
|
||||
super(unlocalizedName);
|
||||
this.recipeFilter = filter;
|
||||
this.outputItems = outputs;
|
||||
}
|
||||
|
||||
public PageModRecipe(String unlocalizedName, Item... outputItems) {
|
||||
this(unlocalizedName, r -> true, outputItems);
|
||||
}
|
||||
|
||||
public PageModRecipe(String unlocalizedName, Predicate<T> filter, Tag<Item> outputs) {
|
||||
this(unlocalizedName, filter, outputs.getAllElements().toArray(new Item[0]));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onPageAdded(LexiconEntry entry, int index) {
|
||||
for(Item item : outputItems)
|
||||
LexiconRecipeMappings.map(new ItemStack(item), entry, index);
|
||||
}
|
||||
|
||||
@Override
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
public void renderRecipe(IGuiLexiconEntry gui, int mx, int my) {
|
||||
T recipe = getRecipes().get(recipeAt);
|
||||
TextureManager render = Minecraft.getInstance().textureManager;
|
||||
|
||||
renderItemAtGridPos(gui, 3, 0, recipe.getOutput(), false);
|
||||
renderItemAtGridPos(gui, 2, 1, getMiddleStack(), false);
|
||||
|
||||
List<Ingredient> inputs = recipe.getInputs();
|
||||
int degreePerInput = (int) (360F / inputs.size());
|
||||
float currentDegree = ConfigHandler.CLIENT.lexiconRotatingItems.get()
|
||||
? Screen.hasShiftDown()
|
||||
? ticksElapsed
|
||||
: ticksElapsed + ClientTickHandler.partialTicks
|
||||
: 0;
|
||||
int inputIndex = ticksElapsed / 40;
|
||||
|
||||
for(Ingredient input : inputs) {
|
||||
ItemStack[] stacks = input.getMatchingStacks();
|
||||
int size = stacks.length;
|
||||
ItemStack stack = stacks[size - inputIndex % size - 1];
|
||||
// todo 1.13 can't we just use inputIndex % size?
|
||||
|
||||
renderItemAtAngle(gui, currentDegree, stack);
|
||||
|
||||
currentDegree += degreePerInput;
|
||||
}
|
||||
|
||||
renderManaBar(gui, recipe, mx, my);
|
||||
|
||||
render.bindTexture(petalOverlay);
|
||||
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
((Screen) gui).blit(gui.getLeft(), gui.getTop(), 0, 0, gui.getWidth(), gui.getHeight());
|
||||
GlStateManager.disableBlend();
|
||||
}
|
||||
|
||||
abstract ItemStack getMiddleStack();
|
||||
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
public void renderManaBar(IGuiLexiconEntry gui, T recipe, int mx, int my) {
|
||||
FontRenderer font = Minecraft.getInstance().fontRenderer;
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
|
||||
int x = gui.getLeft() + gui.getWidth() / 2 - 50;
|
||||
int y = gui.getTop() + 120;
|
||||
|
||||
String stopStr = I18n.format("botaniamisc.shiftToStopSpin");
|
||||
font.drawString(stopStr, x + 50 - font.getStringWidth(stopStr) / 2, y + 15, 0x99000000);
|
||||
|
||||
GlStateManager.disableBlend();
|
||||
}
|
||||
|
||||
@Override
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
public void updateScreen() {
|
||||
if(Screen.hasShiftDown())
|
||||
return;
|
||||
|
||||
if(ticksElapsed % 20 == 0) {
|
||||
recipeAt++;
|
||||
|
||||
if(recipeAt == getRecipes().size())
|
||||
recipeAt = 0;
|
||||
}
|
||||
++ticksElapsed;
|
||||
}
|
||||
|
||||
public List<T> getRecipes(){
|
||||
if(recipes == null) {
|
||||
recipes = findRecipes();
|
||||
}
|
||||
return recipes;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ItemStack> getDisplayedRecipes() {
|
||||
return Arrays.stream(outputItems).map(ItemStack::new).collect(Collectors.toList());
|
||||
}
|
||||
|
||||
protected abstract List<T> findRecipes();
|
||||
|
||||
protected List<T> findRecipes(Collection<T> recipeList) {
|
||||
if(recipes == null) {
|
||||
List<T> list = new ArrayList<>();
|
||||
for(T recipe : recipeList) {
|
||||
if(recipeFilter.test(recipe)) {
|
||||
for(Item output : outputItems) {
|
||||
if(recipe.getOutput().getItem() == output) {
|
||||
list.add(recipe);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
recipes = list;
|
||||
return list;
|
||||
}
|
||||
return recipes;
|
||||
}
|
||||
}
|
||||
@@ -10,139 +10,55 @@
|
||||
*/
|
||||
package vazkii.botania.common.lexicon.page;
|
||||
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
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.ModBlocks;
|
||||
import vazkii.botania.common.lib.LibMisc;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.function.Predicate;
|
||||
|
||||
import net.minecraft.client.gui.screen.Screen;
|
||||
import net.minecraft.item.crafting.Ingredient;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
public class PagePetalRecipe extends PageModRecipe<RecipePetals> {
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.FontRenderer;
|
||||
import net.minecraft.client.gui.screen.Screen;
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import net.minecraft.client.renderer.texture.TextureManager;
|
||||
import net.minecraft.client.resources.I18n;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.NonNullList;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||
import vazkii.botania.api.internal.IGuiLexiconEntry;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.api.lexicon.LexiconRecipeMappings;
|
||||
import vazkii.botania.api.recipe.IModRecipe;
|
||||
import vazkii.botania.api.recipe.RecipePetals;
|
||||
import vazkii.botania.client.core.handler.ClientTickHandler;
|
||||
import vazkii.botania.client.lib.LibResources;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.core.handler.ConfigHandler;
|
||||
private static final List<RecipePetals> DUMMY = Collections.singletonList(new RecipePetals(new ResourceLocation(LibMisc.MOD_ID, "dummy"), ItemStack.EMPTY));
|
||||
|
||||
public class PagePetalRecipe<T extends IModRecipe> extends PageRecipe {
|
||||
|
||||
private static final ResourceLocation petalOverlay = new ResourceLocation(LibResources.GUI_PETAL_OVERLAY);
|
||||
|
||||
private final List<T> recipes;
|
||||
private int ticksElapsed = 0;
|
||||
private int recipeAt = 0;
|
||||
|
||||
public PagePetalRecipe(String unlocalizedName, List<T> recipes) {
|
||||
super(unlocalizedName);
|
||||
this.recipes = recipes;
|
||||
public PagePetalRecipe(String unlocalizedName, Predicate<RecipePetals> filter, Item... outputs) {
|
||||
super(unlocalizedName, filter, outputs);
|
||||
}
|
||||
|
||||
public PagePetalRecipe(String unlocalizedName, T recipe) {
|
||||
this(unlocalizedName, Collections.singletonList(recipe));
|
||||
public PagePetalRecipe(String unlocalizedName, Item... outputs) {
|
||||
this(unlocalizedName, r -> true, outputs);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onPageAdded(LexiconEntry entry, int index) {
|
||||
for(T recipe : recipes)
|
||||
LexiconRecipeMappings.map(recipe.getOutput(), entry, index);
|
||||
}
|
||||
|
||||
@Override
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
public void renderRecipe(IGuiLexiconEntry gui, int mx, int my) {
|
||||
T recipe = recipes.get(recipeAt);
|
||||
TextureManager render = Minecraft.getInstance().textureManager;
|
||||
|
||||
renderItemAtGridPos(gui, 3, 0, recipe.getOutput(), false);
|
||||
renderItemAtGridPos(gui, 2, 1, getMiddleStack(), false);
|
||||
|
||||
List<Ingredient> inputs = recipe.getInputs();
|
||||
int degreePerInput = (int) (360F / inputs.size());
|
||||
float currentDegree = ConfigHandler.CLIENT.lexiconRotatingItems.get()
|
||||
? Screen.hasShiftDown()
|
||||
? ticksElapsed
|
||||
: ticksElapsed + ClientTickHandler.partialTicks
|
||||
: 0;
|
||||
int inputIndex = ticksElapsed / 40;
|
||||
|
||||
for(Ingredient input : inputs) {
|
||||
ItemStack[] stacks = input.getMatchingStacks();
|
||||
int size = stacks.length;
|
||||
ItemStack stack = stacks[size - inputIndex % size - 1];
|
||||
// todo 1.13 can't we just use inputIndex % size?
|
||||
|
||||
renderItemAtAngle(gui, currentDegree, stack);
|
||||
|
||||
currentDegree += degreePerInput;
|
||||
}
|
||||
|
||||
renderManaBar(gui, recipe, mx, my);
|
||||
|
||||
render.bindTexture(petalOverlay);
|
||||
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
((Screen) gui).blit(gui.getLeft(), gui.getTop(), 0, 0, gui.getWidth(), gui.getHeight());
|
||||
GlStateManager.disableBlend();
|
||||
}
|
||||
|
||||
ItemStack getMiddleStack() {
|
||||
return new ItemStack(ModBlocks.defaultAltar);
|
||||
}
|
||||
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
public void renderManaBar(IGuiLexiconEntry gui, T recipe, int mx, int my) {
|
||||
FontRenderer font = Minecraft.getInstance().fontRenderer;
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
|
||||
int x = gui.getLeft() + gui.getWidth() / 2 - 50;
|
||||
int y = gui.getTop() + 120;
|
||||
|
||||
String stopStr = I18n.format("botaniamisc.shiftToStopSpin");
|
||||
font.drawString(stopStr, x + 50 - font.getStringWidth(stopStr) / 2, y + 15, 0x99000000);
|
||||
|
||||
GlStateManager.disableBlend();
|
||||
}
|
||||
|
||||
@Override
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
public void updateScreen() {
|
||||
if(Screen.hasShiftDown())
|
||||
return;
|
||||
|
||||
if(ticksElapsed % 20 == 0) {
|
||||
recipeAt++;
|
||||
|
||||
if(recipeAt == recipes.size())
|
||||
recipeAt = 0;
|
||||
}
|
||||
++ticksElapsed;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ItemStack> getDisplayedRecipes() {
|
||||
ArrayList<ItemStack> list = new ArrayList<>();
|
||||
for(T r : recipes)
|
||||
for(RecipePetals r : getRecipes())
|
||||
list.add(r.getOutput());
|
||||
|
||||
return list;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
protected List<RecipePetals> findRecipes() {
|
||||
List<RecipePetals> recipes = findRecipes(BotaniaAPI.petalRecipes.values());
|
||||
if(recipes.isEmpty()) {
|
||||
Botania.LOGGER.warn("Could not find petal apothecary recipes for items {}, using dummy", (Object) outputItems);
|
||||
return DUMMY;
|
||||
}
|
||||
return recipes;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -10,11 +10,10 @@
|
||||
*/
|
||||
package vazkii.botania.common.lexicon.page;
|
||||
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.FontRenderer;
|
||||
import net.minecraft.client.gui.screen.Screen;
|
||||
import net.minecraft.client.gui.screen.Screen;
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import net.minecraft.client.renderer.ItemRenderer;
|
||||
import net.minecraft.client.renderer.RenderHelper;
|
||||
import net.minecraft.client.resources.I18n;
|
||||
@@ -22,11 +21,10 @@ import net.minecraft.client.util.ITooltipFlag;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.text.ITextComponent;
|
||||
import net.minecraft.util.text.TextFormatting;
|
||||
import net.minecraftforge.client.ForgeHooksClient;
|
||||
import net.minecraftforge.client.event.RenderTooltipEvent;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||
import net.minecraftforge.client.event.RenderTooltipEvent;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import org.lwjgl.glfw.GLFW;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import vazkii.botania.api.internal.IGuiLexiconEntry;
|
||||
@@ -37,22 +35,20 @@ import vazkii.botania.api.lexicon.LexiconRecipeMappings.EntryData;
|
||||
import vazkii.botania.client.gui.lexicon.GuiLexiconEntry;
|
||||
import vazkii.botania.common.core.helper.PlayerHelper;
|
||||
|
||||
import java.awt.font.FontRenderContext;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
public class PageRecipe extends LexiconPage {
|
||||
|
||||
int relativeMouseX, relativeMouseY;
|
||||
ItemStack tooltipStack = ItemStack.EMPTY, tooltipContainerStack = ItemStack.EMPTY;
|
||||
boolean tooltipEntry;
|
||||
private int relativeMouseX, relativeMouseY;
|
||||
private ItemStack tooltipStack = ItemStack.EMPTY;
|
||||
private ItemStack tooltipContainerStack = ItemStack.EMPTY;
|
||||
private boolean tooltipEntry;
|
||||
|
||||
static boolean mouseDownLastTick = false;
|
||||
private static boolean mouseDownLastTick = false;
|
||||
|
||||
public PageRecipe(String unlocalizedName) {
|
||||
super(unlocalizedName);
|
||||
|
||||
@@ -10,30 +10,40 @@
|
||||
*/
|
||||
package vazkii.botania.common.lexicon.page;
|
||||
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.FontRenderer;
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import net.minecraft.client.resources.I18n;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tags.Tag;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import vazkii.botania.api.BotaniaAPI;
|
||||
import vazkii.botania.api.internal.IGuiLexiconEntry;
|
||||
import vazkii.botania.api.recipe.RecipeRuneAltar;
|
||||
import vazkii.botania.client.core.handler.HUDHandler;
|
||||
import vazkii.botania.common.Botania;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.block.tile.mana.TilePool;
|
||||
import vazkii.botania.common.lib.LibMisc;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.function.Predicate;
|
||||
|
||||
public class PageRuneRecipe extends PagePetalRecipe<RecipeRuneAltar> {
|
||||
public class PageRuneRecipe extends PageModRecipe<RecipeRuneAltar> {
|
||||
|
||||
private static final List<RecipeRuneAltar> DUMMY = Collections.singletonList(new RecipeRuneAltar(new ResourceLocation(LibMisc.MOD_ID, "dummy"), ItemStack.EMPTY, 0));
|
||||
|
||||
public PageRuneRecipe(String unlocalizedName, List<RecipeRuneAltar> recipes) {
|
||||
super(unlocalizedName, recipes);
|
||||
public PageRuneRecipe(String unlocalizedName, Item... outputs) {
|
||||
super(unlocalizedName, outputs);
|
||||
}
|
||||
|
||||
public PageRuneRecipe(String unlocalizedName, RecipeRuneAltar recipes) {
|
||||
super(unlocalizedName, recipes);
|
||||
public PageRuneRecipe(String unlocalizedName, Predicate<RecipeRuneAltar> filter, Item... outputs) {
|
||||
super(unlocalizedName, filter, outputs);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -41,7 +51,6 @@ public class PageRuneRecipe extends PagePetalRecipe<RecipeRuneAltar> {
|
||||
return new ItemStack(ModBlocks.runeAltar);
|
||||
}
|
||||
|
||||
@Override
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
public void renderManaBar(IGuiLexiconEntry gui, RecipeRuneAltar recipe, int mx, int my) {
|
||||
FontRenderer font = Minecraft.getInstance().fontRenderer;
|
||||
@@ -67,4 +76,13 @@ public class PageRuneRecipe extends PagePetalRecipe<RecipeRuneAltar> {
|
||||
GlStateManager.disableBlend();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<RecipeRuneAltar> findRecipes() {
|
||||
List<RecipeRuneAltar> recipes = findRecipes(BotaniaAPI.runeAltarRecipes.values());
|
||||
if(recipes.isEmpty()) {
|
||||
Botania.LOGGER.warn("Could not find runic altar recipes for items {}, using dummy", (Object) outputItems);
|
||||
return DUMMY;
|
||||
}
|
||||
return recipes;
|
||||
}
|
||||
}
|
||||
@@ -16,8 +16,8 @@ public final class LibLexicon {
|
||||
|
||||
public static final String CATEGORY_BASICS = "basics";
|
||||
public static final String CATEGORY_MANA = "mana";
|
||||
public static final String CATEGORY_FUNCTIONAL_FLOWERS = "functionalFlowers";
|
||||
public static final String CATEGORY_GENERATION_FLOWERS = "generationFlowers";
|
||||
public static final String CATEGORY_FUNCTIONAL_FLOWERS = "functionalflowers";
|
||||
public static final String CATEGORY_GENERATION_FLOWERS = "generationflowers";
|
||||
public static final String CATEGORY_DEVICES = "devices";
|
||||
public static final String CATEGORY_TOOLS = "tools";
|
||||
public static final String CATEGORY_BAUBLES = "baubles";
|
||||
|
||||
Reference in new issue
Block a user