From b0bc37c34d973a76e16fa1e9d5b4c9139c0d7ae0 Mon Sep 17 00:00:00 2001
From: daoge_cmd <3523206925@qq.com>
Date: Mon, 14 Oct 2024 21:05:06 +0800
Subject: [PATCH] refactor: remove version info in mapping files

---
 platforms/allay/README.md                              | 10 ++++++----
 .../src/main/java/com/dfsek/terra/allay/Mapping.java   |  8 ++++----
 ...t_states_1_21.json => je_block_default_states.json} |  0
 .../{biomes_JE_1_21_to_BE_1_21_30.json => biomes.json} |  0
 .../{blocks_JE_1_21_to_BE_1_21_30.json => blocks.json} |  0
 .../{items_JE_1_21_to_BE_1_21_30.json => items.json}   |  0
 6 files changed, 10 insertions(+), 8 deletions(-)
 rename platforms/allay/src/main/resources/{je_block_default_states_1_21.json => je_block_default_states.json} (100%)
 rename platforms/allay/src/main/resources/mapping/{biomes_JE_1_21_to_BE_1_21_30.json => biomes.json} (100%)
 rename platforms/allay/src/main/resources/mapping/{blocks_JE_1_21_to_BE_1_21_30.json => blocks.json} (100%)
 rename platforms/allay/src/main/resources/mapping/{items_JE_1_21_to_BE_1_21_30.json => items.json} (100%)

diff --git a/platforms/allay/README.md b/platforms/allay/README.md
index 3314f3e0f..2ffbbce19 100644
--- a/platforms/allay/README.md
+++ b/platforms/allay/README.md
@@ -2,7 +2,9 @@
 
 ## Resource files
 
-- `mapping/biomes_JE_1_21_to_BE_1_21_30.json` obtain from GeyserMC/mappings.
-- `mapping/items_JE_1_21_to_BE_1_21_30.json` obtain from GeyserMC/mappings.
-- `mapping/blocks_JE_1_21_to_BE_1_21_30.json` generated by using GeyserMC/mappings-generator, and it's origin name is `generator_blocks.json`.
-- `je_block_default_states_1_21.json` converted from https://zh.minecraft.wiki/w/Module:Block_state_values.
\ No newline at end of file
+Current mapping version: je 1.21 to be 1.21.30
+
+- `mapping/biomes.json` obtain from GeyserMC/mappings.
+- `mapping/items_.json` obtain from GeyserMC/mappings.
+- `mapping/blocks.json` generated by using GeyserMC/mappings-generator, and it's origin name is `generator_blocks.json`.
+- `je_block_default_states.json` converted from https://zh.minecraft.wiki/w/Module:Block_state_values.
\ No newline at end of file
diff --git a/platforms/allay/src/main/java/com/dfsek/terra/allay/Mapping.java b/platforms/allay/src/main/java/com/dfsek/terra/allay/Mapping.java
index 5fee8e120..59d6974cb 100644
--- a/platforms/allay/src/main/java/com/dfsek/terra/allay/Mapping.java
+++ b/platforms/allay/src/main/java/com/dfsek/terra/allay/Mapping.java
@@ -81,7 +81,7 @@ public final class Mapping {
     }
 
     private static boolean initBiomeMapping() {
-        try (var stream = Mapping.class.getClassLoader().getResourceAsStream("mapping/biomes_JE_1_21_to_BE_1_21_30.json")) {
+        try (var stream = Mapping.class.getClassLoader().getResourceAsStream("mapping/biomes.json")) {
             if  (stream == null) {
                 TerraAllayPlugin.INSTANCE.getPluginLogger().error("biomes mapping not found");
                 return false;
@@ -98,7 +98,7 @@ public final class Mapping {
     }
 
     private static boolean initItemMapping() {
-        try (var stream = Mapping.class.getClassLoader().getResourceAsStream("mapping/items_JE_1_21_to_BE_1_21_30.json")) {
+        try (var stream = Mapping.class.getClassLoader().getResourceAsStream("mapping/items.json")) {
             if  (stream == null) {
                 TerraAllayPlugin.INSTANCE.getPluginLogger().error("items mapping not found");
                 return false;
@@ -119,7 +119,7 @@ public final class Mapping {
     }
 
     private static boolean initBlockStateMapping() {
-        try (var stream = Mapping.class.getClassLoader().getResourceAsStream("mapping/blocks_JE_1_21_to_BE_1_21_30.json")) {
+        try (var stream = Mapping.class.getClassLoader().getResourceAsStream("mapping/blocks.json")) {
             if (stream == null) {
                 TerraAllayPlugin.INSTANCE.getPluginLogger().error("blocks mapping not found");
                 return false;
@@ -139,7 +139,7 @@ public final class Mapping {
     }
 
     private static boolean initJeBlockDefaultProperties() {
-        try (var stream = Mapping.class.getClassLoader().getResourceAsStream("je_block_default_states_1_21.json")) {
+        try (var stream = Mapping.class.getClassLoader().getResourceAsStream("je_block_default_states.json")) {
             if (stream == null) {
                 TerraAllayPlugin.INSTANCE.getPluginLogger().error("je_block_default_states.json not found");
                 return false;
diff --git a/platforms/allay/src/main/resources/je_block_default_states_1_21.json b/platforms/allay/src/main/resources/je_block_default_states.json
similarity index 100%
rename from platforms/allay/src/main/resources/je_block_default_states_1_21.json
rename to platforms/allay/src/main/resources/je_block_default_states.json
diff --git a/platforms/allay/src/main/resources/mapping/biomes_JE_1_21_to_BE_1_21_30.json b/platforms/allay/src/main/resources/mapping/biomes.json
similarity index 100%
rename from platforms/allay/src/main/resources/mapping/biomes_JE_1_21_to_BE_1_21_30.json
rename to platforms/allay/src/main/resources/mapping/biomes.json
diff --git a/platforms/allay/src/main/resources/mapping/blocks_JE_1_21_to_BE_1_21_30.json b/platforms/allay/src/main/resources/mapping/blocks.json
similarity index 100%
rename from platforms/allay/src/main/resources/mapping/blocks_JE_1_21_to_BE_1_21_30.json
rename to platforms/allay/src/main/resources/mapping/blocks.json
diff --git a/platforms/allay/src/main/resources/mapping/items_JE_1_21_to_BE_1_21_30.json b/platforms/allay/src/main/resources/mapping/items.json
similarity index 100%
rename from platforms/allay/src/main/resources/mapping/items_JE_1_21_to_BE_1_21_30.json
rename to platforms/allay/src/main/resources/mapping/items.json