Refactors I

common/src/main/java/com/railwayteam/railways/api/bogeymenu/v0/entry/CategoryEntry.java

@@ -60,7 +60,6 @@ void addToBogeyEntryList(BogeyEntry entry) {
     }
 
     public static class FavoritesCategory extends CategoryEntry {
-
         public static final CategoryEntry INSTANCE = new FavoritesCategory();
 
         @Nullable

common/src/main/java/com/railwayteam/railways/base/data/recipe/RailwaysSequencedAssemblyRecipeGen.java

@@ -19,8 +19,7 @@
 package com.railwayteam.railways.base.data.recipe;
 
 import com.railwayteam.railways.Railways;
-import com.railwayteam.railways.mixin.AccessorIngredient_TagValue;
-import com.railwayteam.railways.registry.CRBlocks;
+import com.railwayteam.railways.mixin.AccessorIngredient$TagValue;
 import com.railwayteam.railways.registry.CRItems;
 import com.railwayteam.railways.registry.CRTrackMaterials;
 import com.railwayteam.railways.util.TextUtils;
@@ -117,14 +116,14 @@ protected GeneratedRecipe create(String name, Function<RailwaysSequencedAssembly
                     Ingredient railsIngredient = baseMaterial.railsIngredient;
                     if (railsIngredient.values.length == 2 && Arrays.stream(railsIngredient.values).allMatch((value) -> {
                         return value instanceof Ingredient.TagValue tagValue
-                            && (((AccessorIngredient_TagValue)tagValue).getTag().equals(AllTags.forgeItemTag("nuggets/iron"))
-                            || ((AccessorIngredient_TagValue)tagValue).getTag().equals(AllTags.forgeItemTag("nuggets/zinc"))
-                            || ((AccessorIngredient_TagValue)tagValue).getTag().equals(AllTags.forgeItemTag("iron_nuggets"))
-                            || ((AccessorIngredient_TagValue)tagValue).getTag().equals(AllTags.forgeItemTag("zinc_nuggets"))); // TODO wait until create fabric merge such difference between 1.18 and 1.19
+                            && (((AccessorIngredient$TagValue)tagValue).getTag().equals(AllTags.forgeItemTag("nuggets/iron"))
+                            || ((AccessorIngredient$TagValue)tagValue).getTag().equals(AllTags.forgeItemTag("nuggets/zinc"))
+                            || ((AccessorIngredient$TagValue)tagValue).getTag().equals(AllTags.forgeItemTag("iron_nuggets"))
+                            || ((AccessorIngredient$TagValue)tagValue).getTag().equals(AllTags.forgeItemTag("zinc_nuggets"))); // TODO wait until create fabric merge such difference between 1.18 and 1.19
                     })) {
                         railsIngredient = Ingredient.fromValues(Stream.of(
-                            AccessorIngredient_TagValue.railways$create(Ingredients.ironNugget()),
-                            AccessorIngredient_TagValue.railways$create(Ingredients.zincNugget())));
+                            AccessorIngredient$TagValue.railways$create(Ingredients.ironNugget()),
+                            AccessorIngredient$TagValue.railways$create(Ingredients.zincNugget())));
                     }
 
                     Ingredient finalRailsIngredient = railsIngredient;
