diff --git a/src/main/resources/assets/superbwarfare/geo/heli_rocket.geo.json b/src/main/resources/assets/superbwarfare/geo/heli_rocket.geo.json index 0972a0c23..a0850b5a4 100644 --- a/src/main/resources/assets/superbwarfare/geo/heli_rocket.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/heli_rocket.geo.json @@ -138,8 +138,8 @@ "origin": [-16.75, -0.45, -0.75], "size": [16, 0, 1.5], "uv": { - "up": {"uv": [40, 64], "uv_size": [-34, -4]}, - "down": {"uv": [40, 64], "uv_size": [-34, -4]} + "up": {"uv": [9, 64], "uv_size": [-9, -1]}, + "down": {"uv": [9, 64], "uv_size": [-9, -1]} } }, { @@ -148,8 +148,8 @@ "pivot": [0, 0, 0], "rotation": [0, 90, 0], "uv": { - "up": {"uv": [40, 64], "uv_size": [-34, -4]}, - "down": {"uv": [40, 64], "uv_size": [-34, -4]} + "up": {"uv": [9, 64], "uv_size": [-9, -1]}, + "down": {"uv": [9, 64], "uv_size": [-9, -1]} } }, { @@ -158,8 +158,8 @@ "pivot": [0, 0, 0], "rotation": [0, 180, 0], "uv": { - "up": {"uv": [40, 64], "uv_size": [-34, -4]}, - "down": {"uv": [40, 64], "uv_size": [-34, -4]} + "up": {"uv": [9, 64], "uv_size": [-9, -1]}, + "down": {"uv": [9, 64], "uv_size": [-9, -1]} } }, { @@ -168,8 +168,8 @@ "pivot": [0, 14.5, 0], "rotation": [135, 0, 90], "uv": { - "up": {"uv": [40, 64], "uv_size": [-34, -4]}, - "down": {"uv": [40, 64], "uv_size": [-34, -4]} + "up": {"uv": [9, 64], "uv_size": [-9, -1]}, + "down": {"uv": [9, 64], "uv_size": [-9, -1]} } }, { @@ -178,8 +178,8 @@ "pivot": [0, 14.5, 0], "rotation": [-135, 0, 90], "uv": { - "up": {"uv": [40, 64], "uv_size": [-34, -4]}, - "down": {"uv": [40, 64], "uv_size": [-34, -4]} + "up": {"uv": [9, 64], "uv_size": [-9, -1]}, + "down": {"uv": [9, 64], "uv_size": [-9, -1]} } }, { @@ -188,8 +188,8 @@ "pivot": [0, 0, 0], "rotation": [0, -90, 0], "uv": { - "up": {"uv": [40, 64], "uv_size": [-34, -4]}, - "down": {"uv": [40, 64], "uv_size": [-34, -4]} + "up": {"uv": [9, 64], "uv_size": [-9, -1]}, + "down": {"uv": [9, 64], "uv_size": [-9, -1]} } }, { @@ -198,8 +198,8 @@ "pivot": [0, -0.45, 0], "rotation": [0, -45, 0], "uv": { - "up": {"uv": [8, 64], "uv_size": [-4, -4]}, - "down": {"uv": [8, 64], "uv_size": [-4, -4]} + "up": {"uv": [1, 64], "uv_size": [-1, -1]}, + "down": {"uv": [1, 64], "uv_size": [-1, -1]} } }, { @@ -208,8 +208,8 @@ "pivot": [0, 1.3, 0], "rotation": [90, -45, 0], "uv": { - "up": {"uv": [8, 64], "uv_size": [-4, -4]}, - "down": {"uv": [8, 64], "uv_size": [-4, -4]} + "up": {"uv": [1, 64], "uv_size": [-1, -1]}, + "down": {"uv": [1, 64], "uv_size": [-1, -1]} } }, { @@ -218,8 +218,8 @@ "pivot": [0, 1.3, 0], "rotation": [90, 45, 0], "uv": { - "up": {"uv": [8, 64], "uv_size": [-4, -4]}, - "down": {"uv": [8, 64], "uv_size": [-4, -4]} + "up": {"uv": [1, 64], "uv_size": [-1, -1]}, + "down": {"uv": [1, 64], "uv_size": [-1, -1]} } } ] diff --git a/src/main/resources/assets/superbwarfare/geo/javelin_missile.geo.json b/src/main/resources/assets/superbwarfare/geo/javelin_missile.geo.json index 2f1eb7c9c..a59b125cd 100644 --- a/src/main/resources/assets/superbwarfare/geo/javelin_missile.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/javelin_missile.geo.json @@ -24,8 +24,8 @@ "origin": [-23.45, -0.63, -1.05], "size": [22.4, 0, 2.1], "uv": { - "up": {"uv": [40, 64], "uv_size": [-36, -4]}, - "down": {"uv": [40, 64], "uv_size": [-36, -4]} + "up": {"uv": [9, 64], "uv_size": [-9, -1]}, + "down": {"uv": [9, 64], "uv_size": [-9, -1]} } }, { @@ -34,8 +34,8 @@ "pivot": [0, 0, 0], "rotation": [0, 90, 0], "uv": { - "up": {"uv": [40, 64], "uv_size": [-36, -4]}, - "down": {"uv": [40, 64], "uv_size": [-36, -4]} + "up": {"uv": [9, 64], "uv_size": [-9, -1]}, + "down": {"uv": [9, 64], "uv_size": [-9, -1]} } }, { @@ -44,8 +44,8 @@ "pivot": [0, 0, 0], "rotation": [0, 180, 0], "uv": { - "up": {"uv": [40, 64], "uv_size": [-36, -4]}, - "down": {"uv": [40, 64], "uv_size": [-36, -4]} + "up": {"uv": [9, 64], "uv_size": [-9, -1]}, + "down": {"uv": [9, 64], "uv_size": [-9, -1]} } }, { @@ -54,8 +54,8 @@ "pivot": [0, 20.3, 0], "rotation": [135, 0, 90], "uv": { - "up": {"uv": [40, 64], "uv_size": [-36, -4]}, - "down": {"uv": [40, 64], "uv_size": [-36, -4]} + "up": {"uv": [9, 64], "uv_size": [-9, -1]}, + "down": {"uv": [9, 64], "uv_size": [-9, -1]} } }, { @@ -64,8 +64,8 @@ "pivot": [0, 20.3, 0], "rotation": [-135, 0, 90], "uv": { - "up": {"uv": [40, 64], "uv_size": [-36, -4]}, - "down": {"uv": [40, 64], "uv_size": [-36, -4]} + "up": {"uv": [9, 64], "uv_size": [-9, -1]}, + "down": {"uv": [9, 64], "uv_size": [-9, -1]} } }, { @@ -74,8 +74,8 @@ "pivot": [0, 0, 0], "rotation": [0, -90, 0], "uv": { - "up": {"uv": [40, 64], "uv_size": [-36, -4]}, - "down": {"uv": [40, 64], "uv_size": [-36, -4]} + "up": {"uv": [9, 64], "uv_size": [-9, -1]}, + "down": {"uv": [9, 64], "uv_size": [-9, -1]} } }, { @@ -84,12 +84,12 @@ "pivot": [0, -0.63, 0], "rotation": [0, -45, 0], "uv": { - "north": {"uv": [4, 60], "uv_size": [4, 4]}, - "east": {"uv": [4, 60], "uv_size": [4, 4]}, - "south": {"uv": [4, 60], "uv_size": [4, 4]}, - "west": {"uv": [4, 60], "uv_size": [4, 4]}, - "up": {"uv": [8, 64], "uv_size": [-4, -4]}, - "down": {"uv": [8, 64], "uv_size": [-4, -4]} + "north": {"uv": [0, 63], "uv_size": [1, 1]}, + "east": {"uv": [0, 63], "uv_size": [1, 1]}, + "south": {"uv": [0, 63], "uv_size": [1, 1]}, + "west": {"uv": [0, 63], "uv_size": [1, 1]}, + "up": {"uv": [1, 64], "uv_size": [-1, -1]}, + "down": {"uv": [1, 64], "uv_size": [-1, -1]} } }, { @@ -98,12 +98,12 @@ "pivot": [0, 1.82, 0], "rotation": [90, -45, 0], "uv": { - "north": {"uv": [4, 60], "uv_size": [4, 4]}, - "east": {"uv": [4, 60], "uv_size": [4, 4]}, - "south": {"uv": [4, 60], "uv_size": [4, 4]}, - "west": {"uv": [4, 60], "uv_size": [4, 4]}, - "up": {"uv": [8, 64], "uv_size": [-4, -4]}, - "down": {"uv": [8, 64], "uv_size": [-4, -4]} + "north": {"uv": [0, 63], "uv_size": [1, 1]}, + "east": {"uv": [0, 63], "uv_size": [1, 1]}, + "south": {"uv": [0, 63], "uv_size": [1, 1]}, + "west": {"uv": [0, 63], "uv_size": [1, 1]}, + "up": {"uv": [1, 64], "uv_size": [-1, -1]}, + "down": {"uv": [1, 64], "uv_size": [-1, -1]} } }, { @@ -112,12 +112,12 @@ "pivot": [0, 1.82, 0], "rotation": [90, 45, 0], "uv": { - "north": {"uv": [4, 60], "uv_size": [4, 4]}, - "east": {"uv": [4, 60], "uv_size": [4, 4]}, - "south": {"uv": [4, 60], "uv_size": [4, 4]}, - "west": {"uv": [4, 60], "uv_size": [4, 4]}, - "up": {"uv": [8, 64], "uv_size": [-4, -4]}, - "down": {"uv": [8, 64], "uv_size": [-4, -4]} + "north": {"uv": [0, 63], "uv_size": [1, 1]}, + "east": {"uv": [0, 63], "uv_size": [1, 1]}, + "south": {"uv": [0, 63], "uv_size": [1, 1]}, + "west": {"uv": [0, 63], "uv_size": [1, 1]}, + "up": {"uv": [1, 64], "uv_size": [-1, -1]}, + "down": {"uv": [1, 64], "uv_size": [-1, -1]} } } ] diff --git a/src/main/resources/assets/superbwarfare/geo/rpg_rocket.geo.json b/src/main/resources/assets/superbwarfare/geo/rpg_rocket.geo.json index 63beffeea..40f43f1ba 100644 --- a/src/main/resources/assets/superbwarfare/geo/rpg_rocket.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/rpg_rocket.geo.json @@ -24,8 +24,8 @@ "origin": [-16.75, -0.45, -0.75], "size": [16, 0, 1.5], "uv": { - "up": {"uv": [20, 32], "uv_size": [-16, -2]}, - "down": {"uv": [20, 32], "uv_size": [-16, -2]} + "up": {"uv": [18, 128], "uv_size": [-16, -2]}, + "down": {"uv": [18, 128], "uv_size": [-16, -2]} } }, { @@ -34,8 +34,8 @@ "pivot": [0, 0, 0], "rotation": [0, 90, 0], "uv": { - "up": {"uv": [20, 32], "uv_size": [-16, -2]}, - "down": {"uv": [20, 32], "uv_size": [-16, -2]} + "up": {"uv": [18, 128], "uv_size": [-16, -2]}, + "down": {"uv": [18, 128], "uv_size": [-16, -2]} } }, { @@ -44,8 +44,8 @@ "pivot": [0, 0, 0], "rotation": [0, 180, 0], "uv": { - "up": {"uv": [20, 32], "uv_size": [-16, -2]}, - "down": {"uv": [20, 32], "uv_size": [-16, -2]} + "up": {"uv": [18, 128], "uv_size": [-16, -2]}, + "down": {"uv": [18, 128], "uv_size": [-16, -2]} } }, { @@ -54,8 +54,8 @@ "pivot": [0, 14.5, 0], "rotation": [135, 0, 90], "uv": { - "up": {"uv": [20, 32], "uv_size": [-16, -2]}, - "down": {"uv": [20, 32], "uv_size": [-16, -2]} + "up": {"uv": [18, 128], "uv_size": [-16, -2]}, + "down": {"uv": [18, 128], "uv_size": [-16, -2]} } }, { @@ -64,8 +64,8 @@ "pivot": [0, 14.5, 0], "rotation": [-135, 0, 90], "uv": { - "up": {"uv": [20, 32], "uv_size": [-16, -2]}, - "down": {"uv": [20, 32], "uv_size": [-16, -2]} + "up": {"uv": [18, 128], "uv_size": [-16, -2]}, + "down": {"uv": [18, 128], "uv_size": [-16, -2]} } }, { @@ -74,8 +74,8 @@ "pivot": [0, 0, 0], "rotation": [0, -90, 0], "uv": { - "up": {"uv": [20, 32], "uv_size": [-16, -2]}, - "down": {"uv": [20, 32], "uv_size": [-16, -2]} + "up": {"uv": [18, 128], "uv_size": [-16, -2]}, + "down": {"uv": [18, 128], "uv_size": [-16, -2]} } }, { @@ -84,12 +84,12 @@ "pivot": [0, -0.45, 0], "rotation": [0, -45, 0], "uv": { - "north": {"uv": [2, 30], "uv_size": [2, 2]}, - "east": {"uv": [2, 30], "uv_size": [2, 2]}, - "south": {"uv": [2, 30], "uv_size": [2, 2]}, - "west": {"uv": [2, 30], "uv_size": [2, 2]}, - "up": {"uv": [4, 32], "uv_size": [-2, -2]}, - "down": {"uv": [4, 32], "uv_size": [-2, -2]} + "north": {"uv": [0, 126], "uv_size": [2, 2]}, + "east": {"uv": [0, 126], "uv_size": [2, 2]}, + "south": {"uv": [0, 126], "uv_size": [2, 2]}, + "west": {"uv": [0, 126], "uv_size": [2, 2]}, + "up": {"uv": [2, 128], "uv_size": [-2, -2]}, + "down": {"uv": [2, 128], "uv_size": [-2, -2]} } }, { @@ -98,12 +98,12 @@ "pivot": [0, 1.3, 0], "rotation": [90, -45, 0], "uv": { - "north": {"uv": [2, 30], "uv_size": [2, 2]}, - "east": {"uv": [2, 30], "uv_size": [2, 2]}, - "south": {"uv": [2, 30], "uv_size": [2, 2]}, - "west": {"uv": [2, 30], "uv_size": [2, 2]}, - "up": {"uv": [4, 32], "uv_size": [-2, -2]}, - "down": {"uv": [4, 32], "uv_size": [-2, -2]} + "north": {"uv": [0, 126], "uv_size": [2, 2]}, + "east": {"uv": [0, 126], "uv_size": [2, 2]}, + "south": {"uv": [0, 126], "uv_size": [2, 2]}, + "west": {"uv": [0, 126], "uv_size": [2, 2]}, + "up": {"uv": [2, 128], "uv_size": [-2, -2]}, + "down": {"uv": [2, 128], "uv_size": [-2, -2]} } }, { @@ -112,12 +112,12 @@ "pivot": [0, 1.3, 0], "rotation": [90, 45, 0], "uv": { - "north": {"uv": [2, 30], "uv_size": [2, 2]}, - "east": {"uv": [2, 30], "uv_size": [2, 2]}, - "south": {"uv": [2, 30], "uv_size": [2, 2]}, - "west": {"uv": [2, 30], "uv_size": [2, 2]}, - "up": {"uv": [4, 32], "uv_size": [-2, -2]}, - "down": {"uv": [4, 32], "uv_size": [-2, -2]} + "north": {"uv": [0, 126], "uv_size": [2, 2]}, + "east": {"uv": [0, 126], "uv_size": [2, 2]}, + "south": {"uv": [0, 126], "uv_size": [2, 2]}, + "west": {"uv": [0, 126], "uv_size": [2, 2]}, + "up": {"uv": [2, 128], "uv_size": [-2, -2]}, + "down": {"uv": [2, 128], "uv_size": [-2, -2]} } } ] diff --git a/src/main/resources/assets/superbwarfare/geo/speedboat.geo.json b/src/main/resources/assets/superbwarfare/geo/speedboat.geo.json index 344a0b765..d04657df8 100644 --- a/src/main/resources/assets/superbwarfare/geo/speedboat.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/speedboat.geo.json @@ -2515,7 +2515,7 @@ }, { "origin": [19.68541, 12, -50.31215], - "size": [11.4, 9.6, 39.96], + "size": [11.4, 9.59, 39.96], "pivot": [0, 9.75, 0.44474], "rotation": [0, 17.5, 0], "uv": { @@ -2645,7 +2645,7 @@ }, { "origin": [-31.08541, 12, -50.31215], - "size": [11.4, 9.6, 39.96], + "size": [11.4, 9.59, 39.96], "pivot": [0, 9.75, 0.44474], "rotation": [0, -17.5, 0], "uv": { diff --git a/src/main/resources/assets/superbwarfare/geo/wg_missile.geo.json b/src/main/resources/assets/superbwarfare/geo/wg_missile.geo.json index 16ff02328..4b531b8f6 100644 --- a/src/main/resources/assets/superbwarfare/geo/wg_missile.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/wg_missile.geo.json @@ -24,8 +24,8 @@ "origin": [-23.45, -0.63, -1.05], "size": [22.4, 0, 2.1], "uv": { - "up": {"uv": [40, 64], "uv_size": [-36, -4]}, - "down": {"uv": [40, 64], "uv_size": [-36, -4]} + "up": {"uv": [9, 64], "uv_size": [-9, -1]}, + "down": {"uv": [9, 64], "uv_size": [-9, -1]} } }, { @@ -34,8 +34,8 @@ "pivot": [0, 0, 0], "rotation": [0, 90, 0], "uv": { - "up": {"uv": [40, 64], "uv_size": [-36, -4]}, - "down": {"uv": [40, 64], "uv_size": [-36, -4]} + "up": {"uv": [9, 64], "uv_size": [-9, -1]}, + "down": {"uv": [9, 64], "uv_size": [-9, -1]} } }, { @@ -44,8 +44,8 @@ "pivot": [0, 0, 0], "rotation": [0, 180, 0], "uv": { - "up": {"uv": [40, 64], "uv_size": [-36, -4]}, - "down": {"uv": [40, 64], "uv_size": [-36, -4]} + "up": {"uv": [9, 64], "uv_size": [-9, -1]}, + "down": {"uv": [9, 64], "uv_size": [-9, -1]} } }, { @@ -54,8 +54,8 @@ "pivot": [0, 20.3, 0], "rotation": [135, 0, 90], "uv": { - "up": {"uv": [40, 64], "uv_size": [-36, -4]}, - "down": {"uv": [40, 64], "uv_size": [-36, -4]} + "up": {"uv": [9, 64], "uv_size": [-9, -1]}, + "down": {"uv": [9, 64], "uv_size": [-9, -1]} } }, { @@ -64,8 +64,8 @@ "pivot": [0, 20.3, 0], "rotation": [-135, 0, 90], "uv": { - "up": {"uv": [40, 64], "uv_size": [-36, -4]}, - "down": {"uv": [40, 64], "uv_size": [-36, -4]} + "up": {"uv": [9, 64], "uv_size": [-9, -1]}, + "down": {"uv": [9, 64], "uv_size": [-9, -1]} } }, { @@ -74,8 +74,8 @@ "pivot": [0, 0, 0], "rotation": [0, -90, 0], "uv": { - "up": {"uv": [40, 64], "uv_size": [-36, -4]}, - "down": {"uv": [40, 64], "uv_size": [-36, -4]} + "up": {"uv": [9, 64], "uv_size": [-9, -1]}, + "down": {"uv": [9, 64], "uv_size": [-9, -1]} } }, { @@ -84,12 +84,12 @@ "pivot": [0, -0.63, 0], "rotation": [0, -45, 0], "uv": { - "north": {"uv": [4, 60], "uv_size": [4, 4]}, - "east": {"uv": [4, 60], "uv_size": [4, 4]}, - "south": {"uv": [4, 60], "uv_size": [4, 4]}, - "west": {"uv": [4, 60], "uv_size": [4, 4]}, - "up": {"uv": [8, 64], "uv_size": [-4, -4]}, - "down": {"uv": [8, 64], "uv_size": [-4, -4]} + "north": {"uv": [0, 63], "uv_size": [1, 1]}, + "east": {"uv": [0, 63], "uv_size": [1, 1]}, + "south": {"uv": [0, 63], "uv_size": [1, 1]}, + "west": {"uv": [0, 63], "uv_size": [1, 1]}, + "up": {"uv": [1, 64], "uv_size": [-1, -1]}, + "down": {"uv": [1, 64], "uv_size": [-1, -1]} } }, { @@ -98,12 +98,12 @@ "pivot": [0, 1.82, 0], "rotation": [90, -45, 0], "uv": { - "north": {"uv": [4, 60], "uv_size": [4, 4]}, - "east": {"uv": [4, 60], "uv_size": [4, 4]}, - "south": {"uv": [4, 60], "uv_size": [4, 4]}, - "west": {"uv": [4, 60], "uv_size": [4, 4]}, - "up": {"uv": [8, 64], "uv_size": [-4, -4]}, - "down": {"uv": [8, 64], "uv_size": [-4, -4]} + "north": {"uv": [0, 63], "uv_size": [1, 1]}, + "east": {"uv": [0, 63], "uv_size": [1, 1]}, + "south": {"uv": [0, 63], "uv_size": [1, 1]}, + "west": {"uv": [0, 63], "uv_size": [1, 1]}, + "up": {"uv": [1, 64], "uv_size": [-1, -1]}, + "down": {"uv": [1, 64], "uv_size": [-1, -1]} } }, { @@ -112,12 +112,12 @@ "pivot": [0, 1.82, 0], "rotation": [90, 45, 0], "uv": { - "north": {"uv": [4, 60], "uv_size": [4, 4]}, - "east": {"uv": [4, 60], "uv_size": [4, 4]}, - "south": {"uv": [4, 60], "uv_size": [4, 4]}, - "west": {"uv": [4, 60], "uv_size": [4, 4]}, - "up": {"uv": [8, 64], "uv_size": [-4, -4]}, - "down": {"uv": [8, 64], "uv_size": [-4, -4]} + "north": {"uv": [0, 63], "uv_size": [1, 1]}, + "east": {"uv": [0, 63], "uv_size": [1, 1]}, + "south": {"uv": [0, 63], "uv_size": [1, 1]}, + "west": {"uv": [0, 63], "uv_size": [1, 1]}, + "up": {"uv": [1, 64], "uv_size": [-1, -1]}, + "down": {"uv": [1, 64], "uv_size": [-1, -1]} } } ] diff --git a/src/main/resources/assets/superbwarfare/textures/entity/rpg_rocket_e.png b/src/main/resources/assets/superbwarfare/textures/entity/rpg_rocket_e.png index 2bac37573..4767f8845 100644 Binary files a/src/main/resources/assets/superbwarfare/textures/entity/rpg_rocket_e.png and b/src/main/resources/assets/superbwarfare/textures/entity/rpg_rocket_e.png differ diff --git a/src/main/resources/assets/superbwarfare/textures/entity/speedboat.png b/src/main/resources/assets/superbwarfare/textures/entity/speedboat.png index 1c09fca80..197174f64 100644 Binary files a/src/main/resources/assets/superbwarfare/textures/entity/speedboat.png and b/src/main/resources/assets/superbwarfare/textures/entity/speedboat.png differ