diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d19b5e6..658f03b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,7 +3,7 @@ minecraft = "1.21.1" neoForge = "21.1.152" registrate = "MC1.21-1.3.0+62" anvillib = "1.4.0+build.172" -anvilcraft = "1.5.0" +anvilcraft = "1.5.0+hotfix.1570" anvilcraft_patchouli = "1.0.0+build.6" curios = "9.0.15+1.21.1" jei = "19.21.0.247" 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 766d829..4af142d 100644 --- a/src/generated/resources/assets/anvilcraft_pigsplus/lang/en_ud.json +++ b/src/generated/resources/assets/anvilcraft_pigsplus/lang/en_ud.json @@ -27,6 +27,8 @@ "anvilcraft_pigsplus.configuration.enchanted_generator.power_per_level": "ןǝʌǝꞀ ɹǝԀ ɹǝʍoԀ", "anvilcraft_pigsplus.configuration.enchanted_generator.power_per_level.tooltip": "ןǝʌǝן s,ʇuǝɯʇuɐɥɔuǝ ɹǝd ɹǝʍoԀ", "anvilcraft_pigsplus.configuration.enchanted_generator.tooltip": "ɹoʇɐɹǝuǝ⅁ pǝʇuɐɥɔuƎ", + "anvilcraft_pigsplus.configuration.portable_wireless_charger_energy_conversion": "uoısɹǝʌuoƆ ʎbɹǝuƎ ɹǝbɹɐɥƆ ssǝןǝɹıM ǝןqɐʇɹoԀ", + "anvilcraft_pigsplus.configuration.portable_wireless_charger_energy_conversion.tooltip": ")Mʞ( ɹǝbɹɐɥɔ ssǝןǝɹıʍ ǝןqɐʇɹod ɟo ʎʇıʇuɐnb uoısɹǝʌuoɔ ʎbɹǝuƎ", "anvilcraft_pigsplus.configuration.section.anvilcraft_pigsplus.server.toml": "uoıʇɐɹnbıɟuoƆ ɹǝʌɹǝS snןdsbıԀ ʇɟɐɹɔןıʌuⱯ", "anvilcraft_pigsplus.configuration.section.anvilcraft_pigsplus.server.toml.title": "uoıʇɐɹnbıɟuoƆ ɹǝʌɹǝS snןdsbıԀ ʇɟɐɹɔןıʌuⱯ", "anvilcraft_pigsplus.configuration.title": "uoıʇɐɹnbıɟuoƆ snןdsbıԀ ʇɟɐɹɔןıʌuⱯ", @@ -57,8 +59,9 @@ "itemGroup.anvilcraft_pigsplus.addon_items": "snןԀ sbıԀ :ʇɟɐɹƆןıʌuⱯ", "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.previous_energy_consumption": "%d :uoıʇdɯnsuoɔ ʎbɹǝuǝ ɯǝʇı snoıʌǝɹԀ", - "tooltip.anvilcraft.pigsplus.enchanted_generator.time": "%s :ǝɯıʇ buıuıɐɯǝᴚ" + "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.previous_energy_consumption": "%d :uoıʇdɯnsuoɔ ʎbɹǝuǝ ɯǝʇı snoıʌǝɹԀ", + "tooltip.anvilcraft_pigsplus.enchanted_generator.time": "%s :ǝɯıʇ buıuıɐɯǝᴚ", + "tooltip.anvilcraft_pigsplus.portable_wireless_charger": "ʇ/ƎℲ %d sǝʇɐɹǝuǝb puɐ Mʞ %d sǝɯnsuoɔ ʇı 'ʞɔɐdʞɔɐq uǝɥM" } \ No newline at end of file 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 6859c28..a0c733a 100644 --- a/src/generated/resources/assets/anvilcraft_pigsplus/lang/en_us.json +++ b/src/generated/resources/assets/anvilcraft_pigsplus/lang/en_us.json @@ -27,6 +27,8 @@ "anvilcraft_pigsplus.configuration.enchanted_generator.power_per_level": "Power Per Level", "anvilcraft_pigsplus.configuration.enchanted_generator.power_per_level.tooltip": "Power per enchantment's level", "anvilcraft_pigsplus.configuration.enchanted_generator.tooltip": "Enchanted Generator", + "anvilcraft_pigsplus.configuration.portable_wireless_charger_energy_conversion": "Portable Wireless Charger Energy Conversion", + "anvilcraft_pigsplus.configuration.portable_wireless_charger_energy_conversion.tooltip": "Energy conversion quantity of portable wireless charger (kW)", "anvilcraft_pigsplus.configuration.section.anvilcraft_pigsplus.server.toml": "Anvilcraft Pigsplus Server Configuration", "anvilcraft_pigsplus.configuration.section.anvilcraft_pigsplus.server.toml.title": "Anvilcraft Pigsplus Server Configuration", "anvilcraft_pigsplus.configuration.title": "Anvilcraft Pigsplus Configuration", @@ -57,8 +59,9 @@ "itemGroup.anvilcraft_pigsplus.addon_items": "AnvilCraft: Pigs Plus", "jei.anvilcraft.pigsplus.info.ender_component": "Throw a Karakuri Component into the End portal, there is a %.0f%% chance to obtain a Ender Component.", "jei.anvilcraft.pigsplus.info.spiritual_component": "When a Karakuri Component is destroyed, each enchantment provides a %.0f%% 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.previous_energy_consumption": "Previous item energy consumption: %d", - "tooltip.anvilcraft.pigsplus.enchanted_generator.time": "Remaining time: %s" + "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.previous_energy_consumption": "Previous item energy consumption: %d", + "tooltip.anvilcraft_pigsplus.enchanted_generator.time": "Remaining time: %s", + "tooltip.anvilcraft_pigsplus.portable_wireless_charger": "When backpack, it consumes %d kW and generates %d FE/t" } \ No newline at end of file diff --git a/src/main/java/dev/anvilcraft/pigsplus/block/EnchantedGeneratorBlock.java b/src/main/java/dev/anvilcraft/pigsplus/block/EnchantedGeneratorBlock.java index 27c232d..d3a7ecb 100644 --- a/src/main/java/dev/anvilcraft/pigsplus/block/EnchantedGeneratorBlock.java +++ b/src/main/java/dev/anvilcraft/pigsplus/block/EnchantedGeneratorBlock.java @@ -30,7 +30,7 @@ import java.util.Optional; public class EnchantedGeneratorBlock extends BetterBaseEntityBlock implements IHammerRemovable { - public static VoxelShape SHAPE = Block.box(0, 0, 0, 16, 4, 16); + public static VoxelShape SHAPE = Block.box(0, 0, 0, 16, 4.8, 16); public static BooleanProperty POWERED = BlockStateProperties.POWERED; public EnchantedGeneratorBlock(Properties pProperties) { diff --git a/src/main/java/dev/anvilcraft/pigsplus/block/entity/AutoRoyalGrindstoneBlockEntity.java b/src/main/java/dev/anvilcraft/pigsplus/block/entity/AutoRoyalGrindstoneBlockEntity.java index 4b57a80..8bf3ce6 100644 --- a/src/main/java/dev/anvilcraft/pigsplus/block/entity/AutoRoyalGrindstoneBlockEntity.java +++ b/src/main/java/dev/anvilcraft/pigsplus/block/entity/AutoRoyalGrindstoneBlockEntity.java @@ -1,5 +1,6 @@ package dev.anvilcraft.pigsplus.block.entity; +import dev.anvilcraft.pigsplus.AnvilCraftPigsPlus; import dev.anvilcraft.pigsplus.block.AutoRoyalGrindstoneBlock; import dev.anvilcraft.pigsplus.init.AddonBlocks; import dev.anvilcraft.pigsplus.init.AddonMenuTypes; @@ -50,7 +51,6 @@ import java.util.Objects; import java.util.concurrent.atomic.AtomicInteger; -import static dev.anvilcraft.pigsplus.AnvilCraftPigsPlus.CONFIG; import static dev.dubhe.anvilcraft.inventory.RoyalGrindstoneMenu.DEFAULT_REPAIR_MATERIAL; import static dev.dubhe.anvilcraft.inventory.RoyalGrindstoneMenu.GOLD_PER_CURSE; import static dev.dubhe.anvilcraft.inventory.RoyalGrindstoneMenu.REPAIR_COST_RECIPES; @@ -156,7 +156,7 @@ public void tick(Level level, BlockPos pos) { // 红石信号上升沿且冷却完毕，尝试进行自动研磨 cooldown = Math.max(0, cooldown - 1); if (powered && !poweredBefore && !level.isClientSide && this.cooldown == 0) { - if (work(level)) cooldown = CONFIG.autoRoyalSmithingTableCooldown; + if (work(level)) cooldown = AnvilCraftPigsPlus.CONFIG.autoRoyalSmithingTableCooldown; } poweredBefore = powered; } diff --git a/src/main/java/dev/anvilcraft/pigsplus/config/AddonServerConfig.java b/src/main/java/dev/anvilcraft/pigsplus/config/AddonServerConfig.java index 59da17f..ad9f85d 100644 --- a/src/main/java/dev/anvilcraft/pigsplus/config/AddonServerConfig.java +++ b/src/main/java/dev/anvilcraft/pigsplus/config/AddonServerConfig.java @@ -14,6 +14,11 @@ public class AddonServerConfig { @BoundedDiscrete(min = 1, max = 80) public int autoRoyalSmithingTableCooldown = 4; + // 便携无线充电器 + @Comment("Energy conversion quantity of portable wireless charger (kW)") + @BoundedDiscrete(min = 1, max = 1024000) + public int portableWirelessChargerEnergyConversion = 512; + // 电力附魔台 @CollapsibleObject public ElectricEnchantingTable electricEnchantingTable = new ElectricEnchantingTable(); 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 1ac711a..f9e57bc 100644 --- a/src/main/java/dev/anvilcraft/pigsplus/data/lang/LangHandler.java +++ b/src/main/java/dev/anvilcraft/pigsplus/data/lang/LangHandler.java @@ -19,10 +19,11 @@ public static void init(RegistrateLangProvider provider) { "Too close to another enchanted generator" ); - provider.add("tooltip.anvilcraft.pigsplus.enchanted_generator.time", "Remaining time: %s"); - provider.add("tooltip.anvilcraft.pigsplus.enchanted_generator.max_power_value", "Max power consumption: %d kW"); - provider.add("tooltip.anvilcraft.pigsplus.enchanted_generator.power_rate", "Power consumption rate: %s"); - provider.add("tooltip.anvilcraft.pigsplus.enchanted_generator.previous_energy_consumption", "Previous item energy consumption: %d"); + provider.add("tooltip.anvilcraft_pigsplus.enchanted_generator.time", "Remaining time: %s"); + provider.add("tooltip.anvilcraft_pigsplus.enchanted_generator.max_power_value", "Max power consumption: %d kW"); + provider.add("tooltip.anvilcraft_pigsplus.enchanted_generator.power_rate", "Power consumption rate: %s"); + provider.add("tooltip.anvilcraft_pigsplus.enchanted_generator.previous_energy_consumption", "Previous item energy consumption: %d"); + provider.add("tooltip.anvilcraft_pigsplus.portable_wireless_charger", "When backpack, it consumes %d kW and generates %d FE/t"); provider.add("config.jade.plugin_anvilcraft_pigsplus.electric_enchanting_table", "Electric Enchanting Table"); provider.add("config.jade.plugin_anvilcraft_pigsplus.enchanted_generator", "Enchanted Generator"); diff --git a/src/main/java/dev/anvilcraft/pigsplus/init/AddonBlocks.java b/src/main/java/dev/anvilcraft/pigsplus/init/AddonBlocks.java index 4900b4d..b0b2b93 100644 --- a/src/main/java/dev/anvilcraft/pigsplus/init/AddonBlocks.java +++ b/src/main/java/dev/anvilcraft/pigsplus/init/AddonBlocks.java @@ -35,7 +35,7 @@ import static dev.anvilcraft.pigsplus.AnvilCraftPigsPlus.REGISTRATE; -public class AddonBlocks { +public class AddonBlocks { static { REGISTRATE.defaultCreativeTab(AddonItemGroups.ADDON_ITEMS.getKey()); } @@ -264,7 +264,7 @@ public class AddonBlocks { .block("enchanted_generator", EnchantedGeneratorBlock::new) .lang("Enchanted Generator") .initialProperties(() -> Blocks.IRON_BLOCK) - .properties(p -> p.strength(5.0f, 1200f)) + .properties(p -> p.lightLevel(state -> 9).strength(5.0f, 1200f).noOcclusion().emissiveRendering(ModBlocks::always)) .blockstate(DataGenUtil::noExtraModelOrState) .tag(BlockTags.MINEABLE_WITH_PICKAXE) .simpleItem() diff --git a/src/main/java/dev/anvilcraft/pigsplus/integration/jade/provider/ElectricEnchantingTableProvider.java b/src/main/java/dev/anvilcraft/pigsplus/integration/jade/provider/ElectricEnchantingTableProvider.java index a0b9008..e302c91 100644 --- a/src/main/java/dev/anvilcraft/pigsplus/integration/jade/provider/ElectricEnchantingTableProvider.java +++ b/src/main/java/dev/anvilcraft/pigsplus/integration/jade/provider/ElectricEnchantingTableProvider.java @@ -22,22 +22,22 @@ public void appendTooltip(ITooltip tooltip, BlockAccessor accessor, IPluginConfi CompoundTag serverData = accessor.getServerData(); if (serverData.contains("time")) { tooltip.add(Component.translatable( - "tooltip.anvilcraft.pigsplus.enchanted_generator.time", + "tooltip.anvilcraft_pigsplus.enchanted_generator.time", FormattingUtil.toFormattedTime(serverData.getInt("time"), 5))); } if (serverData.contains("maxPowerValue")) { tooltip.add(Component.translatable( - "tooltip.anvilcraft.pigsplus.enchanted_generator.max_power_value", + "tooltip.anvilcraft_pigsplus.enchanted_generator.max_power_value", serverData.getInt("maxPowerValue"))); } if (serverData.contains("powerRate")) { tooltip.add(Component.translatable( - "tooltip.anvilcraft.pigsplus.enchanted_generator.power_rate", + "tooltip.anvilcraft_pigsplus.enchanted_generator.power_rate", String.format("%.3f", serverData.getDouble("powerRate")))); } if (serverData.contains("prevPowerValue")) { tooltip.add(Component.translatable( - "tooltip.anvilcraft.pigsplus.enchanted_generator.previous_energy_consumption", + "tooltip.anvilcraft_pigsplus.enchanted_generator.previous_energy_consumption", serverData.getInt("prevPowerValue"))); } diff --git a/src/main/java/dev/anvilcraft/pigsplus/item/PortableWirelessChargerItem.java b/src/main/java/dev/anvilcraft/pigsplus/item/PortableWirelessChargerItem.java index d2ffa14..4cfcea1 100644 --- a/src/main/java/dev/anvilcraft/pigsplus/item/PortableWirelessChargerItem.java +++ b/src/main/java/dev/anvilcraft/pigsplus/item/PortableWirelessChargerItem.java @@ -1,17 +1,25 @@ package dev.anvilcraft.pigsplus.item; +import dev.anvilcraft.pigsplus.AnvilCraftPigsPlus; import dev.anvilcraft.pigsplus.init.AddonItems; import dev.dubhe.anvilcraft.AnvilCraft; import dev.dubhe.anvilcraft.api.power.DynamicPowerComponent; import dev.dubhe.anvilcraft.api.power.IDynamicPowerComponentHolder; +import dev.dubhe.anvilcraft.api.power.PowerGrid; +import net.minecraft.ChatFormatting; +import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.TooltipFlag; import net.neoforged.neoforge.capabilities.Capabilities; import net.neoforged.neoforge.energy.IEnergyStorage; +import java.util.List; + public class PortableWirelessChargerItem extends Item { - public static final DynamicPowerComponent.PowerConsumption CONSUMPTION = new DynamicPowerComponent.PowerConsumption(512); + public static final DynamicPowerComponent.PowerConsumption CONSUMPTION = + new DynamicPowerComponent.PowerConsumption(AnvilCraftPigsPlus.CONFIG.portableWirelessChargerEnergyConversion); public PortableWirelessChargerItem(Properties properties) { @@ -35,9 +43,16 @@ public static void refreshPower(ServerPlayer player) { } public static void chargePlayerItems(ServerPlayer player) { + IDynamicPowerComponentHolder holder = IDynamicPowerComponentHolder.of(player); + DynamicPowerComponent powerComponent = holder.anvilcraft$getPowerComponent(); + PowerGrid powerGrid = powerComponent.getPowerGrid(); + if (powerGrid == null) return; + if (!powerGrid.isWorking()) return; + boolean isInInventory = player.getInventory().contains(AddonItems.PORTABLE_WIRELESS_CHARGER.asStack()); - int feEnergy = CONSUMPTION.amount() * AnvilCraft.CONFIG.powerConverter.powerConverterEfficiency; if (!isInInventory) return; + + int feEnergy = AnvilCraftPigsPlus.CONFIG.portableWirelessChargerEnergyConversion * AnvilCraft.CONFIG.powerConverter.powerConverterEfficiency; // 遍历玩家物品栏，尝试为有能量槽的物品充电 for (int i = 0; i < player.getInventory().getContainerSize(); i++) { ItemStack itemStack = player.getInventory().getItem(i); @@ -53,5 +68,13 @@ public static void chargePlayerItems(ServerPlayer player) { } } - + @Override + public void appendHoverText(ItemStack stack, TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + tooltipComponents.add(Component.translatable( + "tooltip.anvilcraft_pigsplus.portable_wireless_charger", + AnvilCraftPigsPlus.CONFIG.portableWirelessChargerEnergyConversion, + AnvilCraftPigsPlus.CONFIG.portableWirelessChargerEnergyConversion * AnvilCraft.CONFIG.powerConverter.powerConverterEfficiency + ).withStyle(ChatFormatting.GRAY)); + } } \ 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 3738067..d0d87a2 100644 --- a/src/main/resources/assets/anvilcraft_pigsplus/lang/zh_cn.json +++ b/src/main/resources/assets/anvilcraft_pigsplus/lang/zh_cn.json @@ -1,6 +1,6 @@ { "anvilcraft_pigsplus.configuration.auto_royal_smithing_table_cooldown": "Auto Royal Smithing Table Cooldown", - "anvilcraft_pigsplus.configuration.auto_royal_smithing_table_cooldown.tooltip": "自动皇家锻造台的冷却时长 (in ticks)", + "anvilcraft_pigsplus.configuration.auto_royal_smithing_table_cooldown.tooltip": "自动皇家锻造台的冷却时长(tick)", "anvilcraft_pigsplus.configuration.electric_enchanting_table": "电力附魔台", "anvilcraft_pigsplus.configuration.electric_enchanting_table.base_power_consumption_limit": "Base Power Consumption Limit", "anvilcraft_pigsplus.configuration.electric_enchanting_table.base_power_consumption_limit.tooltip": "电力附魔台的基础能耗上限", @@ -27,6 +27,8 @@ "anvilcraft_pigsplus.configuration.enchanted_generator.power_per_level": "Power Per Level", "anvilcraft_pigsplus.configuration.enchanted_generator.power_per_level.tooltip": "每个附魔等级提供的能量", "anvilcraft_pigsplus.configuration.enchanted_generator.tooltip": "附魔发电机", + "anvilcraft_pigsplus.configuration.portable_wireless_charger_energy_conversion": "Portable Wireless Charger Energy Conversion (kW)", + "anvilcraft_pigsplus.configuration.portable_wireless_charger_energy_conversion.tooltip": "便携无线充电器的能量转换量", "anvilcraft_pigsplus.configuration.section.anvilcraft_pigsplus.server.toml": "铁砧工艺：猪+ 服务端配置", "anvilcraft_pigsplus.configuration.section.anvilcraft_pigsplus.server.toml.title": "铁砧工艺：猪+ 服务端配置", "anvilcraft_pigsplus.configuration.title": "铁砧工艺：猪+ 配置", @@ -52,13 +54,14 @@ "item.anvilcraft_pigsplus.chaotic_raw_ore": "混沌粗矿", "item.anvilcraft_pigsplus.ender_component": "末影部件", "item.anvilcraft_pigsplus.karakuri_component": "机巧部件", - "item.anvilcraft_pigsplus.portable_wireless_charger": "便携无限充电器", + "item.anvilcraft_pigsplus.portable_wireless_charger": "便携无线充电器", "item.anvilcraft_pigsplus.spiritual_component": "灵媒部件", "itemGroup.anvilcraft_pigsplus.addon_items": "铁砧工艺：猪+", "jei.anvilcraft.pigsplus.info.ender_component": "将机巧部件丢入末地传送门，有%.0f%%概率获得", "jei.anvilcraft.pigsplus.info.spiritual_component": "携带附魔的机巧部件被摧毁时，每条附魔提供%.0f%%的概率，生成最多一个灵媒部件", - "tooltip.anvilcraft.pigsplus.enchanted_generator.max_power_value": "耗电上限: %d kW", - "tooltip.anvilcraft.pigsplus.enchanted_generator.power_rate": "耗能率: %s", - "tooltip.anvilcraft.pigsplus.enchanted_generator.previous_energy_consumption": "上一次附魔的能量消耗: %d", - "tooltip.anvilcraft.pigsplus.enchanted_generator.time": "剩余时间: %s" + "tooltip.anvilcraft_pigsplus.enchanted_generator.max_power_value": "耗电上限: %d kW", + "tooltip.anvilcraft_pigsplus.enchanted_generator.power_rate": "耗能率: %s", + "tooltip.anvilcraft_pigsplus.enchanted_generator.previous_energy_consumption": "上一次附魔的能量消耗: %d", + "tooltip.anvilcraft_pigsplus.enchanted_generator.time": "剩余时间: %s", + "tooltip.anvilcraft_pigsplus.portable_wireless_charger": "放在背包里，消耗 %d kW 以生产 %d FE/t" } \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft_pigsplus/models/block/enchanted_generator.json b/src/main/resources/assets/anvilcraft_pigsplus/models/block/enchanted_generator.json index b5578a8..29847de 100644 --- a/src/main/resources/assets/anvilcraft_pigsplus/models/block/enchanted_generator.json +++ b/src/main/resources/assets/anvilcraft_pigsplus/models/block/enchanted_generator.json @@ -1,7 +1,10 @@ { - "format_version": "1.21.6", + "format_version": "1.9.0", "credit": "Made with Blockbench", "parent": "minecraft:block/block", + "ambientocclusion": false, + "render_type": "minecraft:cutout", + "texture_size": [32, 32], "textures": { "1": "anvilcraft_pigsplus:block/enchanted_generator_head", "2": "anvilcraft_pigsplus:block/enchanted_generator_head_negative", @@ -9,38 +12,54 @@ "4": "anvilcraft_pigsplus:block/enchanted_generator_edge", "5": "anvilcraft_pigsplus:block/enchanted_generator_top", "6": "anvilcraft_pigsplus:block/enchanted_generator_corner", + "7": "anvilcraft:block/frost_metal_block_outline", "particle": "anvilcraft_pigsplus:block/enchanted_generator_bottom" }, "elements": [ { - "from": [0, 0, 0], - "to": [16, 4, 16], + "from": [0.5, 0.4, 0.5], + "to": [15.5, 4.4, 15.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 2.4, 8]}, "faces": { - "north": {"uv": [0, 12, 16, 16], "texture": "#4"}, - "east": {"uv": [0, 12, 16, 16], "texture": "#4"}, - "south": {"uv": [0, 12, 16, 16], "texture": "#4"}, - "west": {"uv": [0, 12, 16, 16], "texture": "#4"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#5"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#3"} + "north": {"uv": [0, 12, 15, 16], "texture": "#4"}, + "east": {"uv": [0, 12, 15, 16], "texture": "#4"}, + "south": {"uv": [0, 12, 15, 16], "texture": "#4"}, + "west": {"uv": [0, 12, 15, 16], "texture": "#4"}, + "up": {"uv": [0, 0, 15, 15], "texture": "#5"}, + "down": {"uv": [0, 1, 15, 16], "texture": "#3"} } }, { - "from": [3, 4, 3], - "to": [13, 2, 13], - "rotation": {"angle": 0, "axis": "z", "origin": [13, 2, 3]}, + "from": [3.4, 4.4, 3.4], + "to": [12.6, 3.4, 12.6], + "rotation": {"angle": 0, "axis": "z", "origin": [8, 3.9, 8]}, "faces": { - "north": {"uv": [3, 0, 13, 2], "rotation": 180, "texture": "#4"}, - "east": {"uv": [3, 6, 13, 8], "rotation": 180, "texture": "#4"}, - "south": {"uv": [3, 4, 13, 6], "rotation": 180, "texture": "#4"}, - "west": {"uv": [3, 2, 13, 4], "rotation": 180, "texture": "#4"}, - "up": {"uv": [3, 3, 13, 13], "rotation": 180, "texture": "#3"}, - "down": {"uv": [3, 3, 13, 13], "rotation": 180, "texture": "#5"} + "north": {"uv": [4, 0, 13, 1], "rotation": 180, "texture": "#4"}, + "east": {"uv": [4, 6, 13, 7], "rotation": 180, "texture": "#4"}, + "south": {"uv": [4, 4, 13, 5], "rotation": 180, "texture": "#4"}, + "west": {"uv": [4, 2, 13, 3], "rotation": 180, "texture": "#4"}, + "up": {"uv": [3, 4, 12, 13], "rotation": 180, "texture": "#3"}, + "down": {"uv": [3, 3, 12, 12], "rotation": 180, "texture": "#5"} + } + }, + { + "from": [15.975, 4.775, 15.975], + "to": [0.025, 0.025, 0.025], + "shade": false, + "light_emission": 15, + "faces": { + "north": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#7"}, + "east": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#7"}, + "south": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#7"}, + "west": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#7"}, + "up": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#7"}, + "down": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#7"} } }, { "from": [4, 7, 4], "to": [12, 15, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [9, 9, 9]}, + "rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 8]}, "faces": { "north": {"uv": [4, 4, 12, 12], "texture": "#1"}, "east": {"uv": [4, 4, 12, 12], "texture": "#1"}, @@ -50,10 +69,23 @@ "down": {"uv": [4, 4, 12, 12], "texture": "#1"} } }, + { + "from": [12.1, 15.1, 12.1], + "to": [3.9, 6.9, 3.9], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 8]}, + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#2"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#2"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#2"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#2"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#2"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#2"} + } + }, { "from": [9, 14, 11], "to": [13, 16, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 5, 8]}, + "rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 8]}, "faces": { "north": {"uv": [1, 13, 5, 15], "texture": "#6"}, "east": {"uv": [1, 1, 3, 3], "texture": "#6"}, @@ -66,7 +98,7 @@ { "from": [11, 14, 9], "to": [13, 16, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [11, 14, 9]}, + "rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 8]}, "faces": { "north": {"uv": [11, 1, 13, 3], "texture": "#6"}, "east": {"uv": [3, 1, 5, 3], "texture": "#6"}, @@ -79,7 +111,7 @@ { "from": [11, 12, 11], "to": [13, 14, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [11, 12, 11]}, + "rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 8]}, "faces": { "north": {"uv": [13, 3, 15, 5], "texture": "#6"}, "east": {"uv": [1, 3, 3, 5], "texture": "#6"}, @@ -92,7 +124,7 @@ { "from": [9, 6, 11], "to": [13, 8, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -3, 8]}, + "rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 8]}, "faces": { "north": {"uv": [1, 1, 5, 3], "texture": "#6"}, "east": {"uv": [1, 13, 3, 15], "texture": "#6"}, @@ -105,7 +137,7 @@ { "from": [11, 6, 9], "to": [13, 8, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [11, 6, 9]}, + "rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 8]}, "faces": { "north": {"uv": [11, 13, 13, 15], "texture": "#6"}, "east": {"uv": [3, 13, 5, 15], "texture": "#6"}, @@ -118,7 +150,7 @@ { "from": [11, 8, 11], "to": [13, 10, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [11, 8, 11]}, + "rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 8]}, "faces": { "north": {"uv": [13, 11, 15, 13], "texture": "#6"}, "east": {"uv": [1, 11, 3, 13], "texture": "#6"}, @@ -131,7 +163,7 @@ { "from": [9, 6, 3], "to": [13, 8, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -3, 0]}, + "rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 8]}, "faces": { "north": {"uv": [1, 13, 5, 15], "texture": "#6"}, "east": {"uv": [13, 13, 15, 15], "texture": "#6"}, @@ -144,7 +176,7 @@ { "from": [11, 6, 5], "to": [13, 8, 7], - "rotation": {"angle": 0, "axis": "y", "origin": [11, 6, 5]}, + "rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 8]}, "faces": { "north": {"uv": [11, 1, 13, 3], "texture": "#6"}, "east": {"uv": [11, 13, 13, 15], "texture": "#6"}, @@ -157,7 +189,7 @@ { "from": [11, 8, 3], "to": [13, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [11, 8, 3]}, + "rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 8]}, "faces": { "north": {"uv": [13, 3, 15, 5], "texture": "#6"}, "east": {"uv": [1, 3, 3, 5], "texture": "#6"}, @@ -170,7 +202,7 @@ { "from": [9, 14, 3], "to": [13, 16, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 5, 0]}, + "rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 8]}, "faces": { "north": {"uv": [1, 1, 5, 3], "texture": "#6"}, "east": {"uv": [13, 1, 15, 3], "texture": "#6"}, @@ -183,7 +215,7 @@ { "from": [11, 14, 5], "to": [13, 16, 7], - "rotation": {"angle": 0, "axis": "y", "origin": [11, 14, 5]}, + "rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 8]}, "faces": { "north": {"uv": [11, 1, 13, 3], "texture": "#6"}, "east": {"uv": [11, 1, 13, 3], "texture": "#6"}, @@ -196,7 +228,7 @@ { "from": [11, 12, 3], "to": [13, 14, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [11, 12, 3]}, + "rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 8]}, "faces": { "north": {"uv": [1, 3, 3, 5], "texture": "#6"}, "east": {"uv": [13, 3, 15, 5], "texture": "#6"}, @@ -209,7 +241,7 @@ { "from": [3, 14, 3], "to": [7, 16, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [2, 5, 0]}, + "rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 8]}, "faces": { "north": {"uv": [11, 1, 15, 3], "texture": "#6"}, "east": {"uv": [13, 11, 15, 13], "texture": "#6"}, @@ -222,7 +254,7 @@ { "from": [3, 14, 5], "to": [5, 16, 7], - "rotation": {"angle": 0, "axis": "y", "origin": [3, 14, 5]}, + "rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 8]}, "faces": { "north": {"uv": [11, 1, 13, 3], "texture": "#6"}, "east": {"uv": [11, 13, 13, 15], "texture": "#6"}, @@ -235,7 +267,7 @@ { "from": [3, 12, 3], "to": [5, 14, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [3, 12, 3]}, + "rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 8]}, "faces": { "north": {"uv": [13, 3, 15, 5], "texture": "#6"}, "east": {"uv": [13, 11, 15, 13], "texture": "#6"}, @@ -248,7 +280,7 @@ { "from": [3, 6, 5], "to": [5, 8, 7], - "rotation": {"angle": 0, "axis": "y", "origin": [3, 6, 5]}, + "rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 8]}, "faces": { "north": {"uv": [11, 1, 13, 3], "texture": "#6"}, "east": {"uv": [13, 3, 15, 5], "texture": "#6"}, @@ -261,7 +293,7 @@ { "from": [3, 8, 3], "to": [5, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [3, 8, 3]}, + "rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 8]}, "faces": { "north": {"uv": [13, 11, 15, 13], "texture": "#6"}, "east": {"uv": [13, 3, 15, 5], "texture": "#6"}, @@ -274,7 +306,7 @@ { "from": [3, 6, 3], "to": [7, 8, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [2, -3, 0]}, + "rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 8]}, "faces": { "north": {"uv": [11, 13, 15, 15], "texture": "#6"}, "east": {"uv": [13, 3, 15, 5], "texture": "#6"}, @@ -287,7 +319,7 @@ { "from": [3, 6, 11], "to": [7, 8, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [2, -3, 8]}, + "rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 8]}, "faces": { "north": {"uv": [11, 1, 15, 3], "texture": "#6"}, "east": {"uv": [13, 11, 15, 13], "texture": "#6"}, @@ -300,7 +332,7 @@ { "from": [3, 6, 9], "to": [5, 8, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [3, 6, 9]}, + "rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 8]}, "faces": { "north": {"uv": [11, 1, 13, 3], "texture": "#6"}, "east": {"uv": [13, 11, 15, 13], "texture": "#6"}, @@ -313,7 +345,7 @@ { "from": [3, 8, 11], "to": [5, 10, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [3, 8, 11]}, + "rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 8]}, "faces": { "north": {"uv": [13, 3, 15, 5], "texture": "#6"}, "east": {"uv": [13, 11, 15, 13], "texture": "#6"}, @@ -326,7 +358,7 @@ { "from": [3, 14, 11], "to": [7, 16, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [2, 5, 8]}, + "rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 8]}, "faces": { "north": {"uv": [11, 13, 15, 15], "texture": "#6"}, "east": {"uv": [13, 3, 15, 5], "texture": "#6"}, @@ -339,7 +371,7 @@ { "from": [3, 14, 9], "to": [5, 16, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [3, 14, 9]}, + "rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 8]}, "faces": { "north": {"uv": [11, 13, 13, 15], "texture": "#6"}, "east": {"uv": [13, 3, 15, 5], "texture": "#6"}, @@ -352,7 +384,7 @@ { "from": [3, 12, 11], "to": [5, 14, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [3, 12, 11]}, + "rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 8]}, "faces": { "north": {"uv": [13, 11, 15, 13], "texture": "#6"}, "east": {"uv": [13, 3, 15, 5], "texture": "#6"}, @@ -361,19 +393,6 @@ "up": {"uv": [13, 11, 15, 13], "texture": "#6"}, "down": {"uv": [11, 1, 13, 3], "texture": "#6"} } - }, - { - "from": [12.1, 15.1, 12.1], - "to": [3.9, 6.9, 3.9], - "rotation": {"angle": 0, "axis": "y", "origin": [7, 7, 7]}, - "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#2"}, - "east": {"uv": [0, 0, 16, 16], "texture": "#2"}, - "south": {"uv": [0, 0, 16, 16], "texture": "#2"}, - "west": {"uv": [0, 0, 16, 16], "texture": "#2"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#2"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#2"} - } } ], "display": { @@ -414,62 +433,63 @@ "groups": [ 0, 1, + 2, { "name": "头", "origin": [8, 11, 8], "color": 0, "children": [ - 2, + 3, + 4, { "name": "group", "origin": [8, 6, 8], "color": 0, - "children": [3, 4, 5] + "children": [5, 6, 7] }, { "name": "group", "origin": [8, 6, 8], "color": 0, - "children": [6, 7, 8] + "children": [8, 9, 10] }, { "name": "group", "origin": [8, 6, 8], "color": 0, - "children": [9, 10, 11] + "children": [11, 12, 13] }, { "name": "group", "origin": [8, 6, 8], "color": 0, - "children": [12, 13, 14] + "children": [14, 15, 16] }, { "name": "group", "origin": [8, 6, 8], "color": 0, - "children": [15, 16, 17] + "children": [17, 18, 19] }, { "name": "group", "origin": [8, 6, 8], "color": 0, - "children": [18, 19, 20] + "children": [20, 21, 22] }, { "name": "group", "origin": [8, 6, 8], "color": 0, - "children": [21, 22, 23] + "children": [23, 24, 25] }, { "name": "group", "origin": [8, 6, 8], "color": 0, - "children": [24, 25, 26] + "children": [26, 27, 28] } ] - }, - 27 + } ] } \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft_pigsplus/models/block/enchanted_generator_base.json b/src/main/resources/assets/anvilcraft_pigsplus/models/block/enchanted_generator_base.json index 0dfaeaa..e8410f7 100644 --- a/src/main/resources/assets/anvilcraft_pigsplus/models/block/enchanted_generator_base.json +++ b/src/main/resources/assets/anvilcraft_pigsplus/models/block/enchanted_generator_base.json @@ -1,38 +1,56 @@ { - "format_version": "1.21.6", + "format_version": "1.9.0", "credit": "Made with Blockbench", "parent": "minecraft:block/block", + "ambientocclusion": false, "render_type": "minecraft:cutout", + "texture_size": [32, 32], "textures": { "3": "anvilcraft_pigsplus:block/enchanted_generator_bottom", "4": "anvilcraft_pigsplus:block/enchanted_generator_edge", "5": "anvilcraft_pigsplus:block/enchanted_generator_top", + "7": "anvilcraft:block/frost_metal_block_outline", "particle": "anvilcraft_pigsplus:block/enchanted_generator_bottom" }, "elements": [ { - "from": [0, 0, 0], - "to": [16, 4, 16], + "from": [0.5, 0.4, 0.5], + "to": [15.5, 4.4, 15.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 2.4, 8]}, "faces": { - "north": {"uv": [0, 12, 16, 16], "texture": "#4"}, - "east": {"uv": [0, 12, 16, 16], "texture": "#4"}, - "south": {"uv": [0, 12, 16, 16], "texture": "#4"}, - "west": {"uv": [0, 12, 16, 16], "texture": "#4"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#5"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#3"} + "north": {"uv": [0, 12, 15, 16], "texture": "#4"}, + "east": {"uv": [0, 12, 15, 16], "texture": "#4"}, + "south": {"uv": [0, 12, 15, 16], "texture": "#4"}, + "west": {"uv": [0, 12, 15, 16], "texture": "#4"}, + "up": {"uv": [0, 0, 15, 15], "texture": "#5"}, + "down": {"uv": [0, 1, 15, 16], "texture": "#3"} } }, { - "from": [3, 4, 3], - "to": [13, 2, 13], - "rotation": {"angle": 0, "axis": "z", "origin": [13, 2, 3]}, + "from": [3.4, 4.4, 3.4], + "to": [12.6, 3.4, 12.6], + "rotation": {"angle": 0, "axis": "z", "origin": [8, 3.9, 8]}, "faces": { - "north": {"uv": [3, 0, 13, 2], "rotation": 180, "texture": "#4"}, - "east": {"uv": [3, 6, 13, 8], "rotation": 180, "texture": "#4"}, - "south": {"uv": [3, 4, 13, 6], "rotation": 180, "texture": "#4"}, - "west": {"uv": [3, 2, 13, 4], "rotation": 180, "texture": "#4"}, - "up": {"uv": [3, 3, 13, 13], "rotation": 180, "texture": "#3"}, - "down": {"uv": [3, 3, 13, 13], "rotation": 180, "texture": "#5"} + "north": {"uv": [4, 0, 13, 1], "rotation": 180, "texture": "#4"}, + "east": {"uv": [4, 6, 13, 7], "rotation": 180, "texture": "#4"}, + "south": {"uv": [4, 4, 13, 5], "rotation": 180, "texture": "#4"}, + "west": {"uv": [4, 2, 13, 3], "rotation": 180, "texture": "#4"}, + "up": {"uv": [3, 4, 12, 13], "rotation": 180, "texture": "#3"}, + "down": {"uv": [3, 3, 12, 12], "rotation": 180, "texture": "#5"} + } + }, + { + "from": [15.975, 4.775, 15.975], + "to": [0.025, 0.025, 0.025], + "shade": false, + "light_emission": 15, + "faces": { + "north": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#7"}, + "east": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#7"}, + "south": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#7"}, + "west": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#7"}, + "up": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#7"}, + "down": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#7"} } } ] diff --git a/src/main/resources/assets/anvilcraft_pigsplus/textures/block/enchanted_generator_bottom.png b/src/main/resources/assets/anvilcraft_pigsplus/textures/block/enchanted_generator_bottom.png index ef81842..dab2f30 100644 Binary files a/src/main/resources/assets/anvilcraft_pigsplus/textures/block/enchanted_generator_bottom.png and b/src/main/resources/assets/anvilcraft_pigsplus/textures/block/enchanted_generator_bottom.png differ diff --git a/src/main/resources/assets/anvilcraft_pigsplus/textures/block/enchanted_generator_edge.png b/src/main/resources/assets/anvilcraft_pigsplus/textures/block/enchanted_generator_edge.png index 288ef4f..3aa318b 100644 Binary files a/src/main/resources/assets/anvilcraft_pigsplus/textures/block/enchanted_generator_edge.png and b/src/main/resources/assets/anvilcraft_pigsplus/textures/block/enchanted_generator_edge.png differ diff --git a/src/main/resources/assets/anvilcraft_pigsplus/textures/block/enchanted_generator_head.png b/src/main/resources/assets/anvilcraft_pigsplus/textures/block/enchanted_generator_head.png index c3a0c04..aa171f6 100644 Binary files a/src/main/resources/assets/anvilcraft_pigsplus/textures/block/enchanted_generator_head.png and b/src/main/resources/assets/anvilcraft_pigsplus/textures/block/enchanted_generator_head.png differ diff --git a/src/main/resources/assets/anvilcraft_pigsplus/textures/block/enchanted_generator_head_negative.png b/src/main/resources/assets/anvilcraft_pigsplus/textures/block/enchanted_generator_head_negative.png index 5d9aba8..48602fb 100644 Binary files a/src/main/resources/assets/anvilcraft_pigsplus/textures/block/enchanted_generator_head_negative.png and b/src/main/resources/assets/anvilcraft_pigsplus/textures/block/enchanted_generator_head_negative.png differ diff --git a/src/main/resources/assets/anvilcraft_pigsplus/textures/block/enchanted_generator_top.png b/src/main/resources/assets/anvilcraft_pigsplus/textures/block/enchanted_generator_top.png index 51317a3..ed94db7 100644 Binary files a/src/main/resources/assets/anvilcraft_pigsplus/textures/block/enchanted_generator_top.png and b/src/main/resources/assets/anvilcraft_pigsplus/textures/block/enchanted_generator_top.png differ diff --git a/src/main/resources/assets/anvilcraft_pigsplus/textures/item/portable_wireless_charger.png b/src/main/resources/assets/anvilcraft_pigsplus/textures/item/portable_wireless_charger.png index 3187f9b..6b27220 100644 Binary files a/src/main/resources/assets/anvilcraft_pigsplus/textures/item/portable_wireless_charger.png and b/src/main/resources/assets/anvilcraft_pigsplus/textures/item/portable_wireless_charger.png differ