@@ -146,14 +145,14 @@ protected GeneratedRecipe create(String name, Function<RailwaysSequencedAssembly
             Ingredient railsIngredient = material.railsIngredient;
             if (railsIngredient.values.length == 2 && Arrays.stream(railsIngredient.values).allMatch((value) -> {
                 return value instanceof Ingredient.TagValue tagValue
-                    && (((AccessorIngredient_TagValue) tagValue).getTag().equals(AllTags.forgeItemTag("nuggets/iron"))
-                    || ((AccessorIngredient_TagValue) tagValue).getTag().equals(AllTags.forgeItemTag("nuggets/zinc"))
-                    || ((AccessorIngredient_TagValue) tagValue).getTag().equals(AllTags.forgeItemTag("iron_nuggets"))
-                    || ((AccessorIngredient_TagValue) tagValue).getTag().equals(AllTags.forgeItemTag("zinc_nuggets"))); // TODO wait until create fabric merge such difference between 1.18 and 1.19
+                    && (((AccessorIngredient$TagValue) tagValue).getTag().equals(AllTags.forgeItemTag("nuggets/iron"))
+                    || ((AccessorIngredient$TagValue) tagValue).getTag().equals(AllTags.forgeItemTag("nuggets/zinc"))
+                    || ((AccessorIngredient$TagValue) tagValue).getTag().equals(AllTags.forgeItemTag("iron_nuggets"))
+                    || ((AccessorIngredient$TagValue) tagValue).getTag().equals(AllTags.forgeItemTag("zinc_nuggets"))); // TODO wait until create fabric merge such difference between 1.18 and 1.19
             })) {
                 railsIngredient = Ingredient.fromValues(Stream.of(
-                    AccessorIngredient_TagValue.railways$create(Ingredients.ironNugget()),
-                    AccessorIngredient_TagValue.railways$create(Ingredients.zincNugget())));
+                    AccessorIngredient$TagValue.railways$create(Ingredients.ironNugget()),
+                    AccessorIngredient$TagValue.railways$create(Ingredients.zincNugget())));
             }
 
             Ingredient finalRailsIngredient = railsIngredient;

common/src/main/java/com/railwayteam/railways/base/datafixers/CompatCherryTrackFix.java

