mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-18 11:19:19 +00:00
Tweak templates, remove workarounds, mark some entries as default read
This commit is contained in:
1 parent
90977798d4
commit
fc65cbd1f5
202 files changed
+373
-175
No files matched your search
@@ -16,10 +16,15 @@ import com.google.gson.Gson;
|
||||
import com.google.gson.GsonBuilder;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.crafting.IRecipe;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||
import vazkii.botania.api.BotaniaAPI;
|
||||
import vazkii.botania.api.recipe.IModRecipe;
|
||||
import vazkii.botania.common.lexicon.AlfheimLexiconEntry;
|
||||
import vazkii.botania.common.lexicon.CompatLexiconEntry;
|
||||
import vazkii.botania.common.lexicon.RelicLexiconEntry;
|
||||
import vazkii.botania.common.lexicon.WelcomeLexiconEntry;
|
||||
import vazkii.botania.common.lexicon.page.PageBrew;
|
||||
import vazkii.botania.common.lexicon.page.PageCraftingRecipe;
|
||||
import vazkii.botania.common.lexicon.page.PageElvenRecipe;
|
||||
@@ -135,17 +140,38 @@ public class LexiconEntry implements Comparable<LexiconEntry> {
|
||||
Gson gson = new GsonBuilder().setPrettyPrinting().create();
|
||||
try (OutputStreamWriter os = new OutputStreamWriter(new BufferedOutputStream(new FileOutputStream(f)))) {
|
||||
Map<String, Object> entry = new LinkedHashMap<>();
|
||||
|
||||
entry.put("name", this.getUnlocalizedName());
|
||||
entry.put("category", fixCamelCase(category.getUnlocalizedName().substring("botania.category.".length())));
|
||||
entry.put("icon", getIcon().getItem().getRegistryName().toString());
|
||||
if (isPriority())
|
||||
if (isPriority()) {
|
||||
entry.put("priority", true);
|
||||
} else if (!(this instanceof RelicLexiconEntry || this.getUnlocalizedName().contains("terrasteel") || this.getUnlocalizedName().contains("relics"))) {
|
||||
entry.put("read_by_default", true);
|
||||
}
|
||||
if (this instanceof WelcomeLexiconEntry)
|
||||
entry.put("sortnum", -10);
|
||||
if (this instanceof RelicLexiconEntry) {
|
||||
ResourceLocation advancement = ((RelicLexiconEntry) this).advancement;
|
||||
if(advancement != null)
|
||||
entry.put("advancement", advancement.toString());
|
||||
} else if(this instanceof AlfheimLexiconEntry) {
|
||||
// entry.put("advancement", ); TODO pick/make advancement for elven entries
|
||||
} else if(this instanceof CompatLexiconEntry) {
|
||||
entry.put("flag", "|debug,mod:" + ((CompatLexiconEntry) this).mod.toLowerCase(Locale.ROOT));
|
||||
}
|
||||
|
||||
List<Object> pages = new ArrayList<>();
|
||||
for(LexiconPage page : this.pages) {
|
||||
for (int i = 0; i < this.pages.size(); i++) {
|
||||
LexiconPage page = this.pages.get(i);
|
||||
Map<String, Object> json = new LinkedHashMap<>();
|
||||
String unlocalizedName = page.getUnlocalizedName();
|
||||
if (page instanceof PageText) {
|
||||
json.put("type", page instanceof PageLoreText ? "lore_page" : "text");
|
||||
if (page instanceof PageLoreText) {
|
||||
json.put("type", "lore_page");
|
||||
json.put("text", unlocalizedName);
|
||||
json.put(i % 2 == 0 ? "left_side" : "right_side", "true");
|
||||
} else if (page instanceof PageText) {
|
||||
json.put("type", "text");
|
||||
json.put("text", unlocalizedName);
|
||||
} else if (page instanceof PageImage) {
|
||||
json.put("type", "image");
|
||||
|
||||
@@ -12,9 +12,7 @@ package vazkii.botania.client.patchouli;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.crafting.Ingredient;
|
||||
import vazkii.patchouli.api.IComponentRenderContext;
|
||||
import vazkii.patchouli.api.PatchouliAPI;
|
||||
import vazkii.patchouli.client.book.gui.GuiBook;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@@ -22,21 +20,10 @@ import java.util.StringJoiner;
|
||||
|
||||
public class PatchouliUtils {
|
||||
|
||||
/**
|
||||
* Extracts the tick counter from the current render context, if possible.
|
||||
* Note: uses Patchouli internals. TODO expose tick counter in the Patchouli API?
|
||||
*/
|
||||
public static int getBookTicksElapsed(IComponentRenderContext context) {
|
||||
return context instanceof GuiBook ? ((GuiBook) context).ticksInBook : 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Combines the ingredients, returning the first matching stack of each, then the second stack of each, etc.
|
||||
* looping back ingredients that run out of matched stacks, until the ingredients reach the length
|
||||
* of the longest ingredient in the recipe set.
|
||||
* <p>
|
||||
* Note: As Patchouli internally converts the list of stacks into an ingredient, which will ignore empty stacks,
|
||||
* empty ingredients will result in displaying stacks where nothing should be displayed instead.
|
||||
*
|
||||
* @param ingredients List of ingredients in the specific slot
|
||||
* @param longestIngredientSize Longest ingredient in the entire recipe
|
||||
|
||||
@@ -1,69 +0,0 @@
|
||||
/**
|
||||
* 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 @ [Sep 24 2019, 5:18 PM (GMT)]
|
||||
*/
|
||||
package vazkii.botania.client.patchouli.component;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.fml.common.ObfuscationReflectionHelper;
|
||||
import vazkii.botania.client.patchouli.PatchouliUtils;
|
||||
import vazkii.botania.common.Botania;
|
||||
import vazkii.patchouli.api.IComponentRenderContext;
|
||||
import vazkii.patchouli.api.ICustomComponent;
|
||||
import vazkii.patchouli.api.PatchouliAPI;
|
||||
import vazkii.patchouli.api.VariableHolder;
|
||||
|
||||
import java.lang.reflect.InvocationTargetException;
|
||||
import java.lang.reflect.Method;
|
||||
import java.util.Arrays;
|
||||
|
||||
// TODO: Remove when we don't need a bypass like that
|
||||
/**
|
||||
* A custom Patchouli component that is similiar to the default {@code item} type, but accepts
|
||||
* air as a valid option in presence of other items.
|
||||
* It does not support the {@code link_recipe} or the {@code framed} parameters.
|
||||
* @deprecated For removal when Patchouli does not throw air away.
|
||||
*/
|
||||
@Deprecated
|
||||
public class ItemStackListComponent implements ICustomComponent {
|
||||
@VariableHolder
|
||||
public String item;
|
||||
|
||||
private transient int x, y;
|
||||
private transient ItemStack[] stacks;
|
||||
|
||||
@Override
|
||||
public void build(int componentX, int componentY, int pageNum) {
|
||||
this.x = componentX;
|
||||
this.y = componentY;
|
||||
this.stacks = Arrays.stream(splitSerializedStacks(item))
|
||||
.map(PatchouliAPI.instance::deserializeItemStack).toArray(ItemStack[]::new);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void render(IComponentRenderContext context, float pticks, int mouseX, int mouseY) {
|
||||
int index = (PatchouliUtils.getBookTicksElapsed(context) / 20) % stacks.length;
|
||||
context.renderItemStack(x, y, mouseX, mouseY, stacks[index]);
|
||||
}
|
||||
|
||||
private static final Method splitStacksFromSerializedIngredient = ObfuscationReflectionHelper.findMethod(
|
||||
vazkii.patchouli.common.util.ItemStackUtil.class, "splitStacksFromSerializedIngredient", String.class);
|
||||
|
||||
//TODO stop reflecting into Patchouli
|
||||
private static String[] splitSerializedStacks(String ingredient) {
|
||||
String[] strings;
|
||||
try {
|
||||
strings = (String[]) splitStacksFromSerializedIngredient.invoke(null, ingredient);
|
||||
} catch (IllegalAccessException | InvocationTargetException e) {
|
||||
Botania.LOGGER.error("Failed to access Patchouli internals", e);
|
||||
return new String[]{"minecraft:air"};
|
||||
}
|
||||
return strings;
|
||||
}
|
||||
}
|
||||
@@ -13,7 +13,6 @@ package vazkii.botania.client.patchouli.component;
|
||||
import net.minecraft.client.gui.FontRenderer;
|
||||
import net.minecraft.client.resources.I18n;
|
||||
import vazkii.botania.client.core.handler.HUDHandler;
|
||||
import vazkii.botania.client.patchouli.PatchouliUtils;
|
||||
import vazkii.botania.common.block.tile.mana.TilePool;
|
||||
import vazkii.patchouli.api.IComponentRenderContext;
|
||||
import vazkii.patchouli.api.ICustomComponent;
|
||||
@@ -56,12 +55,9 @@ public class ManaComponent implements ICustomComponent {
|
||||
ratio = 1;
|
||||
}
|
||||
HUDHandler.renderManaBar(x, y + 10, 0x0000FF, 0.75F,
|
||||
manaValues[PatchouliUtils.getBookTicksElapsed(context) % manaValues.length], TilePool.MAX_MANA / ratio);
|
||||
manaValues[(context.getTicksInBook() / 20) % manaValues.length], TilePool.MAX_MANA / ratio);
|
||||
|
||||
String ratioString = I18n.format("botaniamisc.ratio", ratio);
|
||||
font.drawString(ratioString, x + 102 / 2 - font.getStringWidth(ratioString) / 2, y + 15, 0x99000000);
|
||||
|
||||
//String stopStr = I18n.format("botaniamisc.shiftToStopSpin"); //TODO we get the vanilla font renderer and Patchouli is tighter than the lexicon
|
||||
//font.drawString(stopStr, x + 102 / 2 - font.getStringWidth(ratioString) / 2, y + 20, 0x99000000);
|
||||
}
|
||||
}
|
||||
+1
-2
@@ -13,7 +13,6 @@ package vazkii.botania.client.patchouli.component;
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import net.minecraft.client.gui.screen.Screen;
|
||||
import net.minecraft.item.crafting.Ingredient;
|
||||
import vazkii.botania.client.patchouli.PatchouliUtils;
|
||||
import vazkii.botania.common.core.handler.ConfigHandler;
|
||||
import vazkii.patchouli.api.IComponentRenderContext;
|
||||
import vazkii.patchouli.api.ICustomComponent;
|
||||
@@ -42,7 +41,7 @@ abstract class RotatingItemListComponentBase implements ICustomComponent {
|
||||
@Override
|
||||
public void render(IComponentRenderContext context, float pticks, int mouseX, int mouseY) {
|
||||
int degreePerInput = (int) (360F / ingredients.size());
|
||||
int ticksElapsed = PatchouliUtils.getBookTicksElapsed(context);
|
||||
int ticksElapsed = context.getTicksInBook();
|
||||
|
||||
float currentDegree = ConfigHandler.CLIENT.lexiconRotatingItems.get()
|
||||
? Screen.hasShiftDown()
|
||||
|
||||
@@ -11,10 +11,13 @@
|
||||
package vazkii.botania.client.patchouli.processor;
|
||||
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import net.minecraft.client.resources.I18n;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.util.text.TextFormatting;
|
||||
import vazkii.botania.api.BotaniaAPI;
|
||||
import vazkii.botania.api.recipe.RecipeManaInfusion;
|
||||
import vazkii.botania.client.core.helper.RenderHelper;
|
||||
import vazkii.botania.client.patchouli.PatchouliUtils;
|
||||
import vazkii.patchouli.api.IComponentProcessor;
|
||||
import vazkii.patchouli.api.IVariableProvider;
|
||||
@@ -65,6 +68,12 @@ public class ManaInfusionProcessor implements IComponentProcessor {
|
||||
.collect(Collectors.joining(","));
|
||||
case "mana":
|
||||
return recipes.stream().mapToInt(RecipeManaInfusion::getManaToConsume).mapToObj(Integer::toString).collect(Collectors.joining(";"));
|
||||
case "drop":
|
||||
return I18n.format("botaniamisc.drop") + TextFormatting.BOLD + " (?)";
|
||||
case "dropTip0":
|
||||
case "dropTip1":
|
||||
return I18n.format("botaniamisc.dropTip" + key.substring(7),
|
||||
TextFormatting.GREEN + RenderHelper.getKeyDisplayString("key.drop") + TextFormatting.WHITE);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
+10
-6
@@ -11,6 +11,7 @@
|
||||
package vazkii.botania.client.patchouli.processor;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.resources.I18n;
|
||||
import net.minecraft.inventory.CraftingInventory;
|
||||
import net.minecraft.item.crafting.ICraftingRecipe;
|
||||
import net.minecraft.item.crafting.IRecipe;
|
||||
@@ -20,7 +21,6 @@ import net.minecraft.util.NonNullList;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.common.crafting.IShapedRecipe;
|
||||
import vazkii.botania.client.patchouli.PatchouliUtils;
|
||||
import vazkii.botania.common.Botania;
|
||||
import vazkii.patchouli.api.IComponentProcessor;
|
||||
import vazkii.patchouli.api.IVariableProvider;
|
||||
import vazkii.patchouli.api.PatchouliAPI;
|
||||
@@ -34,6 +34,7 @@ public class MultiCraftingProcessor implements IComponentProcessor {
|
||||
private List<ICraftingRecipe> recipes;
|
||||
private boolean shapeless = true;
|
||||
private int longestIngredientSize = 0;
|
||||
private boolean hasCustomHeading;
|
||||
|
||||
@Override
|
||||
public void setup(IVariableProvider<String> variables) {
|
||||
@@ -55,6 +56,7 @@ public class MultiCraftingProcessor implements IComponentProcessor {
|
||||
}
|
||||
}
|
||||
}
|
||||
this.hasCustomHeading = variables.has("heading");
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -62,6 +64,11 @@ public class MultiCraftingProcessor implements IComponentProcessor {
|
||||
if(recipes.isEmpty()) {
|
||||
return null;
|
||||
}
|
||||
if(key.equals("heading")) {
|
||||
if(!hasCustomHeading)
|
||||
return recipes.get(0).getRecipeOutput().getDisplayName().getString();
|
||||
return null;
|
||||
}
|
||||
if(key.startsWith("input")) {
|
||||
int index = Integer.parseInt(key.substring(5)) - 1;
|
||||
int shapedX = index % 3;
|
||||
@@ -73,14 +80,11 @@ public class MultiCraftingProcessor implements IComponentProcessor {
|
||||
if(shaped.getRecipeWidth() < shapedX + 1) {
|
||||
ingredients.add(Ingredient.EMPTY);
|
||||
} else {
|
||||
if(recipe.getId().getPath().contains("floating")) {
|
||||
Botania.LOGGER.error("test");
|
||||
}
|
||||
int realIndex = index - (shapedY * (3 - shaped.getRecipeWidth()));
|
||||
NonNullList<Ingredient> list = recipe.getIngredients();
|
||||
ingredients.add(list.size() > realIndex ? list.get(realIndex) : Ingredient.EMPTY);
|
||||
}
|
||||
|
||||
|
||||
} else {
|
||||
NonNullList<Ingredient> list = recipe.getIngredients();
|
||||
ingredients.add(list.size() > index ? list.get(index) : Ingredient.EMPTY);
|
||||
@@ -92,7 +96,7 @@ public class MultiCraftingProcessor implements IComponentProcessor {
|
||||
return recipes.stream().map(IRecipe::getRecipeOutput).map(PatchouliAPI.instance::serializeItemStack).collect(Collectors.joining(","));
|
||||
}
|
||||
if(key.equals("shapeless")) {
|
||||
return Boolean.toString(shapeless);
|
||||
return shapeless ? I18n.format("patchouli.gui.lexicon.shapeless") : "";
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -16,7 +16,7 @@ import vazkii.botania.common.lib.LibMisc;
|
||||
|
||||
public class CompatLexiconEntry extends BasicLexiconEntry implements IAddonEntry {
|
||||
|
||||
final String mod;
|
||||
public final String mod;
|
||||
|
||||
public CompatLexiconEntry(String unlocalizedName, LexiconCategory category, String mod) {
|
||||
super(unlocalizedName, category);
|
||||
|
||||
@@ -19,8 +19,12 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.Items;
|
||||
import net.minecraft.item.crafting.IRecipe;
|
||||
import net.minecraft.tags.ItemTags;
|
||||
import net.minecraft.tags.Tag;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.registries.ForgeRegistries;
|
||||
import net.minecraftforge.registries.ForgeRegistry;
|
||||
import net.minecraftforge.registries.IForgeRegistryEntry;
|
||||
import net.minecraftforge.registries.RegistryManager;
|
||||
import vazkii.botania.api.BotaniaAPI;
|
||||
import vazkii.botania.api.brew.IBrewContainer;
|
||||
import vazkii.botania.api.lexicon.LexiconCategory;
|
||||
@@ -58,6 +62,7 @@ import java.io.File;
|
||||
import java.nio.file.Paths;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.function.Predicate;
|
||||
@@ -429,7 +434,7 @@ public final class LexiconData {
|
||||
gardenOfGlass.setPriority().setIcon(new ItemStack(ModItems.livingroot));
|
||||
}
|
||||
|
||||
if(Botania.thaumcraftLoaded)
|
||||
if(Botania.thaumcraftLoaded || true)
|
||||
new CompatLexiconEntry("wrap", categoryBasics, "Thaumcraft").setLexiconPages(new PageText("0")); // lel
|
||||
|
||||
// MANA ENTRIES
|
||||
@@ -556,10 +561,9 @@ public final class LexiconData {
|
||||
new PageText("3"), new PageCraftingRecipe("4", ModItems.redstoneRoot))
|
||||
.setIcon(ItemStack.EMPTY);
|
||||
|
||||
Item[] miniFlowers = new ItemTags.Wrapper(new ResourceLocation(LibMisc.MOD_ID, "mini_flowers")).getAllElements().toArray(new Item[0]);
|
||||
flowerShrinking = new BasicLexiconEntry(LibLexicon.FFLOWER_SHRINKING, categoryFunctionalFlowers);
|
||||
flowerShrinking.setPriority()
|
||||
.setLexiconPages(new PageText("0"), new PageManaInfusionRecipe("1", miniFlowers))
|
||||
.setLexiconPages(new PageText("0"), new PageManaInfusionRecipe("1", getSortedTag(new ResourceLocation(LibMisc.MOD_ID, "mini_flowers"))))
|
||||
.setIcon(new ItemStack(ModSubtiles.bellethornChibi));
|
||||
|
||||
flowerSpeed = new BasicLexiconEntry(LibLexicon.FFLOWER_SPEED, categoryFunctionalFlowers);
|
||||
@@ -731,8 +735,8 @@ public final class LexiconData {
|
||||
alchemy.setLexiconPages(new PageText("0"),
|
||||
new PageCraftingRecipe("1", ModBlocks.alchemyCatalyst.asItem()),
|
||||
new PageManaInfusionRecipe("2", filter, Items.LEATHER),
|
||||
new PageManaInfusionRecipe("3", filter, ItemTags.LOGS.getAllElements().toArray(new Item[0])),
|
||||
new PageManaInfusionRecipe("4", filter, ItemTags.SAPLINGS.getAllElements().toArray(new Item[0])),
|
||||
new PageManaInfusionRecipe("3", filter, getSortedTag(ItemTags.LOGS)),
|
||||
new PageManaInfusionRecipe("4", filter, getSortedTag(ItemTags.SAPLINGS)),
|
||||
new PageManaInfusionRecipe("5", filter, Items.GLOWSTONE_DUST),
|
||||
new PageManaInfusionRecipe("6", filter, Items.QUARTZ, ModItems.darkQuartz, ModItems.manaQuartz,
|
||||
ModItems.blazeQuartz, ModItems.lavenderQuartz, ModItems.redQuartz, ModItems.elfQuartz).setSkipRegistry(),
|
||||
@@ -788,7 +792,7 @@ public final class LexiconData {
|
||||
new PageManaInfusionRecipe("7", conjurationFilter, Items.NETHERRACK),
|
||||
new PageManaInfusionRecipe("8", conjurationFilter, Items.SOUL_SAND),
|
||||
new PageManaInfusionRecipe("9", conjurationFilter, Items.GRAVEL),
|
||||
new PageManaInfusionRecipe("10", conjurationFilter, ItemTags.LEAVES.getAllElements().toArray(new Item[0])),
|
||||
new PageManaInfusionRecipe("10", conjurationFilter, getSortedTag(ItemTags.LEAVES)),
|
||||
new PageManaInfusionRecipe("11", conjurationFilter, Items.GRASS)); //todos
|
||||
|
||||
spectralPlatform = new AlfheimLexiconEntry(LibLexicon.DEVICE_SPECTRAL_PLATFORM, categoryDevices);
|
||||
@@ -1468,6 +1472,23 @@ public final class LexiconData {
|
||||
Botania.LOGGER.info("Preexisting file {}, aborting lexicon dump", dir.getAbsolutePath());
|
||||
}
|
||||
}
|
||||
|
||||
private static <V extends IForgeRegistryEntry<V>> Comparator<V> registryOrderComparator() {
|
||||
return (V a, V b) -> {
|
||||
ForgeRegistry<V> registry = (ForgeRegistry<V>) RegistryManager.ACTIVE.getRegistry(a.getRegistryType());
|
||||
return Integer.compare(registry.getID(a), registry.getID(b));
|
||||
};
|
||||
}
|
||||
|
||||
private static Item[] getSortedTag(Tag<Item> tag) {
|
||||
Item[] items = tag.getAllElements().toArray(new Item[0]);
|
||||
Arrays.sort(items, registryOrderComparator());
|
||||
return items;
|
||||
}
|
||||
|
||||
private static Item[] getSortedTag(ResourceLocation tag) {
|
||||
return getSortedTag(new ItemTags.Wrapper(tag));
|
||||
}
|
||||
|
||||
private static Predicate<IRecipe<?>> GOG_RECIPE = recipe -> recipe.getId().getPath().contains("garden_of_glass");
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@ import vazkii.botania.api.BotaniaAPI;
|
||||
import vazkii.botania.api.lexicon.LexiconCategory;
|
||||
|
||||
public class RelicLexiconEntry extends BasicLexiconEntry {
|
||||
private final ResourceLocation advancement;
|
||||
public final ResourceLocation advancement;
|
||||
|
||||
public RelicLexiconEntry(String unlocalizedName, LexiconCategory category, ResourceLocation advancement) {
|
||||
super(unlocalizedName, category);
|
||||
|
||||
Reference in new issue
Block a user