调整部分物品渲染
This commit is contained in:
parent
b168e9eac0
commit
1f9818dad0
4 changed files with 11 additions and 6 deletions
|
@ -42,7 +42,7 @@ public class AK12ItemRenderer extends CustomGunRenderer<AK12Item> {
|
||||||
ItemStack itemStack = player.getMainHandItem();
|
ItemStack itemStack = player.getMainHandItem();
|
||||||
|
|
||||||
if (itemStack.getItem() instanceof GunItem && GeoItem.getId(itemStack) == this.getInstanceId(animatable)) {
|
if (itemStack.getItem() instanceof GunItem && GeoItem.getId(itemStack) == this.getInstanceId(animatable)) {
|
||||||
if (this.renderPerspective == ItemDisplayContext.FIRST_PERSON_RIGHT_HAND) {
|
if (this.renderPerspective == ItemDisplayContext.FIRST_PERSON_RIGHT_HAND || this.renderPerspective == ItemDisplayContext.THIRD_PERSON_RIGHT_HAND) {
|
||||||
if (GunData.from(itemStack).attachment.get(AttachmentType.SCOPE) == 2
|
if (GunData.from(itemStack).attachment.get(AttachmentType.SCOPE) == 2
|
||||||
&& (name.equals("hidden2"))) {
|
&& (name.equals("hidden2"))) {
|
||||||
bone.setHidden(ClientEventHandler.zoomPos > 0.7 && ClientEventHandler.zoom);
|
bone.setHidden(ClientEventHandler.zoomPos > 0.7 && ClientEventHandler.zoom);
|
||||||
|
@ -52,6 +52,8 @@ public class AK12ItemRenderer extends CustomGunRenderer<AK12Item> {
|
||||||
&& (name.equals("jing") || name.equals("Barrel") || name.equals("humu") || name.equals("qiangguan") || name.equals("houzhunxing"))) {
|
&& (name.equals("jing") || name.equals("Barrel") || name.equals("humu") || name.equals("qiangguan") || name.equals("houzhunxing"))) {
|
||||||
bone.setHidden(ClientEventHandler.zoomPos > 0.7 && ClientEventHandler.zoom);
|
bone.setHidden(ClientEventHandler.zoomPos > 0.7 && ClientEventHandler.zoom);
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
ItemModelHelper.hideAllAttachments(bone, name);
|
||||||
}
|
}
|
||||||
|
|
||||||
int scopeType = GunData.from(itemStack).attachment.get(AttachmentType.SCOPE);
|
int scopeType = GunData.from(itemStack).attachment.get(AttachmentType.SCOPE);
|
||||||
|
|
|
@ -40,7 +40,7 @@ public class AK47ItemRenderer extends CustomGunRenderer<AK47Item> {
|
||||||
if (player == null) return;
|
if (player == null) return;
|
||||||
ItemStack itemStack = player.getMainHandItem();
|
ItemStack itemStack = player.getMainHandItem();
|
||||||
if (itemStack.getItem() instanceof GunItem && GeoItem.getId(itemStack) == this.getInstanceId(animatable)) {
|
if (itemStack.getItem() instanceof GunItem && GeoItem.getId(itemStack) == this.getInstanceId(animatable)) {
|
||||||
if (this.renderPerspective == ItemDisplayContext.FIRST_PERSON_RIGHT_HAND) {
|
if (this.renderPerspective == ItemDisplayContext.FIRST_PERSON_RIGHT_HAND || this.renderPerspective == ItemDisplayContext.THIRD_PERSON_RIGHT_HAND) {
|
||||||
if (name.equals("humu1")) {
|
if (name.equals("humu1")) {
|
||||||
bone.setHidden(GunData.from(itemStack).attachment.get(AttachmentType.GRIP) != 0);
|
bone.setHidden(GunData.from(itemStack).attachment.get(AttachmentType.GRIP) != 0);
|
||||||
}
|
}
|
||||||
|
@ -56,6 +56,11 @@ public class AK47ItemRenderer extends CustomGunRenderer<AK47Item> {
|
||||||
&& (name.equals("jing") || name.equals("Barrel") || name.equals("humu") || name.equals("qiangguan") || name.equals("houzhunxing"))) {
|
&& (name.equals("jing") || name.equals("Barrel") || name.equals("humu") || name.equals("qiangguan") || name.equals("houzhunxing"))) {
|
||||||
bone.setHidden(ClientEventHandler.zoomPos > 0.7 && ClientEventHandler.zoom);
|
bone.setHidden(ClientEventHandler.zoomPos > 0.7 && ClientEventHandler.zoom);
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
ItemModelHelper.hideAllAttachments(bone, name);
|
||||||
|
if (name.equals("humu2")) {
|
||||||
|
bone.setHidden(true);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int scopeType = GunData.from(itemStack).attachment.get(AttachmentType.SCOPE);
|
int scopeType = GunData.from(itemStack).attachment.get(AttachmentType.SCOPE);
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
package com.atsuishio.superbwarfare.client.renderer.gun;
|
package com.atsuishio.superbwarfare.client.renderer.gun;
|
||||||
|
|
||||||
import com.atsuishio.superbwarfare.client.AnimationHelper;
|
import com.atsuishio.superbwarfare.client.AnimationHelper;
|
||||||
import com.atsuishio.superbwarfare.client.ItemModelHelper;
|
|
||||||
import com.atsuishio.superbwarfare.client.model.item.Aa12ItemModel;
|
import com.atsuishio.superbwarfare.client.model.item.Aa12ItemModel;
|
||||||
import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer;
|
import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer;
|
||||||
import com.atsuishio.superbwarfare.item.gun.GunItem;
|
import com.atsuishio.superbwarfare.item.gun.GunItem;
|
||||||
|
@ -39,7 +38,6 @@ public class Aa12ItemRenderer extends CustomGunRenderer<Aa12Item> {
|
||||||
|
|
||||||
if (itemStack.getItem() instanceof GunItem && GeoItem.getId(itemStack) == this.getInstanceId(animatable)) {
|
if (itemStack.getItem() instanceof GunItem && GeoItem.getId(itemStack) == this.getInstanceId(animatable)) {
|
||||||
AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0, 1.31465, 0.5);
|
AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0, 1.31465, 0.5);
|
||||||
ItemModelHelper.handleGunAttachments(bone, itemStack, name);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (renderingArms) {
|
if (renderingArms) {
|
||||||
|
|
|
@ -41,7 +41,7 @@ public class Mp5ItemRenderer extends CustomGunRenderer<Mp5Item> {
|
||||||
if (player == null) return;
|
if (player == null) return;
|
||||||
ItemStack itemStack = player.getMainHandItem();
|
ItemStack itemStack = player.getMainHandItem();
|
||||||
if (itemStack.getItem() instanceof GunItem && GeoItem.getId(itemStack) == this.getInstanceId(animatable)) {
|
if (itemStack.getItem() instanceof GunItem && GeoItem.getId(itemStack) == this.getInstanceId(animatable)) {
|
||||||
if (this.renderPerspective == ItemDisplayContext.FIRST_PERSON_RIGHT_HAND) {
|
if (this.renderPerspective == ItemDisplayContext.FIRST_PERSON_RIGHT_HAND || this.renderPerspective == ItemDisplayContext.THIRD_PERSON_RIGHT_HAND) {
|
||||||
boolean flag = GunData.from(itemStack).attachment.get(AttachmentType.GRIP) == 0;
|
boolean flag = GunData.from(itemStack).attachment.get(AttachmentType.GRIP) == 0;
|
||||||
if (name.equals("yugu")) {
|
if (name.equals("yugu")) {
|
||||||
bone.setHidden(flag);
|
bone.setHidden(flag);
|
||||||
|
@ -54,7 +54,7 @@ public class Mp5ItemRenderer extends CustomGunRenderer<Mp5Item> {
|
||||||
}
|
}
|
||||||
AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0.05, 1, 0.35);
|
AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0.05, 1, 0.35);
|
||||||
ItemModelHelper.handleGunAttachments(bone, itemStack, name);
|
ItemModelHelper.handleGunAttachments(bone, itemStack, name);
|
||||||
} else if (this.renderPerspective == ItemDisplayContext.FIXED) {
|
} else {
|
||||||
ItemModelHelper.hideAllAttachments(bone, name);
|
ItemModelHelper.hideAllAttachments(bone, name);
|
||||||
if (name.equals("yugu")) {
|
if (name.equals("yugu")) {
|
||||||
bone.setHidden(true);
|
bone.setHidden(true);
|
||||||
|
|
Loading…
Add table
Reference in a new issue