diff --git a/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 b/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 index 0a6a45ff0..b4e840abb 100644 --- a/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 +++ b/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 @@ -1,4 +1,4 @@ -// 1.20.1 2024-09-18T22:18:16.7858403 Item Models: superbwarfare +// 1.20.1 2024-09-25T01:00:24.9322237 Item Models: superbwarfare 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/aa_12_blueprint.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/ak_47_blueprint.json c993bddc0db9453ffbefa59f9ac9a74dba909038 assets/superbwarfare/models/item/ancient_cpu.json @@ -70,6 +70,7 @@ ce0f0949b0545d8ef08aeaa52dd423dbe592f704 assets/superbwarfare/models/item/raw_ce 5b8f7d5922e49e06bcd4d4d2a2a3dc934548570b assets/superbwarfare/models/item/reforging_table.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/rpg_blueprint.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/rpk_blueprint.json +0385b632f86e2ecfbc28433ca209aa9a1da9ec72 assets/superbwarfare/models/item/ru_6b47.json ce2232fbc6a9186371c6ae6745ec3be2a0a33546 assets/superbwarfare/models/item/scheelite.json c010baff106b3307ec585df4757f7c3d756e9794 assets/superbwarfare/models/item/seeker.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/sentinel_blueprint.json diff --git a/src/generated/resources/assets/superbwarfare/models/item/ru_6b47.json b/src/generated/resources/assets/superbwarfare/models/item/ru_6b47.json new file mode 100644 index 000000000..066429534 --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/item/ru_6b47.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "superbwarfare:item/ru_6b47" + } +} \ No newline at end of file diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/armor/Ru6b47Model.java b/src/main/java/net/mcreator/superbwarfare/client/model/armor/Ru6b47Model.java new file mode 100644 index 000000000..f9503e819 --- /dev/null +++ b/src/main/java/net/mcreator/superbwarfare/client/model/armor/Ru6b47Model.java @@ -0,0 +1,23 @@ +package net.mcreator.superbwarfare.client.model.armor; + +import net.mcreator.superbwarfare.ModUtils; +import net.mcreator.superbwarfare.item.armor.Ru6b47; +import net.minecraft.resources.ResourceLocation; +import software.bernie.geckolib.model.GeoModel; + +public class Ru6b47Model extends GeoModel { + @Override + public ResourceLocation getAnimationResource(Ru6b47 object) { + return null; + } + + @Override + public ResourceLocation getModelResource(Ru6b47 object) { + return new ResourceLocation(ModUtils.MODID, "geo/ru_6b47.geo.json"); + } + + @Override + public ResourceLocation getTextureResource(Ru6b47 object) { + return new ResourceLocation(ModUtils.MODID, "textures/armor/ru_6b47.png"); + } +} diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/armor/Ru6b47ArmorRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/armor/Ru6b47ArmorRenderer.java new file mode 100644 index 000000000..7ac481e3a --- /dev/null +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/armor/Ru6b47ArmorRenderer.java @@ -0,0 +1,21 @@ +package net.mcreator.superbwarfare.client.renderer.armor; + +import net.mcreator.superbwarfare.client.model.armor.Ru6b47Model; +import net.mcreator.superbwarfare.item.armor.Ru6b47; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.resources.ResourceLocation; +import software.bernie.geckolib.cache.object.GeoBone; +import software.bernie.geckolib.renderer.GeoArmorRenderer; + +public class Ru6b47ArmorRenderer extends GeoArmorRenderer { + public Ru6b47ArmorRenderer() { + super(new Ru6b47Model()); + this.head = new GeoBone(null, "", false, (double) 0, false, false); + } + + @Override + public RenderType getRenderType(Ru6b47 animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { + return RenderType.entityTranslucent(getTextureLocation(animatable)); + } +} diff --git a/src/main/java/net/mcreator/superbwarfare/datagen/ModItemModelProvider.java b/src/main/java/net/mcreator/superbwarfare/datagen/ModItemModelProvider.java index 9c8e2d88d..2eba3c9f3 100644 --- a/src/main/java/net/mcreator/superbwarfare/datagen/ModItemModelProvider.java +++ b/src/main/java/net/mcreator/superbwarfare/datagen/ModItemModelProvider.java @@ -85,6 +85,10 @@ public class ModItemModelProvider extends ItemModelProvider { simpleItem(ModItems.EPIC_MATERIAL_PACK); simpleItem(ModItems.LEGENDARY_MATERIAL_PACK); + // armor + + simpleItem(ModItems.RU_6B47); + // blueprints blueprintItem(ModItems.TRACHELIUM_BLUEPRINT); blueprintItem(ModItems.GLOCK_17_BLUEPRINT); diff --git a/src/main/java/net/mcreator/superbwarfare/entity/TargetEntity.java b/src/main/java/net/mcreator/superbwarfare/entity/TargetEntity.java index ee07c8e06..a67020020 100644 --- a/src/main/java/net/mcreator/superbwarfare/entity/TargetEntity.java +++ b/src/main/java/net/mcreator/superbwarfare/entity/TargetEntity.java @@ -83,6 +83,11 @@ public class TargetEntity extends LivingEntity implements GeoEntity, AnimatedEnt return false; } + @Override + public boolean shouldRenderAtSqrDistance(double pDistance) { + return true; + } + @Override public boolean hurt(DamageSource source, float amount) { if (source.is(DamageTypes.IN_FIRE) diff --git a/src/main/java/net/mcreator/superbwarfare/entity/projectile/RpgRocketEntity.java b/src/main/java/net/mcreator/superbwarfare/entity/projectile/RpgRocketEntity.java index 1a1faa8e9..70f738a28 100644 --- a/src/main/java/net/mcreator/superbwarfare/entity/projectile/RpgRocketEntity.java +++ b/src/main/java/net/mcreator/superbwarfare/entity/projectile/RpgRocketEntity.java @@ -114,11 +114,6 @@ public class RpgRocketEntity extends ThrowableItemProjectile implements GeoEntit this.discard(); } - @Override - public boolean isNoGravity() { - return true; - } - @Override public void onHitBlock(BlockHitResult blockHitResult) { super.onHitBlock(blockHitResult); @@ -186,7 +181,7 @@ public class RpgRocketEntity extends ThrowableItemProjectile implements GeoEntit @Override protected float getGravity() { - return 0.05F; + return 0.03F; } public String getSyncedAnimation() { diff --git a/src/main/java/net/mcreator/superbwarfare/init/ModItems.java b/src/main/java/net/mcreator/superbwarfare/init/ModItems.java index bc3b445b1..ce98aed52 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/ModItems.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModItems.java @@ -2,6 +2,7 @@ package net.mcreator.superbwarfare.init; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.item.*; +import net.mcreator.superbwarfare.item.armor.Ru6b47; import net.mcreator.superbwarfare.item.common.BlueprintItem; import net.mcreator.superbwarfare.item.common.MaterialPack; import net.mcreator.superbwarfare.item.common.ammo.*; @@ -25,6 +26,7 @@ import net.mcreator.superbwarfare.item.gun.sniper.*; import net.mcreator.superbwarfare.item.gun.special.BocekItem; import net.mcreator.superbwarfare.item.gun.special.TaserItem; import net.mcreator.superbwarfare.tools.RarityTool; +import net.minecraft.world.item.ArmorItem; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.Item; import net.minecraft.world.item.Rarity; @@ -121,6 +123,7 @@ public class ModItems { public static final RegistryObject KNIFE = ITEMS.register("knife", Knife::new); public static final RegistryObject HAMMER = ITEMS.register("hammer", Hammer::new); public static final RegistryObject CROWBAR = ITEMS.register("crowbar", Crowbar::new); + public static final RegistryObject RU_6B47 = ITEMS.register("ru_6b47", () -> new Ru6b47(ArmorItem.Type.HELMET, new Item.Properties())); public static final RegistryObject MORTAR_DEPLOYER = ITEMS.register("mortar_deployer", MortarDeployer::new); public static final RegistryObject MORTAR_BARREL = ITEMS.register("mortar_barrel", () -> new Item(new Item.Properties())); public static final RegistryObject MORTAR_BASE_PLATE = ITEMS.register("mortar_base_plate", () -> new Item(new Item.Properties())); diff --git a/src/main/java/net/mcreator/superbwarfare/item/armor/Ru6b47.java b/src/main/java/net/mcreator/superbwarfare/item/armor/Ru6b47.java new file mode 100644 index 000000000..66058517e --- /dev/null +++ b/src/main/java/net/mcreator/superbwarfare/item/armor/Ru6b47.java @@ -0,0 +1,100 @@ + +package net.mcreator.superbwarfare.item.armor; + +import net.mcreator.superbwarfare.client.renderer.armor.Ru6b47ArmorRenderer; +import net.minecraft.client.model.HumanoidModel; +import net.minecraft.network.chat.Component; +import net.minecraft.sounds.SoundEvent; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.world.entity.EquipmentSlot; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.*; +import net.minecraft.world.item.crafting.Ingredient; +import net.minecraft.world.level.Level; +import net.minecraftforge.client.extensions.common.IClientItemExtensions; +import software.bernie.geckolib.animatable.GeoItem; +import software.bernie.geckolib.core.animatable.instance.AnimatableInstanceCache; +import software.bernie.geckolib.core.animation.AnimatableManager; +import software.bernie.geckolib.renderer.GeoArmorRenderer; +import software.bernie.geckolib.util.GeckoLibUtil; + +import java.util.List; +import java.util.function.Consumer; + +public class Ru6b47 extends ArmorItem implements GeoItem { + private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); + public String animationprocedure = "empty"; + + public Ru6b47(ArmorItem.Type type, Item.Properties properties) { + super(new ArmorMaterial() { + @Override + public int getDurabilityForType(ArmorItem.Type type) { + return 500; + } + + @Override + public int getDefenseForType(ArmorItem.Type type) { + return 3; + } + + @Override + public int getEnchantmentValue() { + return 15; + } + + @Override + public SoundEvent getEquipSound() { + return SoundEvents.ARMOR_EQUIP_IRON; + } + + @Override + public Ingredient getRepairIngredient() { + return Ingredient.of(); + } + + @Override + public String getName() { + return "ru_6b47"; + } + + @Override + public float getToughness() { + return 4f; + } + + @Override + public float getKnockbackResistance() { + return 0f; + } + }, type, properties); + } + + @Override + public void initializeClient(Consumer consumer) { + consumer.accept(new IClientItemExtensions() { + private GeoArmorRenderer renderer; + + @Override + public HumanoidModel getHumanoidArmorModel(LivingEntity livingEntity, ItemStack itemStack, EquipmentSlot equipmentSlot, HumanoidModel original) { + if (this.renderer == null) + this.renderer = new Ru6b47ArmorRenderer(); + this.renderer.prepForRender(livingEntity, itemStack, equipmentSlot, original); + return this.renderer; + } + }); + } + + @Override + public void appendHoverText(ItemStack itemstack, Level world, List list, TooltipFlag flag) { + super.appendHoverText(itemstack, world, list, flag); + } + + @Override + public void registerControllers(AnimatableManager.ControllerRegistrar data) { + } + + @Override + public AnimatableInstanceCache getAnimatableInstanceCache() { + return this.cache; + } +} diff --git a/src/main/resources/assets/superbwarfare/geo/ru_6b47.geo.json b/src/main/resources/assets/superbwarfare/geo/ru_6b47.geo.json new file mode 100644 index 000000000..1994fe9ff --- /dev/null +++ b/src/main/resources/assets/superbwarfare/geo/ru_6b47.geo.json @@ -0,0 +1,622 @@ +{ + "format_version": "1.12.0", + "minecraft:geometry": [ + { + "description": { + "identifier": "geometry.ru_6b47", + "texture_width": 64, + "texture_height": 64, + "visible_bounds_width": 3, + "visible_bounds_height": 3.5, + "visible_bounds_offset": [0, 1.25, 0] + }, + "bones": [ + { + "name": "bipedHead", + "pivot": [0, 24, 0] + }, + { + "name": "armorHead", + "parent": "bipedHead", + "pivot": [0, 24, 0] + }, + { + "name": "bone", + "parent": "armorHead", + "pivot": [0, 29.75, 0], + "rotation": [0, 180, 0], + "cubes": [ + { + "origin": [4, 25.74217, -1.14233], + "size": [0.5, 1, 5.55], + "pivot": [5, 26.24217, 1.85767], + "rotation": [-67.5, 0, 0], + "uv": { + "north": {"uv": [5, 39], "uv_size": [0.5, 1]}, + "east": {"uv": [31, 25], "uv_size": [5.5, 1]}, + "south": {"uv": [6, 39], "uv_size": [0.5, 1]}, + "west": {"uv": [31, 26], "uv_size": [5.5, 1]}, + "up": {"uv": [13, 34], "uv_size": [0.5, 5.5]}, + "down": {"uv": [28, 39.5], "uv_size": [0.5, -5.5]} + } + }, + { + "origin": [-4.5, 25.74217, -1.14233], + "size": [0.5, 1, 5.55], + "pivot": [-5, 26.24217, 1.85767], + "rotation": [-67.5, 0, 0], + "uv": { + "north": {"uv": [39, 16], "uv_size": [0.5, 1]}, + "east": {"uv": [31, 27], "uv_size": [5.5, 1]}, + "south": {"uv": [17, 39], "uv_size": [0.5, 1]}, + "west": {"uv": [31, 28], "uv_size": [5.5, 1]}, + "up": {"uv": [19, 35], "uv_size": [0.5, 5.5]}, + "down": {"uv": [2, 41.5], "uv_size": [0.5, -5.5]} + } + }, + { + "origin": [-0.7, 22.27762, 0.29273], + "size": [0.4, 1, 9], + "pivot": [-1.5, 22.77762, 3.29273], + "rotation": [-90, 22.5, -90], + "uv": { + "north": {"uv": [39, 17], "uv_size": [0.5, 1]}, + "east": {"uv": [27, 9], "uv_size": [9, 1]}, + "south": {"uv": [18, 39], "uv_size": [0.5, 1]}, + "west": {"uv": [27, 13], "uv_size": [9, 1]}, + "up": {"uv": [11, 34], "uv_size": [0.5, 9]}, + "down": {"uv": [12, 43], "uv_size": [0.5, -9]} + } + }, + { + "origin": [3.5, 27.5, -4.5], + "size": [2, 3, 5], + "uv": { + "north": {"uv": [24, 30], "uv_size": [2, 3]}, + "east": {"uv": [10, 22], "uv_size": [5, 3]}, + "south": {"uv": [31, 22], "uv_size": [2, 3]}, + "west": {"uv": [15, 23], "uv_size": [5, 3]}, + "up": {"uv": [22, 25], "uv_size": [2, 5]}, + "down": {"uv": [24, 30], "uv_size": [2, -5]} + } + }, + { + "origin": [3.5, 28.34253, 0.66433], + "size": [2, 1.7, 0.6], + "pivot": [5, 29.84253, -1.23567], + "rotation": [-22.5, 0, 0], + "uv": { + "north": {"uv": [17, 35], "uv_size": [2, 1.5]}, + "east": {"uv": [38, 34], "uv_size": [0.5, 1.5]}, + "south": {"uv": [35, 18], "uv_size": [2, 1.5]}, + "west": {"uv": [38, 36], "uv_size": [0.5, 1.5]}, + "up": {"uv": [38, 21], "uv_size": [2, 0.5]}, + "down": {"uv": [38, 22.5], "uv_size": [2, -0.5]} + } + }, + { + "origin": [-5.5, 28.34253, 0.66433], + "size": [2, 1.7, 0.6], + "pivot": [-5, 29.84253, -1.23567], + "rotation": [-22.5, 0, 0], + "uv": { + "north": {"uv": [35, 20], "uv_size": [2, 1.5]}, + "east": {"uv": [38, 38], "uv_size": [0.5, 1.5]}, + "south": {"uv": [35, 30], "uv_size": [2, 1.5]}, + "west": {"uv": [39, 0], "uv_size": [0.5, 1.5]}, + "up": {"uv": [38, 23], "uv_size": [2, 0.5]}, + "down": {"uv": [24, 38.5], "uv_size": [2, -0.5]} + } + }, + { + "origin": [-5.5, 27.5, -4.5], + "size": [2, 3, 5], + "uv": { + "north": {"uv": [30, 6], "uv_size": [2, 3]}, + "east": {"uv": [0, 22], "uv_size": [5, 3]}, + "south": {"uv": [13, 30], "uv_size": [2, 3]}, + "west": {"uv": [5, 22], "uv_size": [5, 3]}, + "up": {"uv": [13, 25], "uv_size": [2, 5]}, + "down": {"uv": [20, 30], "uv_size": [2, -5]} + } + }, + { + "origin": [-5.5, 29, 0.5], + "size": [2, 1.5, 4], + "uv": { + "north": {"uv": [35, 5], "uv_size": [2, 1.5]}, + "east": {"uv": [31, 18], "uv_size": [4, 1.5]}, + "south": {"uv": [15, 35], "uv_size": [2, 1.5]}, + "west": {"uv": [31, 20], "uv_size": [4, 1.5]}, + "up": {"uv": [29, 22], "uv_size": [2, 4]}, + "down": {"uv": [29, 30], "uv_size": [2, -4]} + } + }, + { + "origin": [3.5, 29, 0.5], + "size": [2, 1.5, 4], + "uv": { + "north": {"uv": [26, 34], "uv_size": [2, 1.5]}, + "east": {"uv": [20, 30], "uv_size": [4, 1.5]}, + "south": {"uv": [35, 3], "uv_size": [2, 1.5]}, + "west": {"uv": [29, 30], "uv_size": [4, 1.5]}, + "up": {"uv": [27, 18], "uv_size": [2, 4]}, + "down": {"uv": [29, 22], "uv_size": [2, -4]} + } + }, + { + "origin": [-4.5, 27.5, -5.5], + "size": [9, 3, 2], + "uv": { + "north": {"uv": [0, 14], "uv_size": [9, 3]}, + "east": {"uv": [30, 0], "uv_size": [2, 3]}, + "south": {"uv": [9, 14], "uv_size": [9, 3]}, + "west": {"uv": [30, 3], "uv_size": [2, 3]}, + "up": {"uv": [18, 19], "uv_size": [9, 2]}, + "down": {"uv": [0, 22], "uv_size": [9, -2]} + } + }, + { + "origin": [-5.35355, 27.5, -5.14645], + "size": [1.41421, 3, 1], + "pivot": [-4.64645, 29.75, -4.64645], + "rotation": [0, 45, 0], + "uv": { + "north": {"uv": [29, 33], "uv_size": [1.5, 3]}, + "south": {"uv": [31, 33], "uv_size": [1.5, 3]}, + "up": {"uv": [16, 13], "uv_size": [1.5, 1]}, + "down": {"uv": [15, 23], "uv_size": [1.5, -1]} + } + }, + { + "origin": [3.93934, 27.5, -5.14645], + "size": [1.41421, 3, 1], + "pivot": [4.64645, 29.75, -4.64645], + "rotation": [0, -45, 0], + "uv": { + "north": {"uv": [33, 33], "uv_size": [1.5, 3]}, + "south": {"uv": [34, 0], "uv_size": [1.5, 3]}, + "up": {"uv": [27, 22], "uv_size": [1.5, 1]}, + "down": {"uv": [33, 25], "uv_size": [1.5, -1]} + } + }, + { + "origin": [3.93934, 29, 4.14645], + "size": [1.41421, 1.5, 1], + "pivot": [4.64645, 29.75, 4.64645], + "rotation": [0, 45, 0], + "uv": { + "north": {"uv": [37, 17], "uv_size": [1.5, 1.5]}, + "south": {"uv": [37, 19], "uv_size": [1.5, 1.5]}, + "up": {"uv": [35, 24], "uv_size": [1.5, 1]}, + "down": {"uv": [36, 30], "uv_size": [1.5, -1]} + } + }, + { + "origin": [-5.35355, 29, 4.14645], + "size": [1.41421, 1.5, 1], + "pivot": [-4.64645, 29.75, 4.64645], + "rotation": [0, -45, 0], + "uv": { + "north": {"uv": [15, 37], "uv_size": [1.5, 1.5]}, + "south": {"uv": [17, 37], "uv_size": [1.5, 1.5]}, + "up": {"uv": [34, 12], "uv_size": [1.5, 1]}, + "down": {"uv": [35, 8], "uv_size": [1.5, -1]} + } + }, + { + "origin": [-4.5, 29, 3.5], + "size": [9, 1.5, 2], + "uv": { + "north": {"uv": [20, 23], "uv_size": [9, 1.5]}, + "east": {"uv": [33, 30], "uv_size": [2, 1.5]}, + "south": {"uv": [0, 25], "uv_size": [9, 1.5]}, + "west": {"uv": [34, 10], "uv_size": [2, 1.5]}, + "up": {"uv": [9, 20], "uv_size": [9, 2]}, + "down": {"uv": [18, 23], "uv_size": [9, -2]} + } + } + ] + }, + { + "name": "bone2", + "parent": "bone", + "pivot": [-0.5, 33, -0.02513], + "cubes": [ + { + "origin": [5.81751, 29.38154, -0.45355], + "size": [1, 2.6, 0.7], + "pivot": [0, 31.64663, 0], + "rotation": [163.2692, -43.76124, -168.25487], + "uv": { + "north": {"uv": [36, 15], "uv_size": [1, 2.5]}, + "east": {"uv": [20, 37], "uv_size": [0.5, 2.5]}, + "south": {"uv": [26, 36], "uv_size": [1, 2.5]}, + "west": {"uv": [21, 37], "uv_size": [0.5, 2.5]}, + "up": {"uv": [39, 6], "uv_size": [1, 0.5]}, + "down": {"uv": [7, 39.5], "uv_size": [1, -0.5]} + } + }, + { + "origin": [-6.81751, 29.38154, -0.45355], + "size": [1, 2.6, 0.7], + "pivot": [0, 31.64663, 0], + "rotation": [163.2692, 43.76124, 168.25487], + "uv": { + "north": {"uv": [27, 36], "uv_size": [1, 2.5]}, + "east": {"uv": [22, 37], "uv_size": [0.5, 2.5]}, + "south": {"uv": [29, 36], "uv_size": [1, 2.5]}, + "west": {"uv": [23, 37], "uv_size": [0.5, 2.5]}, + "up": {"uv": [39, 7], "uv_size": [1, 0.5]}, + "down": {"uv": [8, 39.5], "uv_size": [1, -0.5]} + } + }, + { + "origin": [-6.81751, 29.38154, -0.24645], + "size": [1, 2.6, 0.7], + "pivot": [0, 31.64663, 0], + "rotation": [-163.2692, -43.76124, 168.25487], + "uv": { + "north": {"uv": [32, 36], "uv_size": [1, 2.5]}, + "east": {"uv": [37, 33], "uv_size": [0.5, 2.5]}, + "south": {"uv": [33, 36], "uv_size": [1, 2.5]}, + "west": {"uv": [37, 36], "uv_size": [0.5, 2.5]}, + "up": {"uv": [39, 9], "uv_size": [1, 0.5]}, + "down": {"uv": [10, 39.5], "uv_size": [1, -0.5]} + } + }, + { + "origin": [5.81751, 29.38154, -0.24645], + "size": [1, 2.6, 0.7], + "pivot": [0, 31.64663, 0], + "rotation": [-163.2692, 43.76124, -168.25487], + "uv": { + "north": {"uv": [30, 36], "uv_size": [1, 2.5]}, + "east": {"uv": [37, 24], "uv_size": [0.5, 2.5]}, + "south": {"uv": [31, 36], "uv_size": [1, 2.5]}, + "west": {"uv": [37, 30], "uv_size": [0.5, 2.5]}, + "up": {"uv": [39, 8], "uv_size": [1, 0.5]}, + "down": {"uv": [9, 39.5], "uv_size": [1, -0.5]} + } + }, + { + "origin": [5.81751, 29.38154, -0.24645], + "size": [1, 2.6, 0.7], + "pivot": [0, 31.64663, 0], + "rotation": [0, 45, -12], + "uv": { + "north": {"uv": [37, 11], "uv_size": [1, 2.5]}, + "east": {"uv": [38, 12], "uv_size": [0.5, 2.5]}, + "south": {"uv": [37, 14], "uv_size": [1, 2.5]}, + "west": {"uv": [14, 38], "uv_size": [0.5, 2.5]}, + "up": {"uv": [39, 15], "uv_size": [1, 0.5]}, + "down": {"uv": [16, 39.5], "uv_size": [1, -0.5]} + } + }, + { + "origin": [-6.81751, 29.38154, -0.24645], + "size": [1, 2.6, 0.7], + "pivot": [0, 31.64663, 0], + "rotation": [-180, 45, 168], + "uv": { + "north": {"uv": [37, 5], "uv_size": [1, 2.5]}, + "east": {"uv": [38, 6], "uv_size": [0.5, 2.5]}, + "south": {"uv": [37, 8], "uv_size": [1, 2.5]}, + "west": {"uv": [38, 9], "uv_size": [0.5, 2.5]}, + "up": {"uv": [39, 14], "uv_size": [1, 0.5]}, + "down": {"uv": [15, 39.5], "uv_size": [1, -0.5]} + } + }, + { + "origin": [5.81751, 29.38154, -0.45355], + "size": [1, 2.6, 0.7], + "pivot": [0, 31.64663, 0], + "rotation": [180, 45, -168], + "uv": { + "north": {"uv": [36, 36], "uv_size": [1, 2.5]}, + "east": {"uv": [1, 38], "uv_size": [0.5, 2.5]}, + "south": {"uv": [37, 2], "uv_size": [1, 2.5]}, + "west": {"uv": [38, 3], "uv_size": [0.5, 2.5]}, + "up": {"uv": [39, 12], "uv_size": [1, 0.5]}, + "down": {"uv": [39, 13.5], "uv_size": [1, -0.5]} + } + }, + { + "origin": [-6.81751, 29.38154, -0.45355], + "size": [1, 2.6, 0.7], + "pivot": [0, 31.64663, 0], + "rotation": [0, 45, 12], + "uv": { + "north": {"uv": [34, 36], "uv_size": [1, 2.5]}, + "east": {"uv": [0, 38], "uv_size": [0.5, 2.5]}, + "south": {"uv": [35, 36], "uv_size": [1, 2.5]}, + "west": {"uv": [38, 0], "uv_size": [0.5, 2.5]}, + "up": {"uv": [39, 10], "uv_size": [1, 0.5]}, + "down": {"uv": [39, 11.5], "uv_size": [1, -0.5]} + } + }, + { + "origin": [-5.24064, 30.36764, -4.5], + "size": [1, 2.6, 9], + "pivot": [-4.74064, 31.66764, 0], + "rotation": [0, 0, 12], + "uv": { + "north": {"uv": [3, 36], "uv_size": [1, 2.5]}, + "east": {"uv": [16, 10], "uv_size": [9, 2.5]}, + "south": {"uv": [4, 36], "uv_size": [1, 2.5]}, + "west": {"uv": [0, 17], "uv_size": [9, 2.5]}, + "up": {"uv": [15, 26], "uv_size": [1, 9]}, + "down": {"uv": [16, 35], "uv_size": [1, -9]} + } + }, + { + "origin": [-5.34064, 30.86764, -2.5], + "size": [1.1, 1, 5], + "pivot": [-4.74064, 31.66764, 0], + "rotation": [0, 0, 12], + "uv": { + "north": {"uv": [38, 24], "uv_size": [1, 1]}, + "east": {"uv": [31, 29], "uv_size": [5, 1]}, + "south": {"uv": [38, 25], "uv_size": [1, 1]}, + "west": {"uv": [32, 8], "uv_size": [5, 1]}, + "up": {"uv": [20, 32], "uv_size": [1, 5]}, + "down": {"uv": [21, 37], "uv_size": [1, -5]} + } + }, + { + "origin": [4.24064, 30.86764, -2.5], + "size": [1.1, 1, 5], + "pivot": [4.74064, 31.66764, 0], + "rotation": [0, 0, -12], + "uv": { + "north": {"uv": [38, 26], "uv_size": [1, 1]}, + "east": {"uv": [29, 32], "uv_size": [5, 1]}, + "south": {"uv": [38, 27], "uv_size": [1, 1]}, + "west": {"uv": [9, 33], "uv_size": [5, 1]}, + "up": {"uv": [22, 32], "uv_size": [1, 5]}, + "down": {"uv": [23, 37], "uv_size": [1, -5]} + } + }, + { + "origin": [4.1959, 29.87582, -2.5], + "size": [1.1, 1, 5], + "pivot": [0, 31.38459, 0], + "rotation": [-90, 78, -90], + "uv": { + "north": {"uv": [38, 28], "uv_size": [1, 1]}, + "east": {"uv": [33, 22], "uv_size": [5, 1]}, + "south": {"uv": [38, 29], "uv_size": [1, 1]}, + "west": {"uv": [33, 23], "uv_size": [5, 1]}, + "up": {"uv": [14, 33], "uv_size": [1, 5]}, + "down": {"uv": [24, 38], "uv_size": [1, -5]} + } + }, + { + "origin": [4.24064, 30.36764, -4.5], + "size": [1, 2.6, 9], + "pivot": [4.74064, 31.66764, 0], + "rotation": [0, 0, -12], + "uv": { + "north": {"uv": [5, 36], "uv_size": [1, 2.5]}, + "east": {"uv": [9, 17], "uv_size": [9, 2.5]}, + "south": {"uv": [6, 36], "uv_size": [1, 2.5]}, + "west": {"uv": [18, 0], "uv_size": [9, 2.5]}, + "up": {"uv": [0, 27], "uv_size": [1, 9]}, + "down": {"uv": [27, 9], "uv_size": [1, -9]} + } + }, + { + "origin": [4.13705, 29.382, -4.5], + "size": [1, 2.6, 9], + "pivot": [0, 31.66764, 0], + "rotation": [90, -78, -90], + "uv": { + "north": {"uv": [36, 9], "uv_size": [1, 2.5]}, + "east": {"uv": [18, 13], "uv_size": [9, 2.5]}, + "south": {"uv": [36, 12], "uv_size": [1, 2.5]}, + "west": {"uv": [18, 16], "uv_size": [9, 2.5]}, + "up": {"uv": [3, 27], "uv_size": [1, 9]}, + "down": {"uv": [4, 36], "uv_size": [1, -9]} + } + }, + { + "origin": [5.13705, 28.882, -4], + "size": [1.25, 3.35, 8], + "pivot": [0, 31.66764, 0], + "rotation": [90, -78, -90], + "uv": { + "north": {"uv": [32, 0], "uv_size": [1.5, 3.5]}, + "east": {"uv": [0, 10], "uv_size": [8, 3.5]}, + "south": {"uv": [32, 4], "uv_size": [1.5, 3.5]}, + "west": {"uv": [8, 10], "uv_size": [8, 3.5]}, + "up": {"uv": [9, 25], "uv_size": [1.5, 8]}, + "down": {"uv": [11, 33], "uv_size": [1.5, -8]} + } + }, + { + "origin": [3.05064, 31.06366, 5.54193], + "size": [2.15, 1.45, 0.2], + "pivot": [4.37564, 32.53866, 5.59193], + "rotation": [157.27611, -57.43704, -160.5588], + "uv": { + "north": {"uv": [35, 32], "uv_size": [2, 1.5]}, + "east": {"uv": [39, 2], "uv_size": [0.5, 1.5]}, + "south": {"uv": [35, 34], "uv_size": [2, 1.5]}, + "west": {"uv": [3, 39], "uv_size": [0.5, 1.5]}, + "up": {"uv": [38, 30], "uv_size": [2, 0.5]}, + "down": {"uv": [38, 31.5], "uv_size": [2, -0.5]} + } + }, + { + "origin": [-5.20064, 31.06366, 5.54193], + "size": [2.15, 1.45, 0.2], + "pivot": [-4.37564, 32.53866, 5.59193], + "rotation": [157.27611, 57.43704, 160.5588], + "uv": { + "north": {"uv": [0, 36], "uv_size": [2, 1.5]}, + "east": {"uv": [4, 39], "uv_size": [0.5, 1.5]}, + "south": {"uv": [36, 0], "uv_size": [2, 1.5]}, + "west": {"uv": [39, 4], "uv_size": [0.5, 1.5]}, + "up": {"uv": [38, 32], "uv_size": [2, 0.5]}, + "down": {"uv": [38, 33.5], "uv_size": [2, -0.5]} + } + }, + { + "origin": [-5.13705, 29.382, -4.5], + "size": [1, 2.6, 9], + "pivot": [0, 31.66764, 0], + "rotation": [-90, -78, 90], + "uv": { + "north": {"uv": [7, 36], "uv_size": [1, 2.5]}, + "east": {"uv": [18, 3], "uv_size": [9, 2.5]}, + "south": {"uv": [8, 36], "uv_size": [1, 2.5]}, + "west": {"uv": [18, 6], "uv_size": [9, 2.5]}, + "up": {"uv": [1, 27], "uv_size": [1, 9]}, + "down": {"uv": [2, 36], "uv_size": [1, -9]} + } + }, + { + "origin": [-4.60622, 28.84914, -4.3], + "size": [1, 1, 8.6], + "pivot": [0.27983, 31.37252, 0], + "rotation": [0, 0, 45], + "uv": { + "north": {"uv": [17, 22], "uv_size": [1, 1]}, + "east": {"uv": [27, 14], "uv_size": [8.5, 1]}, + "south": {"uv": [34, 32], "uv_size": [1, 1]}, + "west": {"uv": [27, 15], "uv_size": [8.5, 1]}, + "up": {"uv": [27, 25], "uv_size": [1, 8.5]}, + "down": {"uv": [28, 8.5], "uv_size": [1, -8.5]} + } + }, + { + "origin": [3.60622, 28.84914, -4.3], + "size": [1, 1, 8.6], + "pivot": [-0.27983, 31.37252, 0], + "rotation": [0, 0, -45], + "uv": { + "north": {"uv": [36, 2], "uv_size": [1, 1]}, + "east": {"uv": [27, 16], "uv_size": [8.5, 1]}, + "south": {"uv": [37, 21], "uv_size": [1, 1]}, + "west": {"uv": [27, 17], "uv_size": [8.5, 1]}, + "up": {"uv": [28, 25], "uv_size": [1, 8.5]}, + "down": {"uv": [29, 8.5], "uv_size": [1, -8.5]} + } + }, + { + "origin": [2.38233, 29.66085, -4.32391], + "size": [1, 1, 9], + "pivot": [0, 33.04318, 0.17609], + "rotation": [90, -45, -90], + "uv": { + "north": {"uv": [38, 15], "uv_size": [1, 1]}, + "east": {"uv": [25, 11], "uv_size": [9, 1]}, + "south": {"uv": [38, 16], "uv_size": [1, 1]}, + "west": {"uv": [25, 12], "uv_size": [9, 1]}, + "up": {"uv": [19, 26], "uv_size": [1, 9]}, + "down": {"uv": [26, 34], "uv_size": [1, -9]} + } + }, + { + "origin": [-0.5, 32.84471, -0.8269], + "size": [1, 4.32422, 9], + "pivot": [0, 33.34471, 3.6731], + "rotation": [90, -10, -90], + "uv": { + "north": {"uv": [25, 33], "uv_size": [1, 4.5]}, + "east": {"uv": [0, 0], "uv_size": [9, 4.5]}, + "south": {"uv": [34, 3], "uv_size": [1, 4.5]}, + "west": {"uv": [0, 5], "uv_size": [9, 4.5]}, + "up": {"uv": [5, 27], "uv_size": [1, 9]}, + "down": {"uv": [6, 36], "uv_size": [1, -9]} + } + }, + { + "origin": [-0.5, 32.84471, -8.1731], + "size": [1, 4.32422, 9], + "pivot": [0, 33.34471, -3.6731], + "rotation": [-90, 10, -90], + "uv": { + "north": {"uv": [9, 34], "uv_size": [1, 4.5]}, + "east": {"uv": [9, 0], "uv_size": [9, 4.5]}, + "south": {"uv": [10, 34], "uv_size": [1, 4.5]}, + "west": {"uv": [9, 5], "uv_size": [9, 4.5]}, + "up": {"uv": [7, 27], "uv_size": [1, 9]}, + "down": {"uv": [8, 36], "uv_size": [1, -9]} + } + }, + { + "origin": [-3.38233, 29.66085, -4.67609], + "size": [1, 1, 9], + "pivot": [0, 33.04318, -0.17609], + "rotation": [-90, -45, 90], + "uv": { + "north": {"uv": [37, 27], "uv_size": [1, 1]}, + "east": {"uv": [18, 9], "uv_size": [9, 1]}, + "south": {"uv": [37, 28], "uv_size": [1, 1]}, + "west": {"uv": [25, 10], "uv_size": [9, 1]}, + "up": {"uv": [17, 26], "uv_size": [1, 9]}, + "down": {"uv": [18, 35], "uv_size": [1, -9]} + } + } + ] + }, + { + "name": "bipedBody", + "pivot": [0, 24, 0] + }, + { + "name": "armorBody", + "parent": "bipedBody", + "pivot": [0, 24, 0] + }, + { + "name": "bipedLeftArm", + "pivot": [-4, 22, 0] + }, + { + "name": "armorLeftArm", + "parent": "bipedLeftArm", + "pivot": [-4, 22, 0] + }, + { + "name": "bipedRightArm", + "pivot": [4, 22, 0] + }, + { + "name": "armorRightArm", + "parent": "bipedRightArm", + "pivot": [4, 22, 0] + }, + { + "name": "bipedLeftLeg", + "pivot": [-2, 12, 0] + }, + { + "name": "armorLeftLeg", + "parent": "bipedLeftLeg", + "pivot": [-2, 12, 0] + }, + { + "name": "armorLeftBoot", + "parent": "bipedLeftLeg", + "pivot": [-2, 12, 0] + }, + { + "name": "bipedRightLeg", + "pivot": [2, 12, 0] + }, + { + "name": "armorRightLeg", + "parent": "bipedRightLeg", + "pivot": [2, 12, 0] + }, + { + "name": "armorRightBoot", + "parent": "bipedRightLeg", + "pivot": [2, 12, 0] + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/lang/en_us.json b/src/main/resources/assets/superbwarfare/lang/en_us.json index aa06b2460..4054f40b7 100644 --- a/src/main/resources/assets/superbwarfare/lang/en_us.json +++ b/src/main/resources/assets/superbwarfare/lang/en_us.json @@ -204,6 +204,8 @@ "item.superbwarfare.scheelite": "Raw Galena", "item.superbwarfare.raw_silver": "Raw Silver", + "item.superbwarfare.ru_6b47": "Russia 6b47 Helmet", + "item.superbwarfare.ap_bullet": "Ap Bullet", "des.superbwarfare.ap_bullet": "Increased the armor-piercing ratio of bullets", "item.superbwarfare.silver_bullet": "Silver Bullet", diff --git a/src/main/resources/assets/superbwarfare/lang/zh_cn.json b/src/main/resources/assets/superbwarfare/lang/zh_cn.json index 3765eb2c6..4950e3633 100644 --- a/src/main/resources/assets/superbwarfare/lang/zh_cn.json +++ b/src/main/resources/assets/superbwarfare/lang/zh_cn.json @@ -204,6 +204,8 @@ "item.superbwarfare.scheelite": "白钨矿", "item.superbwarfare.raw_silver": "粗银", + "item.superbwarfare.ru_6b47": "俄罗斯6B47头盔", + "item.superbwarfare.ap_bullet": "穿甲弹", "des.superbwarfare.ap_bullet": "增加子弹的穿甲比例", "item.superbwarfare.silver_bullet": "银弹", diff --git a/src/main/resources/assets/superbwarfare/textures/armor/ru_6b47.png b/src/main/resources/assets/superbwarfare/textures/armor/ru_6b47.png new file mode 100644 index 000000000..edbe250f0 Binary files /dev/null and b/src/main/resources/assets/superbwarfare/textures/armor/ru_6b47.png differ diff --git a/src/main/resources/assets/superbwarfare/textures/item/ru_6b47.png b/src/main/resources/assets/superbwarfare/textures/item/ru_6b47.png new file mode 100644 index 000000000..562b25565 Binary files /dev/null and b/src/main/resources/assets/superbwarfare/textures/item/ru_6b47.png differ diff --git a/src/main/resources/data/superbwarfare/recipes/helmet_ru_6b47_crafting.json b/src/main/resources/data/superbwarfare/recipes/helmet_ru_6b47_crafting.json new file mode 100644 index 000000000..67bd37254 --- /dev/null +++ b/src/main/resources/data/superbwarfare/recipes/helmet_ru_6b47_crafting.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "pattern": [ + "aaa", + "aba" + ], + "key": { + "a": { + "item": "superbwarfare:cemented_carbide_ingot" + }, + "b": { + "tag": "forge:dyes/green" + } + }, + "result": { + "item": "superbwarfare:ru_6b47", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/high_energy_explosives_crafting.json b/src/main/resources/data/superbwarfare/recipes/high_energy_explosives_crafting.json index 6128f293f..adc478cee 100644 --- a/src/main/resources/data/superbwarfare/recipes/high_energy_explosives_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/high_energy_explosives_crafting.json @@ -11,14 +11,14 @@ "item": "minecraft:gunpowder" }, "b": { - "item": "minecraft:glowstone_dust" + "item": "minecraft:sugar" }, "c": { - "item": "minecraft:blaze_powder" + "tag": "forge:sand" } }, "result": { "item": "superbwarfare:high_energy_explosives", - "count": 1 + "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/shield_cell_crafting.json b/src/main/resources/data/superbwarfare/recipes/shield_cell_crafting.json index 1d50db2b4..9e4c251ed 100644 --- a/src/main/resources/data/superbwarfare/recipes/shield_cell_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/shield_cell_crafting.json @@ -11,7 +11,7 @@ "item": "minecraft:light_blue_concrete" }, "b": { - "item": "superbwarfare:copper_plate" + "tag": "forge:plates/copper" }, "c": { "tag": "forge:stained_glass_panes"