调整部分物品命名#2
This commit is contained in:
parent
a215afc474
commit
b2f72ab7db
21 changed files with 62 additions and 62 deletions
|
@ -5,7 +5,7 @@
|
||||||
"superbwarfare:glock_18",
|
"superbwarfare:glock_18",
|
||||||
"superbwarfare:mp_443",
|
"superbwarfare:mp_443",
|
||||||
"superbwarfare:m_1911",
|
"superbwarfare:m_1911",
|
||||||
"superbwarfare:abekiri",
|
"superbwarfare:homemade_shotgun",
|
||||||
"superbwarfare:trachelium",
|
"superbwarfare:trachelium",
|
||||||
"superbwarfare:vector",
|
"superbwarfare:vector",
|
||||||
"superbwarfare:ak_47",
|
"superbwarfare:ak_47",
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"values": [
|
"values": [
|
||||||
"superbwarfare:abekiri",
|
"superbwarfare:homemade_shotgun",
|
||||||
"superbwarfare:ak_47",
|
"superbwarfare:ak_47",
|
||||||
"superbwarfare:ak_12",
|
"superbwarfare:ak_12",
|
||||||
"superbwarfare:svd",
|
"superbwarfare:svd",
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"values": [
|
"values": [
|
||||||
"superbwarfare:abekiri",
|
"superbwarfare:homemade_shotgun",
|
||||||
"superbwarfare:m_870",
|
"superbwarfare:m_870",
|
||||||
"superbwarfare:aa_12"
|
"superbwarfare:aa_12"
|
||||||
]
|
]
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"values": [
|
"values": [
|
||||||
"superbwarfare:abekiri",
|
"superbwarfare:homemade_shotgun",
|
||||||
"superbwarfare:m_870",
|
"superbwarfare:m_870",
|
||||||
"superbwarfare:aa_12"
|
"superbwarfare:aa_12"
|
||||||
]
|
]
|
||||||
|
|
|
@ -12,10 +12,11 @@ import software.bernie.geckolib.cache.object.BakedGeoModel;
|
||||||
import software.bernie.geckolib.renderer.GeoRenderer;
|
import software.bernie.geckolib.renderer.GeoRenderer;
|
||||||
import software.bernie.geckolib.renderer.layer.GeoRenderLayer;
|
import software.bernie.geckolib.renderer.layer.GeoRenderLayer;
|
||||||
|
|
||||||
public class AbekiriLayer extends GeoRenderLayer<HomemadeShotgunItem> {
|
public class HomemadeShotgunLayer extends GeoRenderLayer<HomemadeShotgunItem> {
|
||||||
private static final ResourceLocation LAYER = ModUtils.loc("textures/item/abekiri_e.png");
|
|
||||||
|
|
||||||
public AbekiriLayer(GeoRenderer<HomemadeShotgunItem> entityRenderer) {
|
private static final ResourceLocation LAYER = ModUtils.loc("textures/item/homemade_shotgun_e.png");
|
||||||
|
|
||||||
|
public HomemadeShotgunLayer(GeoRenderer<HomemadeShotgunItem> entityRenderer) {
|
||||||
super(entityRenderer);
|
super(entityRenderer);
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,21 +15,21 @@ import software.bernie.geckolib.core.animatable.model.CoreGeoBone;
|
||||||
import software.bernie.geckolib.core.animation.AnimationState;
|
import software.bernie.geckolib.core.animation.AnimationState;
|
||||||
import software.bernie.geckolib.model.GeoModel;
|
import software.bernie.geckolib.model.GeoModel;
|
||||||
|
|
||||||
public class AbekiriItemModel extends GeoModel<HomemadeShotgunItem> {
|
public class HomemadeShotgunItemModel extends GeoModel<HomemadeShotgunItem> {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ResourceLocation getAnimationResource(HomemadeShotgunItem animatable) {
|
public ResourceLocation getAnimationResource(HomemadeShotgunItem animatable) {
|
||||||
return ModUtils.loc("animations/abekiri.animation.json");
|
return ModUtils.loc("animations/homemade_shotgun.animation.json");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ResourceLocation getModelResource(HomemadeShotgunItem animatable) {
|
public ResourceLocation getModelResource(HomemadeShotgunItem animatable) {
|
||||||
return ModUtils.loc("geo/abekiri.geo.json");
|
return ModUtils.loc("geo/homemade_shotgun.geo.json");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ResourceLocation getTextureResource(HomemadeShotgunItem animatable) {
|
public ResourceLocation getTextureResource(HomemadeShotgunItem animatable) {
|
||||||
return ModUtils.loc("textures/item/abekiri.png");
|
return ModUtils.loc("textures/item/homemade_shotgun.png");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -37,7 +37,6 @@ public class AbekiriItemModel extends GeoModel<HomemadeShotgunItem> {
|
||||||
CoreGeoBone gun = getAnimationProcessor().getBone("bone");
|
CoreGeoBone gun = getAnimationProcessor().getBone("bone");
|
||||||
CoreGeoBone shen = getAnimationProcessor().getBone("shen");
|
CoreGeoBone shen = getAnimationProcessor().getBone("shen");
|
||||||
|
|
||||||
|
|
||||||
Player player = Minecraft.getInstance().player;
|
Player player = Minecraft.getInstance().player;
|
||||||
if (player == null) return;
|
if (player == null) return;
|
||||||
ItemStack stack = player.getMainHandItem();
|
ItemStack stack = player.getMainHandItem();
|
|
@ -1,8 +1,8 @@
|
||||||
package com.atsuishio.superbwarfare.client.renderer.item;
|
package com.atsuishio.superbwarfare.client.renderer.item;
|
||||||
|
|
||||||
import com.atsuishio.superbwarfare.client.AnimationHelper;
|
import com.atsuishio.superbwarfare.client.AnimationHelper;
|
||||||
import com.atsuishio.superbwarfare.client.layer.AbekiriLayer;
|
import com.atsuishio.superbwarfare.client.layer.HomemadeShotgunLayer;
|
||||||
import com.atsuishio.superbwarfare.client.model.item.AbekiriItemModel;
|
import com.atsuishio.superbwarfare.client.model.item.HomemadeShotgunItemModel;
|
||||||
import com.atsuishio.superbwarfare.event.ClientEventHandler;
|
import com.atsuishio.superbwarfare.event.ClientEventHandler;
|
||||||
import com.atsuishio.superbwarfare.init.ModTags;
|
import com.atsuishio.superbwarfare.init.ModTags;
|
||||||
import com.atsuishio.superbwarfare.item.gun.shotgun.HomemadeShotgunItem;
|
import com.atsuishio.superbwarfare.item.gun.shotgun.HomemadeShotgunItem;
|
||||||
|
@ -27,11 +27,11 @@ import software.bernie.geckolib.util.RenderUtils;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
public class AbekiriItemRenderer extends GeoItemRenderer<HomemadeShotgunItem> {
|
public class HomemadeShotgunItemRenderer extends GeoItemRenderer<HomemadeShotgunItem> {
|
||||||
|
|
||||||
public AbekiriItemRenderer() {
|
public HomemadeShotgunItemRenderer() {
|
||||||
super(new AbekiriItemModel());
|
super(new HomemadeShotgunItemModel());
|
||||||
this.addRenderLayer(new AbekiriLayer(this));
|
this.addRenderLayer(new HomemadeShotgunLayer(this));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
|
@ -2,7 +2,7 @@ package com.atsuishio.superbwarfare.item.gun.shotgun;
|
||||||
|
|
||||||
import com.atsuishio.superbwarfare.ModUtils;
|
import com.atsuishio.superbwarfare.ModUtils;
|
||||||
import com.atsuishio.superbwarfare.client.PoseTool;
|
import com.atsuishio.superbwarfare.client.PoseTool;
|
||||||
import com.atsuishio.superbwarfare.client.renderer.item.AbekiriItemRenderer;
|
import com.atsuishio.superbwarfare.client.renderer.item.HomemadeShotgunItemRenderer;
|
||||||
import com.atsuishio.superbwarfare.client.tooltip.component.ShotgunImageComponent;
|
import com.atsuishio.superbwarfare.client.tooltip.component.ShotgunImageComponent;
|
||||||
import com.atsuishio.superbwarfare.event.ClientEventHandler;
|
import com.atsuishio.superbwarfare.event.ClientEventHandler;
|
||||||
import com.atsuishio.superbwarfare.init.ModItems;
|
import com.atsuishio.superbwarfare.init.ModItems;
|
||||||
|
@ -59,7 +59,7 @@ public class HomemadeShotgunItem extends GunItem implements GeoItem {
|
||||||
public void initializeClient(Consumer<IClientItemExtensions> consumer) {
|
public void initializeClient(Consumer<IClientItemExtensions> consumer) {
|
||||||
super.initializeClient(consumer);
|
super.initializeClient(consumer);
|
||||||
consumer.accept(new IClientItemExtensions() {
|
consumer.accept(new IClientItemExtensions() {
|
||||||
private final BlockEntityWithoutLevelRenderer renderer = new AbekiriItemRenderer();
|
private final BlockEntityWithoutLevelRenderer renderer = new HomemadeShotgunItemRenderer();
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public BlockEntityWithoutLevelRenderer getCustomRenderer() {
|
public BlockEntityWithoutLevelRenderer getCustomRenderer() {
|
||||||
|
|
|
@ -166,7 +166,7 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "abekiri",
|
"name": "homemade_shotgun",
|
||||||
"parent": "gun",
|
"parent": "gun",
|
||||||
"pivot": [0.85134, 4.15064, 1.93283],
|
"pivot": [0.85134, 4.15064, 1.93283],
|
||||||
"cubes": [
|
"cubes": [
|
||||||
|
@ -552,7 +552,7 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "guan",
|
"name": "guan",
|
||||||
"parent": "abekiri",
|
"parent": "homemade_shotgun",
|
||||||
"pivot": [0.85134, 4.15064, 1.93283],
|
"pivot": [0.85134, 4.15064, 1.93283],
|
||||||
"cubes": [
|
"cubes": [
|
||||||
{
|
{
|
||||||
|
@ -996,7 +996,7 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "jiaodai",
|
"name": "jiaodai",
|
||||||
"parent": "abekiri",
|
"parent": "homemade_shotgun",
|
||||||
"pivot": [0.04048, 3.75996, 2.58283]
|
"pivot": [0.04048, 3.75996, 2.58283]
|
||||||
},
|
},
|
||||||
{
|
{
|
|
@ -26,7 +26,7 @@
|
||||||
"item.superbwarfare.m_4": "M4A1",
|
"item.superbwarfare.m_4": "M4A1",
|
||||||
"item.superbwarfare.aa_12": "AA-12",
|
"item.superbwarfare.aa_12": "AA-12",
|
||||||
"item.superbwarfare.sks": "SKS",
|
"item.superbwarfare.sks": "SKS",
|
||||||
"item.superbwarfare.abekiri": "Legendary Gun: Abe Slayer",
|
"item.superbwarfare.homemade_shotgun": "Homemade Shotgun",
|
||||||
"item.superbwarfare.trachelium": "\"Trachelium-Caeruleum\"",
|
"item.superbwarfare.trachelium": "\"Trachelium-Caeruleum\"",
|
||||||
"des.superbwarfare.trachelium_1": "Calm Spirit and Gentle Love",
|
"des.superbwarfare.trachelium_1": "Calm Spirit and Gentle Love",
|
||||||
"des.superbwarfare.trachelium_2": "\"May the flowers in my hand convey my feelings to you\"",
|
"des.superbwarfare.trachelium_2": "\"May the flowers in my hand convey my feelings to you\"",
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
"item.superbwarfare.m_4": "M4A1卡宾枪",
|
"item.superbwarfare.m_4": "M4A1卡宾枪",
|
||||||
"item.superbwarfare.aa_12": "AA-12霰弹枪",
|
"item.superbwarfare.aa_12": "AA-12霰弹枪",
|
||||||
"item.superbwarfare.sks": "SKS射手步枪",
|
"item.superbwarfare.sks": "SKS射手步枪",
|
||||||
"item.superbwarfare.abekiri": "名銃.安倍切り",
|
"item.superbwarfare.homemade_shotgun": "名铳·安倍切",
|
||||||
"item.superbwarfare.trachelium": "“夕雾花”",
|
"item.superbwarfare.trachelium": "“夕雾花”",
|
||||||
"des.superbwarfare.trachelium_1": "热烈想念,一往情深",
|
"des.superbwarfare.trachelium_1": "热烈想念,一往情深",
|
||||||
"des.superbwarfare.trachelium_2": "“愿手中的这束花,能够传达我的深情”",
|
"des.superbwarfare.trachelium_2": "“愿手中的这束花,能够传达我的深情”",
|
||||||
|
|
|
@ -1,27 +0,0 @@
|
||||||
{
|
|
||||||
"loader": "forge:separate_transforms",
|
|
||||||
"gui_light": "front",
|
|
||||||
"base": {
|
|
||||||
"parent": "superbwarfare:item/abekiri_base"
|
|
||||||
},
|
|
||||||
"perspectives": {
|
|
||||||
"gui": {
|
|
||||||
"parent": "superbwarfare:item/abekiri3d"
|
|
||||||
},
|
|
||||||
"thirdperson_righthand": {
|
|
||||||
"parent": "superbwarfare:item/abekiri3d"
|
|
||||||
},
|
|
||||||
"thirdperson_lefthand": {
|
|
||||||
"parent": "superbwarfare:item/abekiri3d"
|
|
||||||
},
|
|
||||||
"ground": {
|
|
||||||
"parent": "superbwarfare:item/abekiri3d"
|
|
||||||
},
|
|
||||||
"fixed": {
|
|
||||||
"parent": "superbwarfare:item/abekiri3d"
|
|
||||||
},
|
|
||||||
"head": {
|
|
||||||
"parent": "superbwarfare:item/abekiri3d"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,6 +0,0 @@
|
||||||
{
|
|
||||||
"parent": "superbwarfare:displaysettings/abekiri.item",
|
|
||||||
"textures": {
|
|
||||||
"layer0": "superbwarfare:item/abekiri"
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -0,0 +1,27 @@
|
||||||
|
{
|
||||||
|
"loader": "forge:separate_transforms",
|
||||||
|
"gui_light": "front",
|
||||||
|
"base": {
|
||||||
|
"parent": "superbwarfare:item/homemade_shotgun_base"
|
||||||
|
},
|
||||||
|
"perspectives": {
|
||||||
|
"gui": {
|
||||||
|
"parent": "superbwarfare:item/homemade_shotgun3d"
|
||||||
|
},
|
||||||
|
"thirdperson_righthand": {
|
||||||
|
"parent": "superbwarfare:item/homemade_shotgun3d"
|
||||||
|
},
|
||||||
|
"thirdperson_lefthand": {
|
||||||
|
"parent": "superbwarfare:item/homemade_shotgun3d"
|
||||||
|
},
|
||||||
|
"ground": {
|
||||||
|
"parent": "superbwarfare:item/homemade_shotgun3d"
|
||||||
|
},
|
||||||
|
"fixed": {
|
||||||
|
"parent": "superbwarfare:item/homemade_shotgun3d"
|
||||||
|
},
|
||||||
|
"head": {
|
||||||
|
"parent": "superbwarfare:item/homemade_shotgun3d"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -2,8 +2,8 @@
|
||||||
"credit": "Made with Blockbench",
|
"credit": "Made with Blockbench",
|
||||||
"texture_size": [64, 64],
|
"texture_size": [64, 64],
|
||||||
"textures": {
|
"textures": {
|
||||||
"0": "superbwarfare:item/abekiri",
|
"0": "superbwarfare:item/homemade_shotgun",
|
||||||
"particle": "superbwarfare:item/abekiri"
|
"particle": "superbwarfare:item/homemade_shotgun"
|
||||||
},
|
},
|
||||||
"elements": [
|
"elements": [
|
||||||
{
|
{
|
||||||
|
@ -1824,7 +1824,7 @@
|
||||||
},
|
},
|
||||||
"groups": [
|
"groups": [
|
||||||
{
|
{
|
||||||
"name": "abekiri",
|
"name": "homemade_shotgun",
|
||||||
"origin": [7.37626, 3.80052, 8],
|
"origin": [7.37626, 3.80052, 8],
|
||||||
"color": 0,
|
"color": 0,
|
||||||
"children": [
|
"children": [
|
|
@ -0,0 +1,6 @@
|
||||||
|
{
|
||||||
|
"parent": "superbwarfare:displaysettings/homemade_shotgun.item",
|
||||||
|
"textures": {
|
||||||
|
"layer0": "superbwarfare:item/homemade_shotgun"
|
||||||
|
}
|
||||||
|
}
|
Before Width: | Height: | Size: 6.3 KiB After Width: | Height: | Size: 6.3 KiB |
Before Width: | Height: | Size: 4.6 KiB After Width: | Height: | Size: 4.6 KiB |
|
@ -21,7 +21,7 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"result": {
|
"result": {
|
||||||
"item": "superbwarfare:abekiri",
|
"item": "superbwarfare:homemade_shotgun",
|
||||||
"count": 1
|
"count": 1
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
Add table
Reference in a new issue