diff --git a/src/main/java/com/atsuishio/superbwarfare/compat/jei/SbwJEIPlugin.java b/src/main/java/com/atsuishio/superbwarfare/compat/jei/SbwJEIPlugin.java index 408736acd..ec932d457 100644 --- a/src/main/java/com/atsuishio/superbwarfare/compat/jei/SbwJEIPlugin.java +++ b/src/main/java/com/atsuishio/superbwarfare/compat/jei/SbwJEIPlugin.java @@ -58,5 +58,10 @@ public class SbwJEIPlugin implements IModPlugin { return stringBuilder.toString(); }); + + registration.registerSubtypeInterpreter(ModItems.C4_BOMB.get(), ((ingredient, context) -> { + if (ingredient.getTag() == null) return IIngredientSubtypeInterpreter.NONE; + return String.valueOf(ingredient.getTag().getBoolean("Control")); + })); } } diff --git a/src/main/java/com/atsuishio/superbwarfare/item/C4Bomb.java b/src/main/java/com/atsuishio/superbwarfare/item/C4Bomb.java index 2831f8409..221b7201a 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/C4Bomb.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/C4Bomb.java @@ -1,9 +1,9 @@ package com.atsuishio.superbwarfare.item; -import com.atsuishio.superbwarfare.client.TooltipTool; import com.atsuishio.superbwarfare.entity.projectile.C4Entity; import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModSounds; +import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerPlayer; import net.minecraft.sounds.SoundSource; @@ -56,9 +56,10 @@ public class C4Bomb extends Item { @Override public void appendHoverText(ItemStack pStack, @Nullable Level pLevel, List pTooltipComponents, TooltipFlag pIsAdvanced) { - TooltipTool.addDevelopingText(pTooltipComponents); if (pStack.getOrCreateTag().getBoolean(TAG_CONTROL)) { - pTooltipComponents.add(Component.literal("Control")); + pTooltipComponents.add(Component.translatable("des.superbwarfare.c4_bomb.control").withStyle(ChatFormatting.GRAY)); + } else { + pTooltipComponents.add(Component.translatable("des.superbwarfare.c4_bomb.time").withStyle(ChatFormatting.GRAY)); } } diff --git a/src/main/resources/assets/superbwarfare/lang/en_us.json b/src/main/resources/assets/superbwarfare/lang/en_us.json index 26e8c3330..bb32c3b92 100644 --- a/src/main/resources/assets/superbwarfare/lang/en_us.json +++ b/src/main/resources/assets/superbwarfare/lang/en_us.json @@ -181,6 +181,8 @@ "item.superbwarfare.mortar_deployer": "Mortar", "item.superbwarfare.claymore_mine": "Claymore", "item.superbwarfare.c4_bomb": "C4", + "des.superbwarfare.c4_bomb.time": "Time Bomb", + "des.superbwarfare.c4_bomb.control": "RC Bomb", "item.superbwarfare.seeker": "Seeker", "item.superbwarfare.missile_engine": "Missile Engine", "item.superbwarfare.fusee": "Fusee", diff --git a/src/main/resources/assets/superbwarfare/lang/zh_cn.json b/src/main/resources/assets/superbwarfare/lang/zh_cn.json index c004ce8a4..03af983f0 100644 --- a/src/main/resources/assets/superbwarfare/lang/zh_cn.json +++ b/src/main/resources/assets/superbwarfare/lang/zh_cn.json @@ -181,6 +181,8 @@ "item.superbwarfare.mortar_deployer": "迫击炮", "item.superbwarfare.claymore_mine": "阔剑地雷", "item.superbwarfare.c4_bomb": "C4炸药", + "des.superbwarfare.c4_bomb.time": "定时", + "des.superbwarfare.c4_bomb.control": "遥控", "item.superbwarfare.seeker": "导引头", "item.superbwarfare.missile_engine": "导弹发动机", "item.superbwarfare.fusee": "引信", diff --git a/src/main/resources/data/superbwarfare/recipes/c4_crafting.json b/src/main/resources/data/superbwarfare/recipes/c4_bomb_crafting.json similarity index 71% rename from src/main/resources/data/superbwarfare/recipes/c4_crafting.json rename to src/main/resources/data/superbwarfare/recipes/c4_bomb_crafting.json index 7c7309d66..07ce64dfb 100644 --- a/src/main/resources/data/superbwarfare/recipes/c4_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/c4_bomb_crafting.json @@ -2,19 +2,16 @@ "type": "minecraft:crafting_shaped", "category": "equipment", "pattern": [ - "dbd", + "ddd", "dcd", - "d d" + "ddd" ], "key": { - "b": { - "item": "minecraft:iron_ingot" - }, - "c": { + "d": { "item": "superbwarfare:high_energy_explosives" }, - "d": { - "item": "minecraft:string" + "c": { + "item": "minecraft:clock" } }, "result": { diff --git a/src/main/resources/data/superbwarfare/recipes/c4_bomb_rc_crafting.json b/src/main/resources/data/superbwarfare/recipes/c4_bomb_rc_crafting.json new file mode 100644 index 000000000..9d34f9856 --- /dev/null +++ b/src/main/resources/data/superbwarfare/recipes/c4_bomb_rc_crafting.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "pattern": [ + "ddd", + "dcd", + "ddd" + ], + "key": { + "d": { + "item": "superbwarfare:high_energy_explosives" + }, + "c": { + "item": "minecraft:redstone_torch" + } + }, + "result": { + "item": "superbwarfare:c4_bomb", + "count": 1, + "nbt": { + "Control": true + } + } +} \ No newline at end of file