Removed getName override

railcraft-reborn · Oct 8, 2023 · 8cfeabd · 8cfeabd
1 parent f831951
commit 8cfeabd
Show file tree

Hide file tree

Showing 9 changed files with 186 additions and 212 deletions.
diff --git a/.../f6df3207d01926c6f93d9a4a7cc4c4d514c1270c → .../4321ebcc8000f73dd5749a5c2d45335d60b185ec b/.../f6df3207d01926c6f93d9a4a7cc4c4d514c1270c → .../4321ebcc8000f73dd5749a5c2d45335d60b185ec
@@ -1,4 +1,4 @@
-// 1.20.1	2023-09-29T10:56:55.6776	Railcraft Block Tags
+// 1.20.1	2023-10-08T12:32:20.97062	Tags for minecraft:block mod id railcraft
 9732f1964281f5d5e6f3d067e648bb4bfc5cbafb data/forge/tags/blocks/enderman_place_on_blacklist.json
 e36857f35c1bac4bde5a8450008b92cf82656216 data/forge/tags/blocks/ore_rates/dense.json
 8ce5fa4b4f1c2619e124ef387b086d72f9c26f04 data/forge/tags/blocks/ore_rates/singular.json

diff --git a/.../0c17a217ec613ee06142cb1982339f8856f06370 → .../735031f3addf80804addae5e3f53249900116f1e b/.../0c17a217ec613ee06142cb1982339f8856f06370 → .../735031f3addf80804addae5e3f53249900116f1e
@@ -1,2 +1,2 @@
-// 1.20.1	2023-06-29T09:24:52.476948	Railcraft Sounds
+// 1.20.1	2023-10-08T12:32:20.973264	Sound Definitions
 02c2282ac2589a1e36bc92448cc1a50772bf1bf1 assets/railcraft/sounds.json
diff --git a/.../b9a1feec2aa96220fdb6dd64b83cddbd04f6412c → .../7cc9f5a39f84776d809436456ff87e0cabca2d5a b/.../b9a1feec2aa96220fdb6dd64b83cddbd04f6412c → .../7cc9f5a39f84776d809436456ff87e0cabca2d5a
@@ -1,4 +1,4 @@
-// 1.20.1	2023-09-27T10:40:46.635318	Railcraft Item Tags
+// 1.20.1	2023-10-08T12:32:20.972503	Tags for minecraft:item mod id railcraft
 f0feda62604edc32e6dcc0eb8d52c2defbf8a4d2 data/forge/tags/items/armors/boots.json
 e4b5c3cfded4b9b76efeda37728f26dc89261239 data/forge/tags/items/armors/boots/steel.json
 32b89e811b184ba832d5a6e71cadeca8e34dff42 data/forge/tags/items/armors/chestplates.json

diff --git a/.../97dead2885b5d9fa3a74d8fba6ba64bf40cbb434 → .../87d908a73f01d26cccea186408092e5a32c5c502 b/.../97dead2885b5d9fa3a74d8fba6ba64bf40cbb434 → .../87d908a73f01d26cccea186408092e5a32c5c502
@@ -1,4 +1,4 @@
-// 1.20.1	2023-06-29T09:24:52.47224	Railcraft Fluid Tags
+// 1.20.1	2023-10-08T12:32:20.969217	Tags for minecraft:fluid mod id railcraft
 240b7af712a009fc420dd3f8b5c846525bfafc7d data/forge/tags/fluids/creosote.json
 529d270700bea5e5de962c4ab7da588a2bbab536 data/forge/tags/fluids/gaseous.json
 529d270700bea5e5de962c4ab7da588a2bbab536 data/forge/tags/fluids/steam.json
diff --git a/src/main/java/mods/railcraft/data/RailcraftBlockTagsProvider.java b/src/main/java/mods/railcraft/data/RailcraftBlockTagsProvider.java
@@ -434,9 +434,4 @@ protected void addTags(HolderLookup.Provider provider) {
         .addTag(RailcraftTags.Blocks.STEEL_TANK_VALVE)
         .addTag(RailcraftTags.Blocks.STEEL_TANK_WALL);
   }
-
-  @Override
-  public String getName() {
-    return "Railcraft Block Tags";
-  }
 }
