diff --git a/build.gradle b/build.gradle index b6471087..c9bb6ce7 100644 --- a/build.gradle +++ b/build.gradle @@ -32,7 +32,7 @@ buildscript { } } dependencies { - classpath 'com.github.GTNewHorizons:ForgeGradle:1.2.5' + classpath 'com.github.GTNewHorizons:ForgeGradle:1.2.7' } } diff --git a/dependencies.gradle b/dependencies.gradle index 253b000a..f302dfea 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -10,6 +10,8 @@ dependencies { compileOnly("com.github.GTNewHorizons:ForgeMultipart:1.2.7:dev") { transitive = false } + compile("com.github.GTNewHorizons:CodeChickenLib:1.1.5.1:dev") + compileOnly("com.github.GTNewHorizons:NotEnoughItems:2.2.7-GTNH:dev") { transitive = false } diff --git a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java index 0a44d55d..3b08f1ff 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java +++ b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java @@ -13,6 +13,7 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; import WayofTime.alchemicalWizardry.api.BlockStack; +import WayofTime.alchemicalWizardry.client.nei.IMCForNEI; import WayofTime.alchemicalWizardry.common.summoning.meteor.Meteor; import WayofTime.alchemicalWizardry.api.alchemy.AlchemicalPotionCreationHandler; import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry; @@ -1050,6 +1051,10 @@ public class AlchemicalWizardry ItemIncense.registerIncenseRecipes(); GameRegistry.addRecipe(new ItemStack(ModBlocks.blockCrucible), "i i", "sis", " S ", 's', new ItemStack(Blocks.stone_slab), 'i', ironIngotStack, 'S', stoneStack); + + if (Loader.isModLoaded("NotEnoughItems")) { + IMCForNEI.IMCSender(); + } } @EventHandler diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/nei/IMCForNEI.java b/src/main/java/WayofTime/alchemicalWizardry/client/nei/IMCForNEI.java new file mode 100644 index 00000000..85f557f6 --- /dev/null +++ b/src/main/java/WayofTime/alchemicalWizardry/client/nei/IMCForNEI.java @@ -0,0 +1,22 @@ +package WayofTime.alchemicalWizardry.client.nei; + +import cpw.mods.fml.common.event.FMLInterModComms; +import net.minecraft.nbt.NBTTagCompound; + +public class IMCForNEI { + public static void IMCSender() { + setNBTAndSend("WayofTime.alchemicalWizardry.client.nei.NEIMeteorRecipeHandler", "AWWayofTime:masterStone", 130); + } + + private static void setNBTAndSend(String handlerName, String aBlock, int height) { + NBTTagCompound NBT = new NBTTagCompound(); + NBT.setString("handler", handlerName); + NBT.setString("modName", "Blood Magic"); + NBT.setString("modId", "AWWayofTime"); + NBT.setBoolean("modRequired", true); + NBT.setString("itemName", aBlock); + NBT.setInteger("handlerHeight", height); + NBT.setInteger("maxRecipesPerPage", 1); + FMLInterModComms.sendMessage("NotEnoughItems", "registerHandlerInfo", NBT); + } +} diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIConfig.java b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIConfig.java index 88f0bc5c..802a0f8e 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIConfig.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIConfig.java @@ -54,6 +54,8 @@ public class NEIConfig implements IConfigureNEI { API.registerUsageHandler(new NEIBloodOrbShapelessHandler()); API.registerRecipeHandler(new NEIBindingRitualHandler()); API.registerUsageHandler(new NEIBindingRitualHandler()); + API.registerRecipeHandler(new NEIMeteorRecipeHandler()); + API.registerUsageHandler(new NEIMeteorRecipeHandler()); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIMeteorRecipeHandler.java b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIMeteorRecipeHandler.java new file mode 100644 index 00000000..169cfb58 --- /dev/null +++ b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIMeteorRecipeHandler.java @@ -0,0 +1,180 @@ +package WayofTime.alchemicalWizardry.client.nei; + +import WayofTime.alchemicalWizardry.common.summoning.meteor.MeteorParadigm; +import WayofTime.alchemicalWizardry.common.summoning.meteor.MeteorParadigmComponent; +import WayofTime.alchemicalWizardry.common.summoning.meteor.MeteorRegistry; +import codechicken.lib.gui.GuiDraw; +import codechicken.nei.NEIServerUtils; +import codechicken.nei.PositionedStack; +import codechicken.nei.recipe.GuiRecipe; +import codechicken.nei.recipe.TemplateRecipeHandler; +import net.minecraft.client.Minecraft; +import net.minecraft.client.resources.I18n; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import org.lwjgl.opengl.GL11; + +import java.awt.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Comparator; +import java.util.List; +import java.util.stream.Collectors; + +public class NEIMeteorRecipeHandler extends TemplateRecipeHandler { + public class CachedMeteorRecipe extends CachedRecipe { + + private final List components; + private final List input = new ArrayList<>(); + private final List outputs = new ArrayList<>(); + private final int cost; + private final int radius; + + public CachedMeteorRecipe(MeteorParadigm meteor) { + this.components = meteor.componentList; + this.input.add(new PositionedStack(meteor.focusStack, 74, 4)); + int row = 0; + int col = 0; + for (MeteorParadigmComponent component : meteor.componentList) { + ItemStack stack = component.getValidBlockParadigm(); + List tooltips = new ArrayList<>(); + if (stack == null) { + stack = new ItemStack(Blocks.fire); + tooltips.add(String.format("no entries found for oredict \"%s\"", component.getOreDictName())); + } + tooltips.add(I18n.format("nei.recipe.meteor.chance", getFormattedChance(component.getChance()))); + this.outputs.add(new TooltipStack(stack, 3 + 18 * col, 37 + 18 * row, tooltips)); + col++; + if (col > 8) { + col = 0; + row++; + } + } + this.radius = meteor.radius; + this.cost = meteor.cost; + } + + @Override + public List getIngredients() { + return this.input; + } + + @Override + public PositionedStack getResult() { + return null; + } + + @Override + public List getOtherStacks() { + return this.outputs; + } + + public List getComponents() { + return components; + } + + public int getCost() { + return cost; + } + + public int getRadius() { + return radius; + } + } + + @Override + public void loadTransferRects() { + transferRects.add(new RecipeTransferRect(new Rectangle(75, 22, 15, 13), getOverlayIdentifier())); + } + + @Override + public void loadCraftingRecipes(String outputId, Object... results) { + if (outputId.equals(getOverlayIdentifier()) && getClass() == NEIMeteorRecipeHandler.class) { + for (MeteorParadigm meteor : getSortedMeteors()) { + arecipes.add(new CachedMeteorRecipe(meteor)); + } + } else { + super.loadCraftingRecipes(outputId, results); + } + } + + @Override + public void loadCraftingRecipes(ItemStack result) { + for (MeteorParadigm meteor : getSortedMeteors()) { + if (meteor.componentList.stream().anyMatch(m -> NEIServerUtils.areStacksSameTypeCrafting(result, m.getValidBlockParadigm()))) { + arecipes.add(new CachedMeteorRecipe(meteor)); + } + } + } + + @Override + public void loadUsageRecipes(ItemStack ingredient) { + for (MeteorParadigm meteor : getSortedMeteors()) { + if (NEIServerUtils.areStacksSameTypeCrafting(ingredient, meteor.focusStack)) { + arecipes.add(new CachedMeteorRecipe(meteor)); + } + } + } + + @Override + public String getGuiTexture() { + return new ResourceLocation("alchemicalwizardry", "gui/nei/meteor.png").toString(); + } + + @Override + public String getOverlayIdentifier() { + return "alchemicalwizardry.meteor"; + } + + @Override + public void drawExtras(int recipe) { + CachedMeteorRecipe meteorRecipe = (CachedMeteorRecipe) this.arecipes.get(recipe); + int cost = meteorRecipe.getCost(); + int radius = meteorRecipe.getRadius(); + Minecraft.getMinecraft().fontRenderer.drawString(I18n.format("nei.recipe.meteor.cost", String.format("%,d", cost)), 2, 96, 0x000000); + Minecraft.getMinecraft().fontRenderer.drawString(I18n.format("nei.recipe.meteor.radius", radius), 2, 107, 0x000000); + } + + @Override + public void drawBackground(int recipe) { + GL11.glColor4f(1, 1, 1, 1); + GuiDraw.changeTexture(getGuiTexture()); + GuiDraw.drawTexturedModalRect(0, 0, 5, 11, 172, 130); + } + + @Override + public List handleItemTooltip(GuiRecipe gui, ItemStack stack, List currenttip, int recipe) { + CachedMeteorRecipe meteorRecipe = (CachedMeteorRecipe) this.arecipes.get(recipe); + for (PositionedStack pStack : meteorRecipe.outputs) { + if (!gui.isMouseOver(pStack, recipe)) continue; + if (!(pStack instanceof TooltipStack)) break; + + TooltipStack tStack = (TooltipStack) pStack; + if (Arrays.stream(tStack.items).anyMatch(s -> NEIServerUtils.areStacksSameTypeCrafting(s, stack))) { + currenttip.addAll(tStack.getTooltips()); + break; + } + } + return currenttip; + } + + @Override + public String getRecipeName() { + return I18n.format("nei.recipe.meteor.category"); + } + + private List getSortedMeteors() { + return MeteorRegistry.paradigmList + .stream() + .sorted(Comparator.comparing(m -> m.cost)) + .collect(Collectors.toList()); + } + + private String getFormattedChance(int chance) { + float percentage = (float) chance / 10; + boolean isInteger = Float.compare(percentage, (float) (chance / 10)) == 0; + if (isInteger) return String.format("%,d", (int) percentage); + else return String.format("%,.1f", percentage); + } +} diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/nei/TooltipStack.java b/src/main/java/WayofTime/alchemicalWizardry/client/nei/TooltipStack.java new file mode 100644 index 00000000..810e49dc --- /dev/null +++ b/src/main/java/WayofTime/alchemicalWizardry/client/nei/TooltipStack.java @@ -0,0 +1,25 @@ +package WayofTime.alchemicalWizardry.client.nei; + +import codechicken.nei.PositionedStack; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +public class TooltipStack extends PositionedStack { + + private final List tooltips; + + public TooltipStack(Object object, int x, int y, boolean genPerms, List tooltips) { + super(object, x, y, genPerms); + this.tooltips = tooltips; + } + + public TooltipStack(Object object, int x, int y, List tooltips) { + this(object, x, y, true, tooltips); + } + + public List getTooltips() { + return tooltips; + } +} diff --git a/src/main/resources/assets/alchemicalwizardry/gui/nei/meteor.png b/src/main/resources/assets/alchemicalwizardry/gui/nei/meteor.png new file mode 100644 index 00000000..b0379811 Binary files /dev/null and b/src/main/resources/assets/alchemicalwizardry/gui/nei/meteor.png differ diff --git a/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang b/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang index d0eef760..8b18bbe3 100644 --- a/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang +++ b/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang @@ -260,6 +260,10 @@ text.recipe.altar=Blood Altar text.recipe.altar.tier=Tier: %s text.recipe.altar.bloodRequired=LP: %s text.recipe.shapedOrb=Shaped Orb Recipe +nei.recipe.meteor.category=Meteor Ritual +nei.recipe.meteor.cost=Cost: %s LP +nei.recipe.meteor.radius=Radius: %s +nei.recipe.meteor.chance=Chance: %s%% #Entities entity.AWWayofTime.EarthElemental.name=Earth Elemental