Fix Names

FrozenBlock · Jan 31, 2025 · 70927b1 · 70927b1
1 parent 62e4aee
commit 70927b1
Show file tree

Hide file tree

Showing 26 changed files with 50 additions and 50 deletions.
diff --git a/src/main/generated/data/wilderwild/wilderwild/butterfly_variant/clouded_yellow.json b/src/main/generated/data/wilderwild/wilderwild/butterfly_variant/clouded_yellow.json
@@ -1,6 +1,6 @@
 {
   "asset_id": "wilderwild:entity/butterfly/butterfly_clouded_yellow",
-  "name": "butterfly_clouded_yellow",
+  "name": "clouded_yellow",
   "spawn_conditions": [
     {
       "condition": {

diff --git a/src/main/generated/data/wilderwild/wilderwild/butterfly_variant/duskwing.json b/src/main/generated/data/wilderwild/wilderwild/butterfly_variant/duskwing.json
@@ -1,6 +1,6 @@
 {
   "asset_id": "wilderwild:entity/butterfly/butterfly_duskwing",
-  "name": "butterfly_duskwing",
+  "name": "duskwing",
   "spawn_conditions": [
     {
       "condition": {

diff --git a/src/main/generated/data/wilderwild/wilderwild/butterfly_variant/green_hairstreak.json b/src/main/generated/data/wilderwild/wilderwild/butterfly_variant/green_hairstreak.json
@@ -1,6 +1,6 @@
 {
   "asset_id": "wilderwild:entity/butterfly/butterfly_green_hairstreak",
-  "name": "butterfly_green_hairstreak",
+  "name": "green_hairstreak",
   "spawn_conditions": [
     {
       "condition": {

diff --git a/src/main/generated/data/wilderwild/wilderwild/butterfly_variant/marbled.json b/src/main/generated/data/wilderwild/wilderwild/butterfly_variant/marbled.json
@@ -1,6 +1,6 @@
 {
   "asset_id": "wilderwild:entity/butterfly/butterfly_marbled",
-  "name": "butterfly_marbled",
+  "name": "marbled",
   "spawn_conditions": [
     {
       "condition": {

diff --git a/src/main/generated/data/wilderwild/wilderwild/butterfly_variant/monarch.json b/src/main/generated/data/wilderwild/wilderwild/butterfly_variant/monarch.json
@@ -1,6 +1,6 @@
 {
   "asset_id": "wilderwild:entity/butterfly/butterfly_monarch",
-  "name": "butterfly_monarch",
+  "name": "monarch",
   "spawn_conditions": [
     {
       "condition": {

diff --git a/src/main/generated/data/wilderwild/wilderwild/butterfly_variant/morpho_blue.json b/src/main/generated/data/wilderwild/wilderwild/butterfly_variant/morpho_blue.json
@@ -1,6 +1,6 @@
 {
   "asset_id": "wilderwild:entity/butterfly/butterfly_morpho_blue",
-  "name": "butterfly_morpho_blue",
+  "name": "morpho_blue",
   "spawn_conditions": [
     {
       "condition": {

diff --git a/src/main/generated/data/wilderwild/wilderwild/butterfly_variant/red_lacewing.json b/src/main/generated/data/wilderwild/wilderwild/butterfly_variant/red_lacewing.json
@@ -1,6 +1,6 @@
 {
   "asset_id": "wilderwild:entity/butterfly/butterfly_red_lacewing",
-  "name": "butterfly_red_lacewing",
+  "name": "red_lacewing",
   "spawn_conditions": [
     {
       "condition": {

diff --git a/src/main/generated/data/wilderwild/wilderwild/firefly_color/black.json b/src/main/generated/data/wilderwild/wilderwild/firefly_color/black.json
@@ -1,6 +1,6 @@
 {
   "asset_id": "wilderwild:entity/firefly/firefly_black",
-  "name": "firefly_black",
+  "name": "black",
   "spawn_conditions": [
     {
       "priority": 0

diff --git a/src/main/generated/data/wilderwild/wilderwild/firefly_color/blue.json b/src/main/generated/data/wilderwild/wilderwild/firefly_color/blue.json
@@ -1,6 +1,6 @@
 {
   "asset_id": "wilderwild:entity/firefly/firefly_blue",
-  "name": "firefly_blue",
+  "name": "blue",
   "spawn_conditions": [
     {
       "priority": 0

diff --git a/src/main/generated/data/wilderwild/wilderwild/firefly_color/brown.json b/src/main/generated/data/wilderwild/wilderwild/firefly_color/brown.json
@@ -1,6 +1,6 @@
 {
   "asset_id": "wilderwild:entity/firefly/firefly_brown",
-  "name": "firefly_brown",
+  "name": "brown",
   "spawn_conditions": [
     {
       "priority": 0

diff --git a/src/main/generated/data/wilderwild/wilderwild/firefly_color/cyan.json b/src/main/generated/data/wilderwild/wilderwild/firefly_color/cyan.json
@@ -1,6 +1,6 @@
 {
   "asset_id": "wilderwild:entity/firefly/firefly_cyan",
-  "name": "firefly_cyan",
+  "name": "cyan",
   "spawn_conditions": [
     {
       "priority": 0

diff --git a/src/main/generated/data/wilderwild/wilderwild/firefly_color/gray.json b/src/main/generated/data/wilderwild/wilderwild/firefly_color/gray.json
@@ -1,6 +1,6 @@
 {
   "asset_id": "wilderwild:entity/firefly/firefly_gray",
-  "name": "firefly_gray",
+  "name": "gray",
   "spawn_conditions": [
     {
       "priority": 0

diff --git a/src/main/generated/data/wilderwild/wilderwild/firefly_color/green.json b/src/main/generated/data/wilderwild/wilderwild/firefly_color/green.json
@@ -1,6 +1,6 @@
 {
   "asset_id": "wilderwild:entity/firefly/firefly_green",
-  "name": "firefly_green",
+  "name": "green",
   "spawn_conditions": [
     {
       "priority": 0

diff --git a/src/main/generated/data/wilderwild/wilderwild/firefly_color/light_blue.json b/src/main/generated/data/wilderwild/wilderwild/firefly_color/light_blue.json
@@ -1,6 +1,6 @@
 {
   "asset_id": "wilderwild:entity/firefly/firefly_light_blue",
-  "name": "firefly_light_blue",
+  "name": "light_blue",
   "spawn_conditions": [
     {
       "priority": 0

diff --git a/src/main/generated/data/wilderwild/wilderwild/firefly_color/light_gray.json b/src/main/generated/data/wilderwild/wilderwild/firefly_color/light_gray.json
@@ -1,6 +1,6 @@
 {
   "asset_id": "wilderwild:entity/firefly/firefly_light_gray",
-  "name": "firefly_light_gray",
+  "name": "light_gray",
   "spawn_conditions": [
     {
       "priority": 0

diff --git a/src/main/generated/data/wilderwild/wilderwild/firefly_color/lime.json b/src/main/generated/data/wilderwild/wilderwild/firefly_color/lime.json
@@ -1,6 +1,6 @@
 {
   "asset_id": "wilderwild:entity/firefly/firefly_lime",
-  "name": "firefly_lime",
+  "name": "lime",
   "spawn_conditions": [
     {
       "priority": 0

diff --git a/src/main/generated/data/wilderwild/wilderwild/firefly_color/magenta.json b/src/main/generated/data/wilderwild/wilderwild/firefly_color/magenta.json
@@ -1,6 +1,6 @@
 {
   "asset_id": "wilderwild:entity/firefly/firefly_magenta",
-  "name": "firefly_magenta",
+  "name": "magenta",
   "spawn_conditions": [
     {
       "priority": 0

diff --git a/src/main/generated/data/wilderwild/wilderwild/firefly_color/on.json b/src/main/generated/data/wilderwild/wilderwild/firefly_color/on.json
@@ -1,6 +1,6 @@
 {
   "asset_id": "wilderwild:entity/firefly/firefly_on",
-  "name": "firefly_on",
+  "name": "on",
   "spawn_conditions": [
     {
       "priority": 1

diff --git a/src/main/generated/data/wilderwild/wilderwild/firefly_color/orange.json b/src/main/generated/data/wilderwild/wilderwild/firefly_color/orange.json
@@ -1,6 +1,6 @@
 {
   "asset_id": "wilderwild:entity/firefly/firefly_orange",
-  "name": "firefly_orange",
+  "name": "orange",
   "spawn_conditions": [
     {
       "priority": 0

diff --git a/src/main/generated/data/wilderwild/wilderwild/firefly_color/pink.json b/src/main/generated/data/wilderwild/wilderwild/firefly_color/pink.json
@@ -1,6 +1,6 @@
 {
   "asset_id": "wilderwild:entity/firefly/firefly_pink",
-  "name": "firefly_pink",
+  "name": "pink",
   "spawn_conditions": [
     {
       "priority": 0

diff --git a/src/main/generated/data/wilderwild/wilderwild/firefly_color/purple.json b/src/main/generated/data/wilderwild/wilderwild/firefly_color/purple.json
@@ -1,6 +1,6 @@
 {
   "asset_id": "wilderwild:entity/firefly/firefly_purple",
-  "name": "firefly_purple",
+  "name": "purple",
   "spawn_conditions": [
     {
       "priority": 0

diff --git a/src/main/generated/data/wilderwild/wilderwild/firefly_color/red.json b/src/main/generated/data/wilderwild/wilderwild/firefly_color/red.json
@@ -1,6 +1,6 @@
 {
   "asset_id": "wilderwild:entity/firefly/firefly_red",
-  "name": "firefly_red",
+  "name": "red",
   "spawn_conditions": [
     {
       "priority": 0

diff --git a/src/main/generated/data/wilderwild/wilderwild/firefly_color/white.json b/src/main/generated/data/wilderwild/wilderwild/firefly_color/white.json
@@ -1,6 +1,6 @@
 {
   "asset_id": "wilderwild:entity/firefly/firefly_white",
-  "name": "firefly_white",
+  "name": "white",
   "spawn_conditions": [
     {
       "priority": 0

diff --git a/src/main/generated/data/wilderwild/wilderwild/firefly_color/yellow.json b/src/main/generated/data/wilderwild/wilderwild/firefly_color/yellow.json
@@ -1,6 +1,6 @@
 {
   "asset_id": "wilderwild:entity/firefly/firefly_yellow",
-  "name": "firefly_yellow",
+  "name": "yellow",
   "spawn_conditions": [
     {
       "priority": 0

diff --git a/src/main/java/net/frozenblock/wilderwild/entity/variant/butterfly/ButterflyVariants.java b/src/main/java/net/frozenblock/wilderwild/entity/variant/butterfly/ButterflyVariants.java
@@ -58,7 +58,7 @@ private static void register(
 		String name,
 		TagKey<Biome> biomeTag
 	) {
-		String texturePath = "entity/butterfly/" + name;
+		String texturePath = "entity/butterfly/butterfly_" + name;
 		register(bootstrapContext, resourceKey, texturePath, name, biomeTag);
 	}
 
@@ -85,12 +85,12 @@ private static void register(
 	}
 
 	public static void bootstrap(BootstrapContext<ButterflyVariant> bootstrapContext) {
-		register(bootstrapContext, MONARCH, "butterfly_monarch", WWBiomeTags.BUTTERFLY_MONARCH);
-		register(bootstrapContext, RED_LACEWING, "butterfly_red_lacewing", WWBiomeTags.BUTTERFLY_RED_LACEWING);
-		register(bootstrapContext, MARBLED, "butterfly_marbled", WWBiomeTags.BUTTERFLY_MARBLED);
-		register(bootstrapContext, MORPHO_BLUE, "butterfly_morpho_blue", WWBiomeTags.BUTTERFLY_MORPHO_BLUE);
-		register(bootstrapContext, GREEN_HAIRSTREAK, "butterfly_green_hairstreak", WWBiomeTags.BUTTERFLY_GREEN_HAIRSTREAK);
-		register(bootstrapContext, CLOUDED_YELLOW, "butterfly_clouded_yellow", WWBiomeTags.BUTTERFLY_CLOUDED_YELLOW);
-		register(bootstrapContext, DUSKWING, "butterfly_duskwing", WWBiomeTags.BUTTERFLY_DUSKWING);
+		register(bootstrapContext, MONARCH, "monarch", WWBiomeTags.BUTTERFLY_MONARCH);
+		register(bootstrapContext, RED_LACEWING, "red_lacewing", WWBiomeTags.BUTTERFLY_RED_LACEWING);
+		register(bootstrapContext, MARBLED, "marbled", WWBiomeTags.BUTTERFLY_MARBLED);
+		register(bootstrapContext, MORPHO_BLUE, "morpho_blue", WWBiomeTags.BUTTERFLY_MORPHO_BLUE);
+		register(bootstrapContext, GREEN_HAIRSTREAK, "green_hairstreak", WWBiomeTags.BUTTERFLY_GREEN_HAIRSTREAK);
+		register(bootstrapContext, CLOUDED_YELLOW, "clouded_yellow", WWBiomeTags.BUTTERFLY_CLOUDED_YELLOW);
+		register(bootstrapContext, DUSKWING, "duskwing", WWBiomeTags.BUTTERFLY_DUSKWING);
 	}
 }
diff --git a/src/main/java/net/frozenblock/wilderwild/entity/variant/firefly/FireflyColors.java b/src/main/java/net/frozenblock/wilderwild/entity/variant/firefly/FireflyColors.java
@@ -93,7 +93,7 @@ private static void register(
 		String name,
 		int spawnPriority
 	) {
-		String texturePath = "entity/firefly/" + name;
+		String texturePath = "entity/firefly/firefly_" + name;
 		register(bootstrapContext, resourceKey, texturePath, name, spawnPriority);
 	}
 
@@ -121,22 +121,22 @@ private static void register(
 	}
 
 	public static void bootstrap(BootstrapContext<FireflyColor> bootstrapContext) {
-		register(bootstrapContext, ON, "firefly_on", 1);
-		register(bootstrapContext, BLACK, "firefly_black", 0);
-		register(bootstrapContext, BLUE, "firefly_blue", 0);
-		register(bootstrapContext, BROWN, "firefly_brown", 0);
-		register(bootstrapContext, CYAN, "firefly_cyan", 0);
-		register(bootstrapContext, GRAY, "firefly_gray", 0);
-		register(bootstrapContext, GREEN, "firefly_green", 0);
-		register(bootstrapContext, LIGHT_BLUE, "firefly_light_blue", 0);
-		register(bootstrapContext, LIGHT_GRAY, "firefly_light_gray", 0);
-		register(bootstrapContext, LIME, "firefly_lime", 0);
-		register(bootstrapContext, MAGENTA, "firefly_magenta", 0);
-		register(bootstrapContext, ORANGE, "firefly_orange", 0);
-		register(bootstrapContext, PINK, "firefly_pink", 0);
-		register(bootstrapContext, PURPLE, "firefly_purple", 0);
-		register(bootstrapContext, RED, "firefly_red", 0);
-		register(bootstrapContext, WHITE, "firefly_white", 0);
-		register(bootstrapContext, YELLOW, "firefly_yellow", 0);
+		register(bootstrapContext, ON, "on", 1);
+		register(bootstrapContext, BLACK, "black", 0);
+		register(bootstrapContext, BLUE, "blue", 0);
+		register(bootstrapContext, BROWN, "brown", 0);
+		register(bootstrapContext, CYAN, "cyan", 0);
+		register(bootstrapContext, GRAY, "gray", 0);
+		register(bootstrapContext, GREEN, "green", 0);
+		register(bootstrapContext, LIGHT_BLUE, "light_blue", 0);
+		register(bootstrapContext, LIGHT_GRAY, "light_gray", 0);
+		register(bootstrapContext, LIME, "lime", 0);
+		register(bootstrapContext, MAGENTA, "magenta", 0);
+		register(bootstrapContext, ORANGE, "orange", 0);
+		register(bootstrapContext, PINK, "pink", 0);
+		register(bootstrapContext, PURPLE, "purple", 0);
+		register(bootstrapContext, RED, "red", 0);
+		register(bootstrapContext, WHITE, "white", 0);
+		register(bootstrapContext, YELLOW, "yellow", 0);
 	}
 }