diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/DroneRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/DroneRenderer.java index bd4a6c583..c812384fb 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/DroneRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/DroneRenderer.java @@ -68,12 +68,6 @@ public class DroneRenderer extends GeoEntityRenderer { entityRenderDispatcher.render(entity, 0, 0.03, 0.25, entityYaw, partialTicks, poseStack, bufferIn, packedLightIn); } -// if (entityIn.getEntityData().get(KAMIKAZE_MODE) == 3) { -// Entity entity = new RpgRocketEntity(ModEntities.RPG_ROCKET.get(), entityIn.level()); -// -// entityRenderDispatcher.render(entity, 0, -0.03, -1.8, entityYaw, partialTicks, poseStack, bufferIn, packedLightIn); -// } - for (int i = 0; i < entityIn.getEntityData().get(AMMO); i++) { double yOffset = 0; double xOffset = 0; @@ -177,24 +171,6 @@ public class DroneRenderer extends GeoEntityRenderer { } } -// if (name.equals("c4")) { -// bone.setHidden(animatable.getEntityData().get(KAMIKAZE_MODE) != 2); -// -// } - - -// Player player = Minecraft.getInstance().player; -// if (player != null && animatable.getEntityData().get(KAMIKAZE_MODE) == 2 && name.equals("c4")) { -// ItemStack stack = player.getMainHandItem(); -// DroneEntity drone = EntityFindUtil.findDrone(player.level(), stack.getOrCreateTag().getString("LinkedDrone")); -// -// if (!(stack.is(ModItems.MONITOR.get()) && stack.getOrCreateTag().getBoolean("Using") && stack.getOrCreateTag().getBoolean("Linked") && drone != null && drone.getUUID() == animatable.getUUID())) { -// bone.setHidden(true); -// } else { -// bone.setHidden(false); -// } -// } - super.renderRecursively(poseStack, animatable, bone, renderType, bufferSource, buffer, isReRender, partialTick, packedLight, packedOverlay, color); } } diff --git a/src/main/resources/assets/superbwarfare/geo/drone.geo.json b/src/main/resources/assets/superbwarfare/geo/drone.geo.json index 9c6db7f7c..ef3e8f27c 100644 --- a/src/main/resources/assets/superbwarfare/geo/drone.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/drone.geo.json @@ -587,89 +587,6 @@ } } ] - }, - { - "name": "Weapon", - "parent": "0", - "pivot": [0, 2.2, 0] - }, - { - "name": "c4", - "parent": "Weapon", - "pivot": [0.03633, 0.475, -0.41605], - "rotation": [0, -90, 180], - "cubes": [ - { - "origin": [-1.42244, -0.29277, -2.10516], - "size": [4.60664, 0.92133, 3.3782], - "uv": { - "north": {"uv": [7, 3], "uv_size": [4.5, 1]}, - "east": {"uv": [4, 9], "uv_size": [3.5, 1]}, - "south": {"uv": [7, 4], "uv_size": [4.5, 1]}, - "west": {"uv": [9, 7], "uv_size": [3.5, 1]}, - "up": {"uv": [0, 0], "uv_size": [4.5, 3.5]}, - "down": {"uv": [0, 7.5], "uv_size": [4.5, -3.5]} - } - }, - { - "origin": [-1.11533, 0.62855, -1.79805], - "size": [0.61422, 0.30711, 2.76398], - "uv": { - "north": {"uv": [29, 25], "uv_size": [0.5, 0.25]}, - "east": {"uv": [23, 2], "uv_size": [2.75, 0.25]}, - "south": {"uv": [26, 29], "uv_size": [0.5, 0.25]}, - "west": {"uv": [24, 0], "uv_size": [2.75, 0.25]}, - "up": {"uv": [20, 0], "uv_size": [0.5, 2.75]} - } - } - ] - }, - { - "name": "button_group", - "parent": "c4", - "pivot": [0.11311, 0.62855, -1.49094], - "cubes": [ - { - "origin": [0.11311, 0.62855, -1.49094], - "size": [2.14976, 0.30711, 2.14976], - "uv": { - "north": {"uv": [25, 22], "uv_size": [2.25, 0.25]}, - "east": {"uv": [23, 25], "uv_size": [2.25, 0.25]}, - "south": {"uv": [25, 23], "uv_size": [2.25, 0.25]}, - "west": {"uv": [25, 24], "uv_size": [2.25, 0.25]}, - "up": {"uv": [7, 0], "uv_size": [2.25, 2.25]} - } - } - ] - }, - { - "name": "triggers", - "parent": "c4", - "pivot": [0.72732, -0.29277, -0.56961], - "cubes": [ - { - "origin": [0.11311, 0.01434, -2.41226], - "size": [1.53555, 0.30711, 0.30711], - "uv": { - "north": {"uv": [27, 11], "uv_size": [1.5, 0.25]}, - "east": {"uv": [30, 4], "uv_size": [0.25, 0.25]}, - "west": {"uv": [5, 30], "uv_size": [0.25, 0.25]}, - "up": {"uv": [27, 12], "uv_size": [1.5, 0.25]}, - "down": {"uv": [27, 13.25], "uv_size": [1.5, -0.25]} - } - }, - { - "origin": [-1.11533, 0.01434, -2.41226], - "size": [0.61422, 0.30711, 0.30711], - "uv": { - "north": {"uv": [29, 26], "uv_size": [0.5, 0.25]}, - "east": {"uv": [30, 5], "uv_size": [0.25, 0.25]}, - "west": {"uv": [6, 30], "uv_size": [0.25, 0.25]}, - "up": {"uv": [27, 29], "uv_size": [0.5, 0.25]}, - "down": {"uv": [29, 27.25], "uv_size": [0.5, -0.25]} - } - } - ] } ] }