diff --git a/src/main/java/mods/railcraft/data/RailcraftFluidTagsProvider.java b/src/main/java/mods/railcraft/data/RailcraftFluidTagsProvider.java
@@ -22,15 +22,9 @@ public RailcraftFluidTagsProvider(PackOutput packOutput,
   protected void addTags(HolderLookup.Provider provider) {
     this.tag(RailcraftTags.Fluids.STEAM)
         .add(RailcraftFluids.STEAM.get());
-    //https://forge.gemwire.uk/wiki/User:ChampionAsh5357/Sandbox/Fluids_API#Gaseous_Fluids
     this.tag(Tags.Fluids.GASEOUS)
         .add(RailcraftFluids.STEAM.get());
     this.tag(RailcraftTags.Fluids.CREOSOTE)
         .add(RailcraftFluids.CREOSOTE.get());
   }
-
-  @Override
-  public String getName() {
-    return "Railcraft Fluid Tags";
-  }
 }
diff --git a/src/main/java/mods/railcraft/data/RailcraftItemTagsProvider.java b/src/main/java/mods/railcraft/data/RailcraftItemTagsProvider.java
@@ -281,9 +281,4 @@ protected void addTags(HolderLookup.Provider provider) {
     this.tag(Tags.Items.ARMORS_LEGGINGS).addTags(RailcraftTags.Items.ARMORS_LEGGINGS_STEEL);
     this.tag(Tags.Items.ARMORS_BOOTS).addTags(RailcraftTags.Items.ARMORS_BOOTS_STEEL);
   }
-
-  @Override
-  public String getName() {
-    return "Railcraft Item Tags";
-  }
 }
diff --git a/src/main/java/mods/railcraft/data/RailcraftSoundsProvider.java b/src/main/java/mods/railcraft/data/RailcraftSoundsProvider.java
@@ -6,7 +6,6 @@
 import mods.railcraft.sounds.RailcraftSoundEvents;
 import net.minecraft.data.PackOutput;
 import net.minecraftforge.common.data.ExistingFileHelper;
-import net.minecraftforge.common.data.SoundDefinition;
 import net.minecraftforge.common.data.SoundDefinitionsProvider;
 
 public class RailcraftSoundsProvider extends SoundDefinitionsProvider {
@@ -20,41 +19,32 @@ public void registerSounds() {
     this.add(RailcraftSoundEvents.STEAM_WHISTLE.get(),
         definition()
             .with(
-                railcraftSound("locomotive/steam/whistle1"),
-                railcraftSound("locomotive/steam/whistle2"),
-                railcraftSound("locomotive/steam/whistle3"))
+                sound(Railcraft.rl("locomotive/steam/whistle1")),
+                sound(Railcraft.rl("locomotive/steam/whistle2")),
+                sound(Railcraft.rl("locomotive/steam/whistle3")))
             .subtitle(Translations.Subtitle.STEAM_WHISTLE));
     this.add(RailcraftSoundEvents.ELECTRIC_WHISTLE.get(),
         definition()
             .with(
-                railcraftSound("locomotive/electric/whistle1"),
-                railcraftSound("locomotive/electric/whistle2"),
-                railcraftSound("locomotive/electric/whistle3"))
+                sound(Railcraft.rl("locomotive/electric/whistle1")),
+                sound(Railcraft.rl("locomotive/electric/whistle2")),
+                sound(Railcraft.rl("locomotive/electric/whistle3")))
             .subtitle(Translations.Subtitle.ELECTRIC_WHISTLE));
     this.add(RailcraftSoundEvents.STEAM_BURST.get(),
         definition()
-            .with(railcraftSound("machine/steam_burst"))
+            .with(sound(Railcraft.rl("machine/steam_burst")))
             .subtitle(Translations.Subtitle.STEAM_BURST));
     this.add(RailcraftSoundEvents.STEAM_HISS.get(),
         definition()
-            .with(railcraftSound("machine/steam_hiss"))
+            .with(sound(Railcraft.rl("machine/steam_hiss")))
             .subtitle(Translations.Subtitle.STEAM_HISS));
     this.add(RailcraftSoundEvents.MACHINE_ZAP.get(),
         definition()
             .with(
-                railcraftSound("machine/zap1"),
-                railcraftSound("machine/zap2"),
-                railcraftSound("machine/zap3"),
-                railcraftSound("machine/zap4"))
+                sound(Railcraft.rl("machine/zap1")),
+                sound(Railcraft.rl("machine/zap2")),
+                sound(Railcraft.rl("machine/zap3")),
+                sound(Railcraft.rl("machine/zap4")))
             .subtitle(Translations.Subtitle.MACHINE_ZAP));
   }
-
-  protected static SoundDefinition.Sound railcraftSound(final String name) {
-    return sound(Railcraft.rl(name));
-  }
-
-  @Override
-  public String getName() {
-    return "Railcraft Sounds";
-  }
 }