注册重型子弹
This commit is contained in:
parent
0b68f9a422
commit
7e1da659f0
10 changed files with 44 additions and 4 deletions
|
@ -1,8 +1,9 @@
|
|||
// 1.20.1 2024-12-06T23:44:15.5221819 Item Models: superbwarfare
|
||||
// 1.20.1 2024-12-15T19:19:44.8184797 Item Models: superbwarfare
|
||||
13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/aa_12_blueprint.json
|
||||
13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/ak_12_blueprint.json
|
||||
13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/ak_47_blueprint.json
|
||||
c993bddc0db9453ffbefa59f9ac9a74dba909038 assets/superbwarfare/models/item/ancient_cpu.json
|
||||
13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/annihilator_blueprint.json
|
||||
4b8fe8fbe5e64c3449ad539317254e4ed7188411 assets/superbwarfare/models/item/ap_head.json
|
||||
984c08ca6f6893a15721a85e30118f9e32c65c7f assets/superbwarfare/models/item/barbed_wire.json
|
||||
e8f16946c6f9429989d05e9ec250a72ffc64f9e1 assets/superbwarfare/models/item/beam_test.json
|
||||
|
@ -31,6 +32,7 @@ c102839d5f7d4bdc1c6cbfbf4c2c907b70f22052 assets/superbwarfare/models/item/fusee.
|
|||
13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/glock_17_blueprint.json
|
||||
13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/glock_18_blueprint.json
|
||||
8752c2b2b648ff23d6b93eedcc6c0500c695afd7 assets/superbwarfare/models/item/grain.json
|
||||
afbfd24461fb7e6b43a8e029f0a894b84d8b6638 assets/superbwarfare/models/item/heavy_ammo.json
|
||||
e7a6de100f377835831211168d98c8d19434af24 assets/superbwarfare/models/item/he_head.json
|
||||
d23520b099cb796401635fe75b5b852fc957d4ea assets/superbwarfare/models/item/high_energy_explosives.json
|
||||
13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/hk_416_blueprint.json
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"parent": "minecraft:item/generated",
|
||||
"textures": {
|
||||
"layer0": "superbwarfare:item/cannon_blueprint"
|
||||
"layer0": "superbwarfare:item/gun_blueprint"
|
||||
}
|
||||
}
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"parent": "minecraft:item/generated",
|
||||
"textures": {
|
||||
"layer0": "superbwarfare:item/heavy_ammo"
|
||||
}
|
||||
}
|
|
@ -64,6 +64,7 @@ public class ModItemModelProvider extends ItemModelProvider {
|
|||
simpleItem(ModItems.CROWBAR);
|
||||
simpleItem(ModItems.FIRING_PARAMETERS);
|
||||
simpleItem(ModItems.BEAM_TEST);
|
||||
simpleItem(ModItems.HEAVY_AMMO);
|
||||
|
||||
simpleItem(ModItems.TUNGSTEN_ROD);
|
||||
simpleItem(ModItems.IRON_BARREL);
|
||||
|
|
|
@ -244,6 +244,7 @@ public class SpeedboatEntity extends Entity implements GeoEntity, IChargeEntity,
|
|||
|
||||
@Override
|
||||
public InteractionResult interact(Player player, InteractionHand hand) {
|
||||
if (player.getVehicle() == this) return InteractionResult.PASS;
|
||||
if (player.isShiftKeyDown()) {
|
||||
if (player.getMainHandItem().is(ModItems.CROWBAR.get()) && this.getFirstPassenger() == null) {
|
||||
ItemStack stack = ContainerBlockItem.createInstance(this);
|
||||
|
@ -350,7 +351,7 @@ public class SpeedboatEntity extends Entity implements GeoEntity, IChargeEntity,
|
|||
* 机枪塔开火
|
||||
*/
|
||||
private void gunnerFire() {
|
||||
if (this.entityData.get(COOL_DOWN) != 0 || cannotFire) return;
|
||||
if (this.entityData.get(COOL_DOWN) != 0 || cannotFire || !this.getItemStacks().contains(ModItems.HEAVY_AMMO.get())) return;
|
||||
Entity driver = this.getFirstPassenger();
|
||||
if (driver == null) return;
|
||||
|
||||
|
@ -553,7 +554,7 @@ public class SpeedboatEntity extends Entity implements GeoEntity, IChargeEntity,
|
|||
if (this.hasPassenger(pPassenger)) {
|
||||
double posY = this.getY() + this.getPassengersRidingOffset() + pPassenger.getMyRidingOffset();
|
||||
|
||||
if (!zooming()) {
|
||||
if (!zooming() && (this.isInWater() || this.isUnderWater())) {
|
||||
pPassenger.setYRot(pPassenger.getYRot() - 1.27f * this.entityData.get(DELTA_ROT));
|
||||
pPassenger.setYHeadRot(pPassenger.getYHeadRot() - 1.27f * this.entityData.get(DELTA_ROT));
|
||||
}
|
||||
|
|
|
@ -104,6 +104,7 @@ public class ModItems {
|
|||
public static final RegistryObject<Item> HAND_GRENADE = AMMO.register("hand_grenade", HandGrenade::new);
|
||||
public static final RegistryObject<Item> RGO_GRENADE = AMMO.register("rgo_grenade", RgoGrenade::new);
|
||||
public static final RegistryObject<Item> CLAYMORE_MINE = AMMO.register("claymore_mine", ClaymoreMine::new);
|
||||
public static final RegistryObject<Item> HEAVY_AMMO = AMMO.register("heavy_ammo", () -> new Item(new Item.Properties()));
|
||||
public static final RegistryObject<Item> BEAM_TEST = AMMO.register("beam_test", BeamTest::new);
|
||||
|
||||
/**
|
||||
|
|
|
@ -151,6 +151,7 @@
|
|||
"item.superbwarfare.he_5_inches": "HE Shell",
|
||||
"item.superbwarfare.ap_5_inches": "AP Shell",
|
||||
"item.superbwarfare.javelin_missile": "Javelin Missile",
|
||||
"item.superbwarfare.heavy_ammo": "Heavy Ammo",
|
||||
|
||||
"block.superbwarfare.container": "Container",
|
||||
"des.superbwarfare.container.empty": "空的",
|
||||
|
|
|
@ -151,6 +151,7 @@
|
|||
"item.superbwarfare.he_5_inches": "高爆弹",
|
||||
"item.superbwarfare.ap_5_inches": "穿甲弹",
|
||||
"item.superbwarfare.javelin_missile": "标枪导弹",
|
||||
"item.superbwarfare.heavy_ammo": "重型弹药",
|
||||
|
||||
"block.superbwarfare.container": "集装箱",
|
||||
"des.superbwarfare.container.empty": "空的",
|
||||
|
|
Binary file not shown.
After Width: | Height: | Size: 557 B |
|
@ -0,0 +1,27 @@
|
|||
{
|
||||
"type": "minecraft:crafting_shaped",
|
||||
"category": "misc",
|
||||
"pattern": [
|
||||
" a ",
|
||||
"bcb",
|
||||
" d "
|
||||
],
|
||||
"key": {
|
||||
"a": {
|
||||
"tag":"forge:ingots/steel"
|
||||
},
|
||||
"b": {
|
||||
"tag": "forge:ingots/copper"
|
||||
},
|
||||
"c": {
|
||||
"item": "minecraft:gunpowder"
|
||||
},
|
||||
"d": {
|
||||
"item": "superbwarfare:primer"
|
||||
}
|
||||
},
|
||||
"result": {
|
||||
"item": "superbwarfare:rifle_ammo",
|
||||
"count": 4
|
||||
}
|
||||
}
|
Loading…
Add table
Reference in a new issue