diff --git a/src/main/java/net/mcreator/target/event/GunEventHandler.java b/src/main/java/net/mcreator/target/event/GunEventHandler.java index d92eb2c16..991ad4503 100644 --- a/src/main/java/net/mcreator/target/event/GunEventHandler.java +++ b/src/main/java/net/mcreator/target/event/GunEventHandler.java @@ -782,6 +782,7 @@ public class GunEventHandler { if (tag.getInt("sentinel_charge_time") == 17) { tag.putDouble("power", Mth.clamp(tag.getDouble("power") + 24000,0,240000)); + player.getInventory().clearOrCountMatchingItems(p -> p.getItem() == TargetModItems.SHIELD_CELL.get(), 1, player.inventoryMenu.getCraftSlots()); } if (tag.getInt("sentinel_charge_time") == 1) { diff --git a/src/main/java/net/mcreator/target/init/TargetModItems.java b/src/main/java/net/mcreator/target/init/TargetModItems.java index 9a0aeab08..9a21935ca 100644 --- a/src/main/java/net/mcreator/target/init/TargetModItems.java +++ b/src/main/java/net/mcreator/target/init/TargetModItems.java @@ -107,6 +107,7 @@ public class TargetModItems { public static final RegistryObject GALENA = ITEMS.register("galena", Galena::new); public static final RegistryObject SCHEELITE = ITEMS.register("scheelite", Scheelite::new); public static final RegistryObject DOG_TAG = ITEMS.register("dog_tag", DogTag::new); + public static final RegistryObject SHIELD_CELL = ITEMS.register("shield_cell", ShieldCell::new); public static final RegistryObject IRON_BARREL = ITEMS.register("iron_barrel", IronBarrel::new); public static final RegistryObject IRON_ACTION = ITEMS.register("iron_action", IronAction::new); diff --git a/src/main/java/net/mcreator/target/item/common/ammo/ShieldCell.java b/src/main/java/net/mcreator/target/item/common/ammo/ShieldCell.java new file mode 100644 index 000000000..5f687a1c1 --- /dev/null +++ b/src/main/java/net/mcreator/target/item/common/ammo/ShieldCell.java @@ -0,0 +1,21 @@ +package net.mcreator.target.item.common.ammo; + +import net.minecraft.network.chat.Component; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Rarity; +import net.minecraft.world.item.TooltipFlag; +import net.minecraft.world.level.Level; + +import java.util.List; + +public class ShieldCell extends Item { + public ShieldCell() { + super(new Properties().stacksTo(64).rarity(Rarity.RARE)); + } + + @Override + public void appendHoverText(ItemStack itemstack, Level world, List list, TooltipFlag flag) { + super.appendHoverText(itemstack, world, list, flag); + } +} diff --git a/src/main/java/net/mcreator/target/item/gun/SentinelItem.java b/src/main/java/net/mcreator/target/item/gun/SentinelItem.java index 352205fc8..d9167ba8e 100644 --- a/src/main/java/net/mcreator/target/item/gun/SentinelItem.java +++ b/src/main/java/net/mcreator/target/item/gun/SentinelItem.java @@ -171,11 +171,30 @@ public class SentinelItem extends GunItem implements GeoItem, AnimatedItem { TooltipTool.addSentinelTips(list, stack); } + public static int getCellCount(Player player) { + int sum = 0; + for (int i = 0; i < player.getInventory().getContainerSize(); ++i) { + ItemStack itemstack = player.getInventory().getItem(i); + if (check(itemstack)) { + sum += itemstack.getCount(); + } + } + return sum; + } + + protected static boolean check(ItemStack stack) { + return stack.getItem() == TargetModItems.SHIELD_CELL.get(); + } + @Override public void inventoryTick(ItemStack itemStack, Level world, Entity entity, int slot, boolean selected) { super.inventoryTick(itemStack, world, entity, slot, selected); var tag = itemStack.getOrCreateTag(); + if (entity instanceof Player player) { + tag.putInt("cell_count", getCellCount(player)); + } + if (tag.getDouble("power") > 0) { tag.putDouble("add_damage", 0.2857142857142857 * tag.getDouble("damage") * tag.getDouble("damageadd")); tag.putDouble("power", tag.getDouble("power") - 5); diff --git a/src/main/java/net/mcreator/target/network/message/FireModeMessage.java b/src/main/java/net/mcreator/target/network/message/FireModeMessage.java index fe5af2558..a424a6a71 100644 --- a/src/main/java/net/mcreator/target/network/message/FireModeMessage.java +++ b/src/main/java/net/mcreator/target/network/message/FireModeMessage.java @@ -104,7 +104,8 @@ public class FireModeMessage { && !capability.zooming && !(player.getCooldowns().isOnCooldown(mainHandItem.getItem())) && mainHandItem.getOrCreateTag().getInt("gun_reloading_time") == 0 - && !mainHandItem.getOrCreateTag().getBoolean("sentinel_is_charging")){ + && !mainHandItem.getOrCreateTag().getBoolean("sentinel_is_charging") + && tag.getInt("cell_count") > 0) { tag.putBoolean("start_sentinel_charge", true); } diff --git a/src/main/resources/assets/target/lang/en_us.json b/src/main/resources/assets/target/lang/en_us.json index d27b3b489..e35e893dd 100644 --- a/src/main/resources/assets/target/lang/en_us.json +++ b/src/main/resources/assets/target/lang/en_us.json @@ -122,6 +122,7 @@ "item.target.primer": "Primer", "item.target.dog_tag": "Dog Tag", "curios.identifier.dog_tag": "Dog Tag", + "item.target.shield_cell": "Cell", "attribute.target.spread": "Spread", diff --git a/src/main/resources/assets/target/lang/zh_cn.json b/src/main/resources/assets/target/lang/zh_cn.json index fb072127a..af74aca94 100644 --- a/src/main/resources/assets/target/lang/zh_cn.json +++ b/src/main/resources/assets/target/lang/zh_cn.json @@ -122,6 +122,7 @@ "item.target.primer": "底火", "item.target.dog_tag": "狗牌", "curios.identifier.dog_tag": "狗牌", + "item.target.shield_cell": "电池", "attribute.target.spread": "散布", diff --git a/src/main/resources/assets/target/models/item/shield_cell.json b/src/main/resources/assets/target/models/item/shield_cell.json new file mode 100644 index 000000000..c09470a77 --- /dev/null +++ b/src/main/resources/assets/target/models/item/shield_cell.json @@ -0,0 +1,429 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "1": "target:item/shield_cell" + }, + "elements": [ + { + "from": [6.49403, 3.69, 7.3925], + "to": [6.86403, 8.81, 8.6075], + "rotation": {"angle": 0, "axis": "y", "origin": [7.96066, 5.05188, 8]}, + "faces": { + "north": {"uv": [10.5, 11, 10.6875, 13.5625], "texture": "#1"}, + "east": {"uv": [8, 0, 8.625, 2.5625], "texture": "#1"}, + "south": {"uv": [11.5, 9, 11.6875, 11.5625], "texture": "#1"}, + "west": {"uv": [8, 3, 8.625, 5.5625], "texture": "#1"}, + "up": {"uv": [13.1875, 13.625, 13, 13], "texture": "#1"}, + "down": {"uv": [0.1875, 13.5, 0, 14.125], "texture": "#1"} + } + }, + { + "from": [6.49403, 3.69, 7.3925], + "to": [6.86403, 8.81, 8.6075], + "rotation": {"angle": -45, "axis": "y", "origin": [7.96066, 5.05188, 8]}, + "faces": { + "north": {"uv": [12, 0, 12.1875, 2.5625], "texture": "#1"}, + "east": {"uv": [8, 6, 8.625, 8.5625], "texture": "#1"}, + "south": {"uv": [8, 12, 8.1875, 14.5625], "texture": "#1"}, + "west": {"uv": [9, 0, 9.625, 2.5625], "texture": "#1"}, + "up": {"uv": [0.6875, 14.125, 0.5, 13.5], "texture": "#1"}, + "down": {"uv": [1.1875, 13.5, 1, 14.125], "texture": "#1"} + } + }, + { + "from": [7.35316, 3.69, 6.53337], + "to": [8.56816, 8.81, 6.90337], + "rotation": {"angle": 0, "axis": "y", "origin": [7.96066, 5.05188, 8]}, + "faces": { + "north": {"uv": [9, 3, 9.625, 5.5625], "texture": "#1"}, + "east": {"uv": [8.5, 12, 8.6875, 14.5625], "texture": "#1"}, + "south": {"uv": [9, 6, 9.625, 8.5625], "texture": "#1"}, + "west": {"uv": [9, 12, 9.1875, 14.5625], "texture": "#1"}, + "up": {"uv": [14.125, 2.1875, 13.5, 2], "texture": "#1"}, + "down": {"uv": [14.125, 2.5, 13.5, 2.6875], "texture": "#1"} + } + }, + { + "from": [7.35316, 3.69, 6.53337], + "to": [8.56816, 8.81, 6.90337], + "rotation": {"angle": -45, "axis": "y", "origin": [7.96066, 5.05188, 8]}, + "faces": { + "north": {"uv": [8, 9, 8.625, 11.5625], "texture": "#1"}, + "east": {"uv": [12, 9, 12.1875, 11.5625], "texture": "#1"}, + "south": {"uv": [9, 9, 9.625, 11.5625], "texture": "#1"}, + "west": {"uv": [9.5, 12, 9.6875, 14.5625], "texture": "#1"}, + "up": {"uv": [14.125, 3.1875, 13.5, 3], "texture": "#1"}, + "down": {"uv": [14.125, 3.5, 13.5, 3.6875], "texture": "#1"} + } + }, + { + "from": [9.05729, 3.69, 7.3925], + "to": [9.42729, 8.81, 8.6075], + "rotation": {"angle": 0, "axis": "y", "origin": [7.96066, 5.05188, 8]}, + "faces": { + "north": {"uv": [11.5, 12, 11.6875, 14.5625], "texture": "#1"}, + "east": {"uv": [0, 10, 0.625, 12.5625], "texture": "#1"}, + "south": {"uv": [12, 12, 12.1875, 14.5625], "texture": "#1"}, + "west": {"uv": [10, 0, 10.625, 2.5625], "texture": "#1"}, + "up": {"uv": [1.6875, 14.125, 1.5, 13.5], "texture": "#1"}, + "down": {"uv": [13.6875, 4, 13.5, 4.625], "texture": "#1"} + } + }, + { + "from": [9.05729, 3.69, 7.3925], + "to": [9.42729, 8.81, 8.6075], + "rotation": {"angle": -45, "axis": "y", "origin": [7.96066, 5.05188, 8]}, + "faces": { + "north": {"uv": [12.5, 0, 12.6875, 2.5625], "texture": "#1"}, + "east": {"uv": [1, 10, 1.625, 12.5625], "texture": "#1"}, + "south": {"uv": [12.5, 3, 12.6875, 5.5625], "texture": "#1"}, + "west": {"uv": [2, 10, 2.625, 12.5625], "texture": "#1"}, + "up": {"uv": [13.6875, 5.625, 13.5, 5], "texture": "#1"}, + "down": {"uv": [6.1875, 13.5, 6, 14.125], "texture": "#1"} + } + }, + { + "from": [7.35316, 3.69, 9.09663], + "to": [8.56816, 8.81, 9.46663], + "rotation": {"angle": 0, "axis": "y", "origin": [7.96066, 5.05188, 8]}, + "faces": { + "north": {"uv": [3, 10, 3.625, 12.5625], "texture": "#1"}, + "east": {"uv": [12.5, 6, 12.6875, 8.5625], "texture": "#1"}, + "south": {"uv": [10, 3, 10.625, 5.5625], "texture": "#1"}, + "west": {"uv": [12.5, 9, 12.6875, 11.5625], "texture": "#1"}, + "up": {"uv": [14.125, 6.1875, 13.5, 6], "texture": "#1"}, + "down": {"uv": [7.125, 13.5, 6.5, 13.6875], "texture": "#1"} + } + }, + { + "from": [7.35316, 3.69, 9.09663], + "to": [8.56816, 8.81, 9.46663], + "rotation": {"angle": -45, "axis": "y", "origin": [7.96066, 5.05188, 8]}, + "faces": { + "north": {"uv": [4, 10, 4.625, 12.5625], "texture": "#1"}, + "east": {"uv": [11, 12.5, 11.1875, 15.0625], "texture": "#1"}, + "south": {"uv": [5, 10, 5.625, 12.5625], "texture": "#1"}, + "west": {"uv": [12.5, 12, 12.6875, 14.5625], "texture": "#1"}, + "up": {"uv": [14.125, 6.6875, 13.5, 6.5], "texture": "#1"}, + "down": {"uv": [14.125, 7, 13.5, 7.1875], "texture": "#1"} + } + }, + { + "from": [6.2183, 3.89772, 7.27829], + "to": [8.14286, 8.56228, 8.72171], + "rotation": {"angle": 0, "axis": "y", "origin": [7.96066, 5.05188, 8]}, + "faces": { + "north": {"uv": [0, 0, 0.9375, 2.3125], "texture": "#1"}, + "east": {"uv": [6, 5, 6.75, 7.3125], "texture": "#1"}, + "south": {"uv": [1, 0, 1.9375, 2.3125], "texture": "#1"}, + "west": {"uv": [7, 0, 7.75, 2.3125], "texture": "#1"}, + "up": {"uv": [6.9375, 10.75, 6, 10], "texture": "#1"}, + "down": {"uv": [10.9375, 6, 10, 6.75], "texture": "#1"} + } + }, + { + "from": [6.2183, 3.89772, 7.27829], + "to": [8.14286, 8.56228, 8.72171], + "rotation": {"angle": -45, "axis": "y", "origin": [7.96066, 5.05188, 8]}, + "faces": { + "north": {"uv": [2, 0, 2.9375, 2.3125], "texture": "#1"}, + "east": {"uv": [7, 2.5, 7.75, 4.8125], "texture": "#1"}, + "south": {"uv": [0, 2.5, 0.9375, 4.8125], "texture": "#1"}, + "west": {"uv": [7, 5, 7.75, 7.3125], "texture": "#1"}, + "up": {"uv": [7.9375, 10.75, 7, 10], "texture": "#1"}, + "down": {"uv": [10.9375, 7, 10, 7.75], "texture": "#1"} + } + }, + { + "from": [7.23895, 3.89772, 6.25764], + "to": [7.68237, 8.56228, 8.1822], + "rotation": {"angle": 0, "axis": "y", "origin": [7.96066, 5.05188, 8]}, + "faces": { + "north": {"uv": [11, 5, 11.25, 7.3125], "texture": "#1"}, + "east": {"uv": [1, 2.5, 1.9375, 4.8125], "texture": "#1"}, + "south": {"uv": [6, 11, 6.25, 13.3125], "texture": "#1"}, + "west": {"uv": [2, 2.5, 2.9375, 4.8125], "texture": "#1"}, + "up": {"uv": [12.25, 3.9375, 12, 3], "texture": "#1"}, + "down": {"uv": [12.25, 4, 12, 4.9375], "texture": "#1"} + } + }, + { + "from": [8.23895, 3.89772, 6.25764], + "to": [8.68237, 8.56228, 8.1822], + "rotation": {"angle": 0, "axis": "y", "origin": [7.96066, 5.05188, 8]}, + "faces": { + "north": {"uv": [6.5, 11, 6.75, 13.3125], "texture": "#1"}, + "east": {"uv": [3, 0, 3.9375, 2.3125], "texture": "#1"}, + "south": {"uv": [7, 11, 7.25, 13.3125], "texture": "#1"}, + "west": {"uv": [3, 2.5, 3.9375, 4.8125], "texture": "#1"}, + "up": {"uv": [2.25, 13.9375, 2, 13], "texture": "#1"}, + "down": {"uv": [13.25, 2, 13, 2.9375], "texture": "#1"} + } + }, + { + "from": [7.23895, 3.89772, 6.25764], + "to": [8.68237, 8.56228, 8.1822], + "rotation": {"angle": -45, "axis": "y", "origin": [7.96066, 5.05188, 8]}, + "faces": { + "north": {"uv": [0, 7.5, 0.75, 9.8125], "texture": "#1"}, + "east": {"uv": [4, 0, 4.9375, 2.3125], "texture": "#1"}, + "south": {"uv": [1, 7.5, 1.75, 9.8125], "texture": "#1"}, + "west": {"uv": [4, 2.5, 4.9375, 4.8125], "texture": "#1"}, + "up": {"uv": [10.75, 8.9375, 10, 8], "texture": "#1"}, + "down": {"uv": [10.75, 9, 10, 9.9375], "texture": "#1"} + } + }, + { + "from": [7.77846, 3.89772, 7.27829], + "to": [9.70302, 8.56228, 8.72171], + "rotation": {"angle": 0, "axis": "y", "origin": [7.96066, 5.05188, 8]}, + "faces": { + "north": {"uv": [0, 5, 0.9375, 7.3125], "texture": "#1"}, + "east": {"uv": [2, 7.5, 2.75, 9.8125], "texture": "#1"}, + "south": {"uv": [5, 0, 5.9375, 2.3125], "texture": "#1"}, + "west": {"uv": [3, 7.5, 3.75, 9.8125], "texture": "#1"}, + "up": {"uv": [10.9375, 10.75, 10, 10], "texture": "#1"}, + "down": {"uv": [11.9375, 0, 11, 0.75], "texture": "#1"} + } + }, + { + "from": [7.77846, 3.89772, 7.27829], + "to": [9.70302, 8.56228, 8.72171], + "rotation": {"angle": -45, "axis": "y", "origin": [7.96066, 5.05188, 8]}, + "faces": { + "north": {"uv": [1, 5, 1.9375, 7.3125], "texture": "#1"}, + "east": {"uv": [4, 7.5, 4.75, 9.8125], "texture": "#1"}, + "south": {"uv": [2, 5, 2.9375, 7.3125], "texture": "#1"}, + "west": {"uv": [5, 7.5, 5.75, 9.8125], "texture": "#1"}, + "up": {"uv": [11.9375, 1.75, 11, 1], "texture": "#1"}, + "down": {"uv": [11.9375, 2, 11, 2.75], "texture": "#1"} + } + }, + { + "from": [8.23895, 3.89772, 7.8178], + "to": [8.68237, 8.56228, 9.74236], + "rotation": {"angle": 0, "axis": "y", "origin": [7.96066, 5.05188, 8]}, + "faces": { + "north": {"uv": [7.5, 11, 7.75, 13.3125], "texture": "#1"}, + "east": {"uv": [5, 2.5, 5.9375, 4.8125], "texture": "#1"}, + "south": {"uv": [11, 7.5, 11.25, 9.8125], "texture": "#1"}, + "west": {"uv": [3, 5, 3.9375, 7.3125], "texture": "#1"}, + "up": {"uv": [2.75, 13.9375, 2.5, 13], "texture": "#1"}, + "down": {"uv": [3.25, 13, 3, 13.9375], "texture": "#1"} + } + }, + { + "from": [7.23895, 3.89772, 7.8178], + "to": [7.68237, 8.56228, 9.74236], + "rotation": {"angle": 0, "axis": "y", "origin": [7.96066, 5.05188, 8]}, + "faces": { + "north": {"uv": [10, 11, 10.25, 13.3125], "texture": "#1"}, + "east": {"uv": [4, 5, 4.9375, 7.3125], "texture": "#1"}, + "south": {"uv": [11, 10, 11.25, 12.3125], "texture": "#1"}, + "west": {"uv": [5, 5, 5.9375, 7.3125], "texture": "#1"}, + "up": {"uv": [13.25, 3.9375, 13, 3], "texture": "#1"}, + "down": {"uv": [3.75, 13, 3.5, 13.9375], "texture": "#1"} + } + }, + { + "from": [7.68237, 7.39772, 7.8178], + "to": [8.24237, 8.56228, 9.74236], + "rotation": {"angle": 0, "axis": "y", "origin": [7.95408, 5.05188, 8]}, + "faces": { + "north": {"uv": [13, 9, 13.25, 9.5625], "texture": "#1"}, + "east": {"uv": [11.5, 5, 12.4375, 5.5625], "texture": "#1"}, + "south": {"uv": [13, 10, 13.25, 10.5625], "texture": "#1"}, + "west": {"uv": [11.5, 6, 12.4375, 6.5625], "texture": "#1"}, + "up": {"uv": [4.25, 13.9375, 4, 13], "texture": "#1"}, + "down": {"uv": [13.25, 4, 13, 4.9375], "texture": "#1"} + } + }, + { + "from": [7.68237, 7.39772, 6.25764], + "to": [8.24237, 8.56228, 8.1822], + "rotation": {"angle": 0, "axis": "y", "origin": [7.96066, 5.05188, 8]}, + "faces": { + "north": {"uv": [13, 11, 13.25, 11.5625], "texture": "#1"}, + "east": {"uv": [11.5, 7, 12.4375, 7.5625], "texture": "#1"}, + "south": {"uv": [13, 12, 13.25, 12.5625], "texture": "#1"}, + "west": {"uv": [11.5, 8, 12.4375, 8.5625], "texture": "#1"}, + "up": {"uv": [4.75, 13.9375, 4.5, 13], "texture": "#1"}, + "down": {"uv": [5.25, 13, 5, 13.9375], "texture": "#1"} + } + }, + { + "from": [7.68237, 3.89772, 7.8178], + "to": [8.24237, 4.56228, 9.74236], + "rotation": {"angle": 0, "axis": "y", "origin": [7.9475, 5.05188, 8]}, + "faces": { + "north": {"uv": [13.5, 11.5, 13.75, 11.8125], "texture": "#1"}, + "east": {"uv": [13, 0.5, 13.9375, 0.8125], "texture": "#1"}, + "south": {"uv": [13.5, 12, 13.75, 12.3125], "texture": "#1"}, + "west": {"uv": [1, 13, 1.9375, 13.3125], "texture": "#1"}, + "up": {"uv": [13.25, 5.9375, 13, 5], "texture": "#1"}, + "down": {"uv": [5.75, 13, 5.5, 13.9375], "texture": "#1"} + } + }, + { + "from": [7.68237, 3.89772, 6.25764], + "to": [8.24237, 4.56228, 8.1822], + "rotation": {"angle": 0, "axis": "y", "origin": [7.9475, 5.05188, 8]}, + "faces": { + "north": {"uv": [13.5, 12.5, 13.75, 12.8125], "texture": "#1"}, + "east": {"uv": [13, 1, 13.9375, 1.3125], "texture": "#1"}, + "south": {"uv": [13.5, 13, 13.75, 13.3125], "texture": "#1"}, + "west": {"uv": [13, 1.5, 13.9375, 1.8125], "texture": "#1"}, + "up": {"uv": [13.25, 6.9375, 13, 6], "texture": "#1"}, + "down": {"uv": [13.25, 7, 13, 7.9375], "texture": "#1"} + } + }, + { + "from": [7.23895, 3.89772, 7.8178], + "to": [8.68237, 8.56228, 9.74236], + "rotation": {"angle": -45, "axis": "y", "origin": [7.96066, 5.05188, 8]}, + "faces": { + "north": {"uv": [6, 7.5, 6.75, 9.8125], "texture": "#1"}, + "east": {"uv": [6, 0, 6.9375, 2.3125], "texture": "#1"}, + "south": {"uv": [7, 7.5, 7.75, 9.8125], "texture": "#1"}, + "west": {"uv": [6, 2.5, 6.9375, 4.8125], "texture": "#1"}, + "up": {"uv": [11.75, 3.9375, 11, 3], "texture": "#1"}, + "down": {"uv": [11.75, 4, 11, 4.9375], "texture": "#1"} + } + }, + { + "from": [9.05729, 8.79, 7.6425], + "to": [9.42729, 9.26, 8.3575], + "rotation": {"angle": 0, "axis": "y", "origin": [7.96066, 5.05188, 8]}, + "faces": { + "north": {"uv": [14, 5, 14.1875, 5.25], "texture": "#1"}, + "east": {"uv": [10, 13.5, 10.375, 13.75], "texture": "#1"}, + "south": {"uv": [5.5, 14, 5.6875, 14.25], "texture": "#1"}, + "west": {"uv": [13.5, 10, 13.875, 10.25], "texture": "#1"}, + "up": {"uv": [13.6875, 13.875, 13.5, 13.5], "texture": "#1"}, + "down": {"uv": [14.1875, 0, 14, 0.375], "texture": "#1"} + } + }, + { + "from": [6.49403, 8.79, 7.6425], + "to": [6.86403, 9.26, 8.3575], + "rotation": {"angle": 0, "axis": "y", "origin": [7.96066, 5.05188, 8]}, + "faces": { + "north": {"uv": [14, 5.5, 14.1875, 5.75], "texture": "#1"}, + "east": {"uv": [13.5, 10.5, 13.875, 10.75], "texture": "#1"}, + "south": {"uv": [6.5, 14, 6.6875, 14.25], "texture": "#1"}, + "west": {"uv": [13.5, 11, 13.875, 11.25], "texture": "#1"}, + "up": {"uv": [14.1875, 0.875, 14, 0.5], "texture": "#1"}, + "down": {"uv": [14.1875, 1, 14, 1.375], "texture": "#1"} + } + }, + { + "from": [3.948, 6.9904, 7.6425], + "to": [4.318, 7.6604, 8.3575], + "rotation": {"angle": -45, "axis": "z", "origin": [7.96066, 5.05188, 8]}, + "faces": { + "north": {"uv": [14, 4, 14.1875, 4.3125], "texture": "#1"}, + "east": {"uv": [7.5, 13.5, 7.875, 13.8125], "texture": "#1"}, + "south": {"uv": [4.5, 14, 4.6875, 14.3125], "texture": "#1"}, + "west": {"uv": [13.5, 7.5, 13.875, 7.8125], "texture": "#1"}, + "up": {"uv": [14.1875, 1.875, 14, 1.5], "texture": "#1"}, + "down": {"uv": [2.1875, 14, 2, 14.375], "texture": "#1"} + } + }, + { + "from": [6.96779, 9.36376, 7.6425], + "to": [8.95279, 9.73376, 8.3575], + "rotation": {"angle": 0, "axis": "z", "origin": [7.96066, 5.05188, 8]}, + "faces": { + "north": {"uv": [13, 8, 14, 8.1875], "texture": "#1"}, + "east": {"uv": [2.5, 14, 2.875, 14.1875], "texture": "#1"}, + "south": {"uv": [13, 8.5, 14, 8.6875], "texture": "#1"}, + "west": {"uv": [3, 14, 3.375, 14.1875], "texture": "#1"}, + "up": {"uv": [1, 13.375, 0, 13], "texture": "#1"}, + "down": {"uv": [14, 0, 13, 0.375], "texture": "#1"} + } + }, + { + "from": [5.35214, 8.69454, 7.6425], + "to": [6.02214, 9.06454, 8.3575], + "rotation": {"angle": -45, "axis": "z", "origin": [7.96066, 5.05188, 8]}, + "faces": { + "north": {"uv": [14, 4.5, 14.3125, 4.6875], "texture": "#1"}, + "east": {"uv": [3.5, 14, 3.875, 14.1875], "texture": "#1"}, + "south": {"uv": [5, 14, 5.3125, 14.1875], "texture": "#1"}, + "west": {"uv": [4, 14, 4.375, 14.1875], "texture": "#1"}, + "up": {"uv": [13.8125, 9.375, 13.5, 9], "texture": "#1"}, + "down": {"uv": [13.8125, 9.5, 13.5, 9.875], "texture": "#1"} + } + } + ], + "gui_light": "front", + "display": { + "thirdperson_righthand": { + "rotation": [90, -90, 0], + "translation": [0, -2, -1.25], + "scale": [1.1, 1.1, 1.1] + }, + "thirdperson_lefthand": { + "rotation": [90, -90, 0], + "translation": [0, -2, -1.25], + "scale": [1.1, 1.1, 1.1] + }, + "firstperson_righthand": { + "rotation": [13, 36, -17], + "translation": [0.25, 6.75, -0.25], + "scale": [1.5, 1.5, 1.5] + }, + "firstperson_lefthand": { + "rotation": [13, 36, -17], + "translation": [0.25, 6.75, -0.25], + "scale": [1.5, 1.5, 1.5] + }, + "ground": { + "translation": [0, 1.5, 0], + "scale": [1.2, 1.2, 1.2] + }, + "gui": { + "rotation": [31, 7, -40], + "translation": [2.75, 1.75, 0], + "scale": [2, 2, 2] + }, + "head": { + "rotation": [0, -90, 0], + "translation": [0, 17.25, 0], + "scale": [2.5, 2.5, 2.5] + }, + "fixed": { + "rotation": [0, 90, 0], + "translation": [0.25, 2.75, -1.75], + "scale": [2, 2, 2] + } + }, + "groups": [ + { + "name": "group", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "group", + "origin": [0, 0, 0], + "color": 9, + "children": [0, 1, 2, 3, 4, 5, 6, 7] + }, + { + "name": "group", + "origin": [0, 0, 0], + "color": 9, + "children": [8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21] + }, + { + "name": "group", + "origin": [7.96066, 1.75, 8], + "color": 0, + "children": [22, 23, 24, 25, 26] + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/target/textures/item/sentinel.png b/src/main/resources/assets/target/textures/item/sentinel.png index 86910c752..99082350c 100644 Binary files a/src/main/resources/assets/target/textures/item/sentinel.png and b/src/main/resources/assets/target/textures/item/sentinel.png differ diff --git a/src/main/resources/assets/target/textures/item/shield_cell.png b/src/main/resources/assets/target/textures/item/shield_cell.png new file mode 100644 index 000000000..9bccc06f8 Binary files /dev/null and b/src/main/resources/assets/target/textures/item/shield_cell.png differ diff --git a/src/main/resources/data/target/recipes/shield_cell_crafting.json b/src/main/resources/data/target/recipes/shield_cell_crafting.json new file mode 100644 index 000000000..1584f0419 --- /dev/null +++ b/src/main/resources/data/target/recipes/shield_cell_crafting.json @@ -0,0 +1,30 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "pattern": [ + "aba", + "cdc", + "aea" + ], + "key": { + "a": { + "item": "minecraft:light_blue_concrete" + }, + "b": { + "item": "target:copperplate" + }, + "c": { + "tag": "forge:stained_glass_panes" + }, + "d": { + "item": "minecraft:redstone" + }, + "e": { + "item": "minecraft:iron_ingot" + } + }, + "result": { + "item": "target:shield_cell", + "count": 4 + } +} \ No newline at end of file