@@ -1,3 +1,21 @@
+/*
+ * Steam 'n' Rails
+ * Copyright (c) 2024 The Railways Team
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.railwayteam.railways.base.datafixers;
 
 import com.google.common.collect.ImmutableList;

common/src/main/java/com/railwayteam/railways/compat/tracks/GenericTrackCompat.java

@@ -22,7 +22,7 @@
 import com.railwayteam.railways.Railways;
 import com.railwayteam.railways.compat.Mods;
 import com.railwayteam.railways.config.CRConfigs;
-import com.railwayteam.railways.mixin.AccessorIngredient_TagValue;
+import com.railwayteam.railways.mixin.AccessorIngredient$TagValue;
 import com.railwayteam.railways.multiloader.CommonTags;
 import com.railwayteam.railways.registry.CRBlocks;
 import com.railwayteam.railways.registry.CRTrackMaterials;
@@ -159,8 +159,8 @@ protected String getLang(String name) {
 
     protected Ingredient getIngredientForRail() {
         return Ingredient.fromValues(Stream.of(
-                AccessorIngredient_TagValue.railways$create(CommonTags.IRON_NUGGETS.tag),
-                AccessorIngredient_TagValue.railways$create(CommonTags.ZINC_NUGGETS.tag)
+                AccessorIngredient$TagValue.railways$create(CommonTags.IRON_NUGGETS.tag),
+                AccessorIngredient$TagValue.railways$create(CommonTags.ZINC_NUGGETS.tag)
         ));
     }
 

common/src/main/java/com/railwayteam/railways/compat/tracks/mods/NaturesSpiritTrackCompat.java

@@ -1,3 +1,21 @@
+/*
+ * Steam 'n' Rails
+ * Copyright (c) 2024 The Railways Team
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.railwayteam.railways.compat.tracks.mods;
 
 import com.railwayteam.railways.Railways;

common/src/main/java/com/railwayteam/railways/compat/tracks/mods/TFCTrackCompat.java

@@ -1,9 +1,27 @@
+/*
+ * Steam 'n' Rails
+ * Copyright (c) 2024 The Railways Team
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.railwayteam.railways.compat.tracks.mods;
 
 import com.railwayteam.railways.Railways;
 import com.railwayteam.railways.compat.Mods;
 import com.railwayteam.railways.compat.tracks.GenericTrackCompat;
-import com.railwayteam.railways.mixin.AccessorIngredient_TagValue;
+import com.railwayteam.railways.mixin.AccessorIngredient$TagValue;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.TagKey;
@@ -19,8 +37,8 @@ public class TFCTrackCompat extends GenericTrackCompat {
     @Override
     protected Ingredient getIngredientForRail() {
         return Ingredient.fromValues(Stream.of(
-                AccessorIngredient_TagValue.railways$create(TagKey.create(Registries.ITEM, new ResourceLocation("forge", "rods/wrought_iron"))),
-                AccessorIngredient_TagValue.railways$create(TagKey.create(Registries.ITEM, new ResourceLocation("forge", "rods/zinc")))
+                AccessorIngredient$TagValue.railways$create(TagKey.create(Registries.ITEM, new ResourceLocation("forge", "rods/wrought_iron"))),
+                AccessorIngredient$TagValue.railways$create(TagKey.create(Registries.ITEM, new ResourceLocation("forge", "rods/zinc")))
         ));
     }
 

common/src/main/java/com/railwayteam/railways/mixin/AccessorCreativeModeTabs.java

@@ -1,3 +1,21 @@
+/*
+ * Steam 'n' Rails
+ * Copyright (c) 2024 The Railways Team
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.railwayteam.railways.mixin;
 
 import net.minecraft.world.item.CreativeModeTab;

common/src/main/java/com/railwayteam/railways/mixin/AccessorIngredient_TagValue.java → common/src/main/java/com/railwayteam/railways/mixin/AccessorIngredient$TagValue.java

@@ -26,7 +26,7 @@
 import org.spongepowered.asm.mixin.gen.Invoker;
 
 @Mixin(Ingredient.TagValue.class)
-public interface AccessorIngredient_TagValue {
+public interface AccessorIngredient$TagValue {
     @Invoker("<init>")
     static Ingredient.TagValue railways$create(TagKey<Item> tag) {
         throw new AssertionError();

common/src/main/java/com/railwayteam/railways/mixin/MixinDataFixTypes.java

@@ -1,3 +1,21 @@
+/*
+ * Steam 'n' Rails
+ * Copyright (c) 2024 The Railways Team
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.railwayteam.railways.mixin;
 
 import com.mojang.datafixers.DataFixer;

common/src/main/java/com/railwayteam/railways/mixin/client/AccessorWalkAnimationState.java

@@ -1,3 +1,21 @@
+/*
+ * Steam 'n' Rails
+ * Copyright (c) 2024 The Railways Team
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.railwayteam.railways.mixin.client;
 
 import net.minecraft.world.entity.WalkAnimationState;

common/src/main/java/com/railwayteam/railways/mixin/client/MixinKeyBindsListKeyEntry.java

@@ -1,3 +1,21 @@
+/*
+ * Steam 'n' Rails
+ * Copyright (c) 2024 The Railways Team
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.railwayteam.railways.mixin.client;
 
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;

common/src/main/java/com/railwayteam/railways/mixin/client/MixinSpriteContents.java

@@ -1,3 +1,21 @@
+/*
+ * Steam 'n' Rails
+ * Copyright (c) 2024 The Railways Team
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.railwayteam.railways.mixin.client;
 
 import com.mojang.blaze3d.platform.NativeImage;

common/src/main/java/com/railwayteam/railways/mixin_interfaces/AnimatedTextureDuck.java

@@ -1,3 +1,21 @@
+/*
+ * Steam 'n' Rails
+ * Copyright (c) 2024 The Railways Team
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.railwayteam.railways.mixin_interfaces;
 
 public interface AnimatedTextureDuck {

common/src/main/java/com/railwayteam/railways/mixin_interfaces/IPotentiallyInvisibleSpriteContents.java

@@ -1,3 +1,21 @@
+/*
+ * Steam 'n' Rails
+ * Copyright (c) 2024 The Railways Team
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.railwayteam.railways.mixin_interfaces;
 
 public interface IPotentiallyInvisibleSpriteContents {

common/src/main/java/com/railwayteam/railways/registry/CRBlockPartials.java

@@ -35,7 +35,6 @@
 import static com.railwayteam.railways.registry.CRTrackMaterials.CRTrackType.WIDE_GAUGE;
 
 public class CRBlockPartials {
-
     public static final Map<DyeColor, PartialModel> TOOLBOX_BODIES = new EnumMap<>(DyeColor.class);
     public static final Map<DyeColor, PartialModel> CONDUCTOR_WHISTLE_FLAGS = new EnumMap<>(DyeColor.class);
     public static final Map<String, PartialModel> CUSTOM_CONDUCTOR_CAPS = new HashMap<>();
@@ -538,6 +537,5 @@ private static PartialModel block(String path) {
     }
 
     @SuppressWarnings("EmptyMethod")
-    public static void init() {
-    }
+    public static void init() {}
 }