From 38d76528dcdf000c630590fe7b6f473cdcff5497 Mon Sep 17 00:00:00 2001 From: TBPig <147127248+TBPig@users.noreply.github.com> Date: Wed, 17 Dec 2025 09:50:02 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9readme=EF=BC=9B=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0=E6=9C=AB=E5=BD=B1=E9=83=A8=E4=BB=B6=E8=8E=B7=E5=BE=97?= =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=9B=E6=B7=BB=E5=8A=A0=E7=81=B5=E5=AA=92?= =?UTF-8?q?=E9=83=A8=E4=BB=B6jei=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 34 +++++++++++------ README_en.md | 34 +++++++++++------ .../anvilcraft_pigsplus/lang/en_ud.json | 1 + .../anvilcraft_pigsplus/lang/en_us.json | 1 + .../recipe/time_warp/ender_component.json | 3 -- .../pigsplus/data/lang/JeiLang.java | 13 +++++++ .../pigsplus/data/lang/LangHandler.java | 1 + .../integration/jei/AddonJeiPlugin.java | 26 +++++++++++++ .../integration/jei/package-info.java | 3 ++ .../BetterEndPortalConversionRecipe.java | 38 +++++++++++++++++++ .../integration/jei/recipe/package-info.java | 3 ++ .../pigsplus/mixin/EntityMixin.java | 18 ++++----- .../util/EnderComponentConversionUtil.java | 5 +++ .../entries/smithing/pigs_materials.json | 2 +- .../anvilcraft_pigsplus/lang/zh_cn.json | 1 + 15 files changed, 148 insertions(+), 35 deletions(-) create mode 100644 src/main/java/dev/anvilcraft/pigsplus/data/lang/JeiLang.java create mode 100644 src/main/java/dev/anvilcraft/pigsplus/integration/jei/AddonJeiPlugin.java create mode 100644 src/main/java/dev/anvilcraft/pigsplus/integration/jei/package-info.java create mode 100644 src/main/java/dev/anvilcraft/pigsplus/integration/jei/recipe/BetterEndPortalConversionRecipe.java create mode 100644 src/main/java/dev/anvilcraft/pigsplus/integration/jei/recipe/package-info.java create mode 100644 src/main/java/dev/anvilcraft/pigsplus/util/EnderComponentConversionUtil.java diff --git a/README.md b/README.md index 34d74104..b33aa16c 100644 --- a/README.md +++ b/README.md @@ -3,14 +3,18 @@ [![CurseForge downloads](http://cf.way2muchnoise.eu/full_1380275_downloads.svg)](https://www.curseforge.com/minecraft/mc-mods/anvilcraft-pigsplus) [![Modrinth downloads](https://img.shields.io/modrinth/dt/nGMOJKQp?color=00AF5C&label=Modrinth%20downloads&logo=modrinth)](https://modrinth.com/mod/nGMOJKQp) [![GitHub downloads](https://img.shields.io/github/downloads/TBPig/AnvilCraft-PigsPlus/total?label=Github%20downloads&logo=github)](https://github.com/TBPig/AnvilCraft-PigsPlus/releases) -> 欢迎来到模组《铁砧工艺：猪+》的页面！模组是铁砧工艺的附属，主要内容包括有利于生产的机器： - -* 虚弱树脂块：自带虚弱效果的树脂块 -* 连锁锻造台：放入工具升级路径上的所有模板材料，一次性升至满级 -* 自动皇家锻造台：效果如其名 -* 混沌粗矿：合成后可以通过矿脉涌泉生产，高温熔炼随机生产8种金属 -* 附魔发电机：根据附魔发电 -* 电力附魔台：消耗电力附魔 +> 欢迎来到模组《铁砧工艺：猪+》的页面！模组是铁砧工艺的附属，主要内容包括： +* 自动化机器：自动皇家锻造台、自动皇家砂轮、自动珠宝加工台和电力附魔台 +* 便捷道具： + * 虚弱树脂块(自带虚弱效果) + * 混沌粗矿(高温熔炼随机生产8种金属) + * 连锁锻造台(将工具一次性升至满级) +* 电网改革： + * 附魔发电机：根据附魔发电 + * 可调式能量转换器：将kW与FE双向转换 +* 幽匿技术 + * 回响母岩：生产幽匿方块与回响碎片 + * 幽匿萃取体：获取大量经验 ## 使用许可 @@ -35,12 +39,20 @@ 🤔
87423598 + + +
+ WhereisFff +
+ 💻
+ 347845823 +
Abslb
- 🎨
+ 🎨
35466261... @@ -48,7 +60,7 @@
CrazyDataVolt
- 🎨
+ 🎨
336411075 @@ -56,7 +68,7 @@
fnshwj
- 🎨
+ 🎨
diff --git a/README_en.md b/README_en.md index f498632b..f75647c0 100644 --- a/README_en.md +++ b/README_en.md @@ -3,14 +3,18 @@ [![CurseForge downloads](http://cf.way2muchnoise.eu/full_1380275_downloads.svg)](https://www.curseforge.com/minecraft/mc-mods/anvilcraft-pigsplus) [![Modrinth downloads](https://img.shields.io/modrinth/dt/nGMOJKQp?color=00AF5C&label=Modrinth%20downloads&logo=modrinth)](https://modrinth.com/mod/nGMOJKQp) [![GitHub downloads](https://img.shields.io/github/downloads/TBPig/AnvilCraft-PigsPlus/total?label=Github%20downloads&logo=github)](https://github.com/TBPig/AnvilCraft-PigsPlus/releases) -> Welcome to the page for the mod "AnvilCraft: PigsPlus"! This mod is an addon for AnvilCraft, with main content including production-friendly machines: - -- Weak Resin Block: Resin block with built-in Weakness effect -- Chain Forge: Place all templates and materials in the tool upgrade path to upgrade to maximum level in one go -- Automatic Royal Forge: Effect is as the name suggests -- Chaotic Raw Ore: After crafting, it can be produced through ore vein springs, and high-temperature smelting randomly produces 8 types of metals -- Enchantment Generator: Generates power based on enchantments -- Electric Enchantment Table: Consumes electricity for enchanting +> Welcome to the page for the mod "AnvilCraft: PigsPlus"! This mod is an addon for AnvilCraft, with main content including: +* Automated Machines: Automatic Royal Smithing Table, Automatic Royal Grindstone, Automatic Jewel Crafting Table, and Electric Enchanting Table +* Convenient Items: + * Weak Resin Block (Built-in Weakness effect) + * Chaotic Raw Ore (Randomly produces 8 types of metals when smelted at high temperature) + * Chain Smithing Table (Upgrades tools to maximum level in one go) +* Power Grid Reform: + * Enchantment Generator: Generates power based on enchantments + * Adjustable Power Converter: Bidirectional conversion between kW and FE +* Sculk Technology: + * Echo Cluster: Produces sculk blocks and echo shards + * Sculk Extractor: Obtain large amounts of experience ## Usage License @@ -35,12 +39,20 @@ 🤔
87423598 + + +
+ WhereisFff +
+ 💻
+ 347845823 +
Abslb
- 🎨
+ 🎨
35466261... @@ -48,7 +60,7 @@
CrazyDataVolt
- 🎨
+ 🎨
336411075 @@ -56,7 +68,7 @@
fnshwj
- 🎨
+ 🎨
diff --git a/src/generated/resources/assets/anvilcraft_pigsplus/lang/en_ud.json b/src/generated/resources/assets/anvilcraft_pigsplus/lang/en_ud.json index e4e981b8..432ffe10 100644 --- a/src/generated/resources/assets/anvilcraft_pigsplus/lang/en_ud.json +++ b/src/generated/resources/assets/anvilcraft_pigsplus/lang/en_ud.json @@ -56,6 +56,7 @@ "item.anvilcraft_pigsplus.karakuri_component": "ʇuǝuodɯoƆ ıɹnʞɐɹɐʞ", "item.anvilcraft_pigsplus.spiritual_component": "ʇuǝuodɯoƆ ןɐnʇıɹıdS", "itemGroup.anvilcraft_pigsplus.addon_items": "snןԀ sbıԀ :ʇɟɐɹƆןıʌuⱯ", + "jei.anvilcraft.pigsplus.info.ender_component": "˙ʇuǝuodɯoƆ ɯnıpǝW ǝuo ʇsoɯ ʇɐ ǝʇɐɹǝuǝb oʇ ǝɔuɐɥɔ %0ᄅ ɐ sǝpıʌoɹd ʇuǝɯʇuɐɥɔuǝ ɥɔɐǝ 'pǝʎoɹʇsǝp sı ʇuǝuodɯoƆ pǝʇuɐɥɔuƎ uɐ uǝɥM", "tooltip.anvilcraft.pigsplus.enchanted_generator.max_power_value": "Mʞ %d :uoıʇdɯnsuoɔ ɹǝʍod xɐW", "tooltip.anvilcraft.pigsplus.enchanted_generator.power_rate": "%s :ǝʇɐɹ uoıʇdɯnsuoɔ ɹǝʍoԀ", "tooltip.anvilcraft.pigsplus.enchanted_generator.time": "%s :ǝɯıʇ buıuıɐɯǝᴚ" diff --git a/src/generated/resources/assets/anvilcraft_pigsplus/lang/en_us.json b/src/generated/resources/assets/anvilcraft_pigsplus/lang/en_us.json index ab298bae..074adc3f 100644 --- a/src/generated/resources/assets/anvilcraft_pigsplus/lang/en_us.json +++ b/src/generated/resources/assets/anvilcraft_pigsplus/lang/en_us.json @@ -56,6 +56,7 @@ "item.anvilcraft_pigsplus.karakuri_component": "Karakuri Component", "item.anvilcraft_pigsplus.spiritual_component": "Spiritual Component", "itemGroup.anvilcraft_pigsplus.addon_items": "AnvilCraft: Pigs Plus", + "jei.anvilcraft.pigsplus.info.ender_component": "When an Enchanted Component is destroyed, each enchantment provides a 20% chance to generate at most one Medium Component.", "tooltip.anvilcraft.pigsplus.enchanted_generator.max_power_value": "Max power consumption: %d kW", "tooltip.anvilcraft.pigsplus.enchanted_generator.power_rate": "Power consumption rate: %s", "tooltip.anvilcraft.pigsplus.enchanted_generator.time": "Remaining time: %s" diff --git a/src/generated/resources/data/anvilcraft/recipe/time_warp/ender_component.json b/src/generated/resources/data/anvilcraft/recipe/time_warp/ender_component.json index 8f7669f4..ea6e7436 100644 --- a/src/generated/resources/data/anvilcraft/recipe/time_warp/ender_component.json +++ b/src/generated/resources/data/anvilcraft/recipe/time_warp/ender_component.json @@ -20,9 +20,6 @@ "p": 0.2 }, "id": "anvilcraft_pigsplus:ender_component" - }, - { - "id": "anvilcraft:levitation_powder" } ] } \ No newline at end of file diff --git a/src/main/java/dev/anvilcraft/pigsplus/data/lang/JeiLang.java b/src/main/java/dev/anvilcraft/pigsplus/data/lang/JeiLang.java new file mode 100644 index 00000000..4dad721c --- /dev/null +++ b/src/main/java/dev/anvilcraft/pigsplus/data/lang/JeiLang.java @@ -0,0 +1,13 @@ +package dev.anvilcraft.pigsplus.data.lang; + +import com.tterrag.registrate.providers.RegistrateLangProvider; + +public class JeiLang { + @SuppressWarnings("checkstyle:LineLength") + public static void init(RegistrateLangProvider provider) { + provider.add( + "jei.anvilcraft.pigsplus.info.ender_component", + "When an Enchanted Component is destroyed, each enchantment provides a 20% chance to generate at most one Medium Component." + ); + } +} diff --git a/src/main/java/dev/anvilcraft/pigsplus/data/lang/LangHandler.java b/src/main/java/dev/anvilcraft/pigsplus/data/lang/LangHandler.java index 63803730..d4e674ea 100644 --- a/src/main/java/dev/anvilcraft/pigsplus/data/lang/LangHandler.java +++ b/src/main/java/dev/anvilcraft/pigsplus/data/lang/LangHandler.java @@ -12,6 +12,7 @@ public class LangHandler { */ public static void init(RegistrateLangProvider provider) { ConfigData.readConfigClass(provider, AddonServerConfig.class); + JeiLang.init(provider); provider.add( "block.anvilcraft_pigsplus.enchanted_generator.placement_too_close_to_another", diff --git a/src/main/java/dev/anvilcraft/pigsplus/integration/jei/AddonJeiPlugin.java b/src/main/java/dev/anvilcraft/pigsplus/integration/jei/AddonJeiPlugin.java new file mode 100644 index 00000000..9ad0b037 --- /dev/null +++ b/src/main/java/dev/anvilcraft/pigsplus/integration/jei/AddonJeiPlugin.java @@ -0,0 +1,26 @@ +package dev.anvilcraft.pigsplus.integration.jei; + +import dev.anvilcraft.pigsplus.AnvilCraftPigsPlus; +import dev.anvilcraft.pigsplus.init.AddonItems; +import mezz.jei.api.IModPlugin; +import mezz.jei.api.JeiPlugin; +import mezz.jei.api.registration.IRecipeRegistration; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; + +@JeiPlugin +public class AddonJeiPlugin implements IModPlugin { + + @Override + public ResourceLocation getPluginUid() { + return AnvilCraftPigsPlus.of("jei_plugin"); + } + + @Override + public void registerRecipes(IRecipeRegistration registration) { + registration.addItemStackInfo( + AddonItems.SPIRITUAL_COMPONENT.asStack(), + Component.translatable("jei.anvilcraft.pigsplus.info.ender_component") + ); + } +} diff --git a/src/main/java/dev/anvilcraft/pigsplus/integration/jei/package-info.java b/src/main/java/dev/anvilcraft/pigsplus/integration/jei/package-info.java new file mode 100644 index 00000000..522c9703 --- /dev/null +++ b/src/main/java/dev/anvilcraft/pigsplus/integration/jei/package-info.java @@ -0,0 +1,3 @@ +@net.minecraft.MethodsReturnNonnullByDefault +@javax.annotation.ParametersAreNonnullByDefault +package dev.anvilcraft.pigsplus.integration.jei; \ No newline at end of file diff --git a/src/main/java/dev/anvilcraft/pigsplus/integration/jei/recipe/BetterEndPortalConversionRecipe.java b/src/main/java/dev/anvilcraft/pigsplus/integration/jei/recipe/BetterEndPortalConversionRecipe.java new file mode 100644 index 00000000..d4e36be1 --- /dev/null +++ b/src/main/java/dev/anvilcraft/pigsplus/integration/jei/recipe/BetterEndPortalConversionRecipe.java @@ -0,0 +1,38 @@ +package dev.anvilcraft.pigsplus.integration.jei.recipe; + +import com.google.common.collect.ImmutableList; +import dev.anvilcraft.lib.recipe.component.ChanceItemStack; +import dev.anvilcraft.lib.recipe.component.ItemIngredientPredicate; +import dev.anvilcraft.pigsplus.init.AddonItems; +import dev.dubhe.anvilcraft.init.block.ModBlocks; +import dev.dubhe.anvilcraft.init.item.ModItems; +import dev.dubhe.anvilcraft.integration.jei.recipe.EndPortalConversionRecipe; +import net.minecraft.world.item.Item; + +import java.util.List; + +import static dev.anvilcraft.pigsplus.util.EnderComponentConversionUtil.ConversionChance; + +public class BetterEndPortalConversionRecipe extends EndPortalConversionRecipe { + // TODO:之后自己写个物品落入传送门时的逻辑 + public final List ingredients; + public final List results; + + public BetterEndPortalConversionRecipe(Item itemInput) { + super(ModBlocks.ROYAL_ANVIL.get(), 0.5f); // 随便填的 + this.ingredients = ImmutableList.of(ItemIngredientPredicate.Builder.item().of(itemInput).build()); + ImmutableList.Builder builder = ImmutableList.builder(); + builder.add(ChanceItemStack.of(AddonItems.ENDER_COMPONENT.asStack(), ConversionChance)); + + builder.add(ChanceItemStack.of(ModItems.LEVITATION_POWDER.asStack(), 1.0f - ConversionChance)); + + this.results = builder.build(); + + } + + public static ImmutableList getAllRecipes() { + ImmutableList.Builder builder = ImmutableList.builder(); + builder.add(new BetterEndPortalConversionRecipe(AddonItems.KARAKURI_COMPONENT.asItem())); + return builder.build(); + } +} diff --git a/src/main/java/dev/anvilcraft/pigsplus/integration/jei/recipe/package-info.java b/src/main/java/dev/anvilcraft/pigsplus/integration/jei/recipe/package-info.java new file mode 100644 index 00000000..6b55f66a --- /dev/null +++ b/src/main/java/dev/anvilcraft/pigsplus/integration/jei/recipe/package-info.java @@ -0,0 +1,3 @@ +@net.minecraft.MethodsReturnNonnullByDefault +@javax.annotation.ParametersAreNonnullByDefault +package dev.anvilcraft.pigsplus.integration.jei.recipe; \ No newline at end of file diff --git a/src/main/java/dev/anvilcraft/pigsplus/mixin/EntityMixin.java b/src/main/java/dev/anvilcraft/pigsplus/mixin/EntityMixin.java index 1cbb6c9e..822e6b92 100644 --- a/src/main/java/dev/anvilcraft/pigsplus/mixin/EntityMixin.java +++ b/src/main/java/dev/anvilcraft/pigsplus/mixin/EntityMixin.java @@ -1,6 +1,7 @@ package dev.anvilcraft.pigsplus.mixin; import dev.anvilcraft.pigsplus.init.AddonItems; +import dev.anvilcraft.pigsplus.util.MathUtil; import dev.dubhe.anvilcraft.api.injection.entity.IEntityExtension; import dev.dubhe.anvilcraft.init.item.ModItems; import net.minecraft.world.entity.Entity; @@ -13,6 +14,8 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import static dev.anvilcraft.pigsplus.util.EnderComponentConversionUtil.ConversionChance; + @Mixin(Entity.class) public abstract class EntityMixin implements IEntityExtension { @@ -29,15 +32,11 @@ private void handlePortal(CallbackInfo ci) { if ((Object) this instanceof ItemEntity itemEntity) { if (itemEntity.getItem().is(AddonItems.KARAKURI_COMPONENT)) { int count = itemEntity.getItem().getCount(); - int spiritualCount = 0; - int levitationCount = 0; - // 循环使用随机数判断漂浮粉和灵媒部件的数量 - for (int i = 0; i < count; i++) { - if (this.level.random.nextDouble() < 0.2) spiritualCount++; - else levitationCount++; - } // 三种情况 ↓ + int spiritualCount = MathUtil.getCount(ConversionChance, count, level); + int levitationCount = count - spiritualCount; + // 三种情况 ↓ if (spiritualCount == count) { // 都转化成灵媒部件，如一两个机巧部件，又或者……欧洲人打过来了？ - itemEntity.setItem(new ItemStack(AddonItems.SPIRITUAL_COMPONENT.get(), count)); + itemEntity.setItem(new ItemStack(AddonItems.ENDER_COMPONENT.get(), count)); } else if (levitationCount == count) { // 都转化成漂浮粉，如一两个机巧部件，又或者……酋长我们回非洲吧（ itemEntity.setItem(new ItemStack(ModItems.LEVITATION_POWDER.get(), count)); } else { // 原物品堆转化成漂浮粉，原位置生成新的灵媒核心物品堆 @@ -47,9 +46,10 @@ private void handlePortal(CallbackInfo ci) { itemEntity.getX(), itemEntity.getY(), itemEntity.getZ(), - new ItemStack(AddonItems.SPIRITUAL_COMPONENT.get(), spiritualCount) + new ItemStack(AddonItems.ENDER_COMPONENT.get(), spiritualCount) ); // 让新物品堆和原来的动量一样 newEntity.setDeltaMovement(itemEntity.getDeltaMovement()); + newEntity.setDefaultPickUpDelay(); this.level.addFreshEntity(newEntity); } } diff --git a/src/main/java/dev/anvilcraft/pigsplus/util/EnderComponentConversionUtil.java b/src/main/java/dev/anvilcraft/pigsplus/util/EnderComponentConversionUtil.java new file mode 100644 index 00000000..3d36187b --- /dev/null +++ b/src/main/java/dev/anvilcraft/pigsplus/util/EnderComponentConversionUtil.java @@ -0,0 +1,5 @@ +package dev.anvilcraft.pigsplus.util; + +public class EnderComponentConversionUtil { + public static final float ConversionChance = 0.2f; +} diff --git a/src/main/resources/assets/anvilcraft/patchouli_books/guide/en_us/entries/smithing/pigs_materials.json b/src/main/resources/assets/anvilcraft/patchouli_books/guide/en_us/entries/smithing/pigs_materials.json index ac7fd8b4..27d52322 100644 --- a/src/main/resources/assets/anvilcraft/patchouli_books/guide/en_us/entries/smithing/pigs_materials.json +++ b/src/main/resources/assets/anvilcraft/patchouli_books/guide/en_us/entries/smithing/pigs_materials.json @@ -20,7 +20,7 @@ { "type": "anvilcraft:time_warp", "recipe": "anvilcraft:time_warp/ender_component", - "text": "只有20%%成功合成率 $(p)蕴涵传送之力" + "text": "只有20%%成功合成率 $(li)将$(item)机巧部件$()丢入末地传送门，同样有20%%概率获得 $(p)$(#888888)蕴涵传送之力$()" } ] } \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft_pigsplus/lang/zh_cn.json b/src/main/resources/assets/anvilcraft_pigsplus/lang/zh_cn.json index 1277039e..00333938 100644 --- a/src/main/resources/assets/anvilcraft_pigsplus/lang/zh_cn.json +++ b/src/main/resources/assets/anvilcraft_pigsplus/lang/zh_cn.json @@ -56,6 +56,7 @@ "item.anvilcraft_pigsplus.karakuri_component": "机巧部件", "item.anvilcraft_pigsplus.spiritual_component": "灵媒部件", "itemGroup.anvilcraft_pigsplus.addon_items": "铁砧工艺：猪+", + "jei.anvilcraft.pigsplus.info.ender_component": "携带附魔的机巧部件被摧毁时，每条附魔提供20%的概率，生成最多一个灵媒部件", "tooltip.anvilcraft.pigsplus.enchanted_generator.max_power_value": "耗电上限: %d kW", "tooltip.anvilcraft.pigsplus.enchanted_generator.power_rate": "耗能率: %s", "tooltip.anvilcraft.pigsplus.enchanted_generator.time": "剩余时间: %s" From 2c142d7142d5590e6a459e17ec7bddcc1c84e4ca Mon Sep 17 00:00:00 2001 From: TBPig <147127248+TBPig@users.noreply.github.com> Date: Wed, 17 Dec 2025 12:04:00 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=94=89=E8=AE=B8?= =?UTF-8?q?=E5=8F=AF=E8=AF=81=E6=8F=8F=E8=BF=B0=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ASSETS_LICENSE | 1 + LICENSE | 857 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 858 insertions(+) create mode 100644 ASSETS_LICENSE create mode 100644 LICENSE diff --git a/ASSETS_LICENSE b/ASSETS_LICENSE new file mode 100644 index 00000000..4a703d83 --- /dev/null +++ b/ASSETS_LICENSE @@ -0,0 +1 @@ +All rights reserved unless explicitly stated. diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..713b3ab4 --- /dev/null +++ b/LICENSE @@ -0,0 +1,857 @@ +Copyright (c) 2025 TBpig + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Lesser General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU Lesser General Public License +and a copy of GNU General Public License along with this program. If not, see + + + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. + + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + {one line to give the program's name and a brief idea of what it does.} + Copyright (C) {year} {name of author} + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + {project} Copyright (C) {year} {fullname} + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. + From 4344449483903df392c09c68c95380cd015d5a78 Mon Sep 17 00:00:00 2001 From: TBPig <147127248+TBPig@users.noreply.github.com> Date: Wed, 17 Dec 2025 18:37:43 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0JEI=E5=AF=B9=E6=9C=AB?= =?UTF-8?q?=E5=BD=B1=E9=83=A8=E4=BB=B6=E7=9A=84=E8=8E=B7=E5=8F=96=E6=8F=8F?= =?UTF-8?q?=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anvilcraft_pigsplus/lang/en_ud.json | 3 +- .../anvilcraft_pigsplus/lang/en_us.json | 3 +- .../recipe/time_warp/ender_component.json | 3 ++ .../pigsplus/data/lang/JeiLang.java | 9 ++++- .../pigsplus/data/recipe/RecipeHandler.java | 2 + .../integration/jei/AddonJeiPlugin.java | 5 +++ .../BetterEndPortalConversionRecipe.java | 38 ------------------- .../anvilcraft_pigsplus/lang/zh_cn.json | 3 +- 8 files changed, 24 insertions(+), 42 deletions(-) delete mode 100644 src/main/java/dev/anvilcraft/pigsplus/integration/jei/recipe/BetterEndPortalConversionRecipe.java diff --git a/src/generated/resources/assets/anvilcraft_pigsplus/lang/en_ud.json b/src/generated/resources/assets/anvilcraft_pigsplus/lang/en_ud.json index 432ffe10..817a26d7 100644 --- a/src/generated/resources/assets/anvilcraft_pigsplus/lang/en_ud.json +++ b/src/generated/resources/assets/anvilcraft_pigsplus/lang/en_ud.json @@ -56,7 +56,8 @@ "item.anvilcraft_pigsplus.karakuri_component": "ʇuǝuodɯoƆ ıɹnʞɐɹɐʞ", "item.anvilcraft_pigsplus.spiritual_component": "ʇuǝuodɯoƆ ןɐnʇıɹıdS", "itemGroup.anvilcraft_pigsplus.addon_items": "snןԀ sbıԀ :ʇɟɐɹƆןıʌuⱯ", - "jei.anvilcraft.pigsplus.info.ender_component": "˙ʇuǝuodɯoƆ ɯnıpǝW ǝuo ʇsoɯ ʇɐ ǝʇɐɹǝuǝb oʇ ǝɔuɐɥɔ %0ᄅ ɐ sǝpıʌoɹd ʇuǝɯʇuɐɥɔuǝ ɥɔɐǝ 'pǝʎoɹʇsǝp sı ʇuǝuodɯoƆ pǝʇuɐɥɔuƎ uɐ uǝɥM", + "jei.anvilcraft.pigsplus.info.ender_component": "˙ʇuǝuodɯoƆ ɹǝpuƎ ɐ uıɐʇqo oʇ ǝɔuɐɥɔ %0ᄅ ɐ sı ǝɹǝɥʇ 'ןɐʇɹod puƎ ǝɥʇ oʇuı ʇuǝuodɯoƆ ıɹnʞɐɹɐʞ ɐ ʍoɹɥ⟘", + "jei.anvilcraft.pigsplus.info.spiritual_component": "˙ʇuǝuodɯoƆ ɯnıpǝW ǝuo ʇsoɯ ʇɐ ǝʇɐɹǝuǝb oʇ ǝɔuɐɥɔ %0ᄅ ɐ sǝpıʌoɹd ʇuǝɯʇuɐɥɔuǝ ɥɔɐǝ 'pǝʎoɹʇsǝp sı ʇuǝuodɯoƆ ıɹnʞɐɹɐʞ ɐ uǝɥM", "tooltip.anvilcraft.pigsplus.enchanted_generator.max_power_value": "Mʞ %d :uoıʇdɯnsuoɔ ɹǝʍod xɐW", "tooltip.anvilcraft.pigsplus.enchanted_generator.power_rate": "%s :ǝʇɐɹ uoıʇdɯnsuoɔ ɹǝʍoԀ", "tooltip.anvilcraft.pigsplus.enchanted_generator.time": "%s :ǝɯıʇ buıuıɐɯǝᴚ" diff --git a/src/generated/resources/assets/anvilcraft_pigsplus/lang/en_us.json b/src/generated/resources/assets/anvilcraft_pigsplus/lang/en_us.json index 074adc3f..cbadbde5 100644 --- a/src/generated/resources/assets/anvilcraft_pigsplus/lang/en_us.json +++ b/src/generated/resources/assets/anvilcraft_pigsplus/lang/en_us.json @@ -56,7 +56,8 @@ "item.anvilcraft_pigsplus.karakuri_component": "Karakuri Component", "item.anvilcraft_pigsplus.spiritual_component": "Spiritual Component", "itemGroup.anvilcraft_pigsplus.addon_items": "AnvilCraft: Pigs Plus", - "jei.anvilcraft.pigsplus.info.ender_component": "When an Enchanted Component is destroyed, each enchantment provides a 20% chance to generate at most one Medium Component.", + "jei.anvilcraft.pigsplus.info.ender_component": "Throw a Karakuri Component into the End portal, there is a 20% chance to obtain a Ender Component.", + "jei.anvilcraft.pigsplus.info.spiritual_component": "When a Karakuri Component is destroyed, each enchantment provides a 20% chance to generate at most one Medium Component.", "tooltip.anvilcraft.pigsplus.enchanted_generator.max_power_value": "Max power consumption: %d kW", "tooltip.anvilcraft.pigsplus.enchanted_generator.power_rate": "Power consumption rate: %s", "tooltip.anvilcraft.pigsplus.enchanted_generator.time": "Remaining time: %s" diff --git a/src/generated/resources/data/anvilcraft/recipe/time_warp/ender_component.json b/src/generated/resources/data/anvilcraft/recipe/time_warp/ender_component.json index ea6e7436..8f7669f4 100644 --- a/src/generated/resources/data/anvilcraft/recipe/time_warp/ender_component.json +++ b/src/generated/resources/data/anvilcraft/recipe/time_warp/ender_component.json @@ -20,6 +20,9 @@ "p": 0.2 }, "id": "anvilcraft_pigsplus:ender_component" + }, + { + "id": "anvilcraft:levitation_powder" } ] } \ No newline at end of file diff --git a/src/main/java/dev/anvilcraft/pigsplus/data/lang/JeiLang.java b/src/main/java/dev/anvilcraft/pigsplus/data/lang/JeiLang.java index 4dad721c..7f1db96b 100644 --- a/src/main/java/dev/anvilcraft/pigsplus/data/lang/JeiLang.java +++ b/src/main/java/dev/anvilcraft/pigsplus/data/lang/JeiLang.java @@ -5,9 +5,16 @@ public class JeiLang { @SuppressWarnings("checkstyle:LineLength") public static void init(RegistrateLangProvider provider) { + provider.add( + "jei.anvilcraft.pigsplus.info.spiritual_component", + "When a Karakuri Component is destroyed, each enchantment provides a 20% chance to generate at most one Medium Component." + ); + provider.add( "jei.anvilcraft.pigsplus.info.ender_component", - "When an Enchanted Component is destroyed, each enchantment provides a 20% chance to generate at most one Medium Component." + "Throw a Karakuri Component into the End portal, there is a 20% chance to obtain a Ender Component." ); + + } } diff --git a/src/main/java/dev/anvilcraft/pigsplus/data/recipe/RecipeHandler.java b/src/main/java/dev/anvilcraft/pigsplus/data/recipe/RecipeHandler.java index da710342..94308019 100644 --- a/src/main/java/dev/anvilcraft/pigsplus/data/recipe/RecipeHandler.java +++ b/src/main/java/dev/anvilcraft/pigsplus/data/recipe/RecipeHandler.java @@ -3,6 +3,7 @@ import com.tterrag.registrate.providers.RegistrateRecipeProvider; import dev.anvilcraft.pigsplus.init.AddonBlocks; import dev.anvilcraft.pigsplus.init.AddonItems; +import dev.dubhe.anvilcraft.init.item.ModItems; import dev.dubhe.anvilcraft.recipe.anvil.wrap.ItemInjectRecipe; import dev.dubhe.anvilcraft.recipe.anvil.wrap.TimeWarpRecipe; import dev.dubhe.anvilcraft.recipe.mineral.MineralFountainRecipe; @@ -33,6 +34,7 @@ public static void init(RegistrateRecipeProvider provider) { .requires(Items.ENDER_PEARL) .requires(Items.END_STONE,3) .result(AddonItems.ENDER_COMPONENT,0.2f) + .result(ModItems.LEVITATION_POWDER) .save(provider); } } diff --git a/src/main/java/dev/anvilcraft/pigsplus/integration/jei/AddonJeiPlugin.java b/src/main/java/dev/anvilcraft/pigsplus/integration/jei/AddonJeiPlugin.java index 9ad0b037..3d0d365e 100644 --- a/src/main/java/dev/anvilcraft/pigsplus/integration/jei/AddonJeiPlugin.java +++ b/src/main/java/dev/anvilcraft/pigsplus/integration/jei/AddonJeiPlugin.java @@ -20,6 +20,11 @@ public ResourceLocation getPluginUid() { public void registerRecipes(IRecipeRegistration registration) { registration.addItemStackInfo( AddonItems.SPIRITUAL_COMPONENT.asStack(), + Component.translatable("jei.anvilcraft.pigsplus.info.spiritual_component") + ); + + registration.addItemStackInfo( + AddonItems.ENDER_COMPONENT.asStack(), Component.translatable("jei.anvilcraft.pigsplus.info.ender_component") ); } diff --git a/src/main/java/dev/anvilcraft/pigsplus/integration/jei/recipe/BetterEndPortalConversionRecipe.java b/src/main/java/dev/anvilcraft/pigsplus/integration/jei/recipe/BetterEndPortalConversionRecipe.java deleted file mode 100644 index d4e36be1..00000000 --- a/src/main/java/dev/anvilcraft/pigsplus/integration/jei/recipe/BetterEndPortalConversionRecipe.java +++ /dev/null @@ -1,38 +0,0 @@ -package dev.anvilcraft.pigsplus.integration.jei.recipe; - -import com.google.common.collect.ImmutableList; -import dev.anvilcraft.lib.recipe.component.ChanceItemStack; -import dev.anvilcraft.lib.recipe.component.ItemIngredientPredicate; -import dev.anvilcraft.pigsplus.init.AddonItems; -import dev.dubhe.anvilcraft.init.block.ModBlocks; -import dev.dubhe.anvilcraft.init.item.ModItems; -import dev.dubhe.anvilcraft.integration.jei.recipe.EndPortalConversionRecipe; -import net.minecraft.world.item.Item; - -import java.util.List; - -import static dev.anvilcraft.pigsplus.util.EnderComponentConversionUtil.ConversionChance; - -public class BetterEndPortalConversionRecipe extends EndPortalConversionRecipe { - // TODO:之后自己写个物品落入传送门时的逻辑 - public final List ingredients; - public final List results; - - public BetterEndPortalConversionRecipe(Item itemInput) { - super(ModBlocks.ROYAL_ANVIL.get(), 0.5f); // 随便填的 - this.ingredients = ImmutableList.of(ItemIngredientPredicate.Builder.item().of(itemInput).build()); - ImmutableList.Builder builder = ImmutableList.builder(); - builder.add(ChanceItemStack.of(AddonItems.ENDER_COMPONENT.asStack(), ConversionChance)); - - builder.add(ChanceItemStack.of(ModItems.LEVITATION_POWDER.asStack(), 1.0f - ConversionChance)); - - this.results = builder.build(); - - } - - public static ImmutableList getAllRecipes() { - ImmutableList.Builder builder = ImmutableList.builder(); - builder.add(new BetterEndPortalConversionRecipe(AddonItems.KARAKURI_COMPONENT.asItem())); - return builder.build(); - } -} diff --git a/src/main/resources/assets/anvilcraft_pigsplus/lang/zh_cn.json b/src/main/resources/assets/anvilcraft_pigsplus/lang/zh_cn.json index 00333938..5c9b15af 100644 --- a/src/main/resources/assets/anvilcraft_pigsplus/lang/zh_cn.json +++ b/src/main/resources/assets/anvilcraft_pigsplus/lang/zh_cn.json @@ -56,7 +56,8 @@ "item.anvilcraft_pigsplus.karakuri_component": "机巧部件", "item.anvilcraft_pigsplus.spiritual_component": "灵媒部件", "itemGroup.anvilcraft_pigsplus.addon_items": "铁砧工艺：猪+", - "jei.anvilcraft.pigsplus.info.ender_component": "携带附魔的机巧部件被摧毁时，每条附魔提供20%的概率，生成最多一个灵媒部件", + "jei.anvilcraft.pigsplus.info.ender_component": "将机巧部件丢入末地传送门，有20%概率获得", + "jei.anvilcraft.pigsplus.info.spiritual_component": "携带附魔的机巧部件被摧毁时，每条附魔提供20%的概率，生成最多一个灵媒部件", "tooltip.anvilcraft.pigsplus.enchanted_generator.max_power_value": "耗电上限: %d kW", "tooltip.anvilcraft.pigsplus.enchanted_generator.power_rate": "耗能率: %s", "tooltip.anvilcraft.pigsplus.enchanted_generator.time": "剩余时间: %s"