Renames GCYM classes to proper capitalization (#2047)

GregTechCEu · Oct 23, 2024 · 8c12553 · 8c12553
1 parent a073fc0
commit 8c12553
Show file tree

Hide file tree

Showing 14 changed files with 34 additions and 32 deletions.
diff --git a/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/info/MaterialFlags.java b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/info/MaterialFlags.java
@@ -207,7 +207,7 @@ public String toString() {
             .requireProps(PropertyKey.DUST)
             .build();
 
-    // GCyM
+    // GCYM
     /**
      * Use to disable alloy blast recipes from generating
      */

diff --git a/...techceu/gtceu/common/data/GCyMBlocks.java → ...techceu/gtceu/common/data/GCYMBlocks.java b/...techceu/gtceu/common/data/GCyMBlocks.java → ...techceu/gtceu/common/data/GCYMBlocks.java
@@ -10,7 +10,7 @@
 import static com.gregtechceu.gtceu.common.data.GTBlocks.createActiveCasing;
 import static com.gregtechceu.gtceu.common.data.GTBlocks.createCasingBlock;
 
-public class GCyMBlocks {
+public class GCYMBlocks {
 
     public static void init() {}
 

diff --git a/...eu/gtceu/common/data/GCyMRecipeTypes.java → ...eu/gtceu/common/data/GCYMRecipeTypes.java b/...eu/gtceu/common/data/GCyMRecipeTypes.java → ...eu/gtceu/common/data/GCYMRecipeTypes.java
@@ -25,7 +25,7 @@
  * @author Rundas
  * @implNote Gregicality Multiblocks Recipe Types
  */
-public class GCyMRecipeTypes {
+public class GCYMRecipeTypes {
 
     //////////////////////////////////////
     // ******* Multiblock *******//

diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java
@@ -95,7 +95,7 @@
 import java.util.function.Supplier;
 
 import static com.gregtechceu.gtceu.api.GTValues.*;
-import static com.gregtechceu.gtceu.common.data.GCyMBlocks.*;
+import static com.gregtechceu.gtceu.common.data.GCYMBlocks.*;
 import static com.gregtechceu.gtceu.common.data.GTModels.createModelBlockState;
 import static com.gregtechceu.gtceu.common.registry.GTRegistration.REGISTRATE;
 
@@ -564,7 +564,7 @@ private static void registerDuctPipeBlock(int index) {
         builder.put(GTMaterials.TungstenSteel, CASING_TUNGSTENSTEEL_ROBUST);
         builder.put(GTMaterials.Polytetrafluoroethylene, CASING_PTFE_INERT);
         builder.put(GTMaterials.HSSE, CASING_HSSE_STURDY);
-        // GCyM
+        // GCYM
         builder.put(GTMaterials.HSLASteel, CASING_NONCONDUCTING);
         builder.put(GTMaterials.IncoloyMA956, CASING_VIBRATION_SAFE);
         builder.put(GTMaterials.WatertightSteel, CASING_WATERTIGHT);
@@ -1730,8 +1730,8 @@ public static void init() {
         FLUID_PIPE_BLOCKS_BUILDER = null;
         ITEM_PIPE_BLOCKS_BUILDER = null;
 
-        // GCyM
-        GCyMBlocks.init();
+        // GCYM
+        GCYMBlocks.init();
     }
 
     public static boolean doMetalPipe(Material material) {

diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/GTMachines.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTMachines.java
@@ -36,7 +36,7 @@
 import com.gregtechceu.gtceu.client.renderer.machine.*;
 import com.gregtechceu.gtceu.client.util.TooltipHelper;
 import com.gregtechceu.gtceu.common.block.BoilerFireboxType;
-import com.gregtechceu.gtceu.common.data.machines.GCyMMachines;
+import com.gregtechceu.gtceu.common.data.machines.GCYMMachines;
 import com.gregtechceu.gtceu.common.data.machines.GTAEMachines;
 import com.gregtechceu.gtceu.common.data.machines.GTCreateMachines;
 import com.gregtechceu.gtceu.common.data.machines.GTResearchMachines;
@@ -2741,7 +2741,7 @@ private static TraceabilityPredicate dataHatchPredicate(TraceabilityPredicate de
     }
 
     public static void init() {
-        GCyMMachines.init();
+        GCYMMachines.init();
         GTResearchMachines.init();
 
         if (GTCEu.isCreateLoaded()) {

diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/GTMaterials.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTMaterials.java
@@ -60,7 +60,7 @@ public static void init() {
         HigherDegreeMaterials.register();
 
         // Gregicality Multiblocks
-        GCyMMaterials.register();
+        GCYMMaterials.register();
 
         /*
          * Register info for cyclical references
@@ -987,7 +987,7 @@ private static void excludeAllGemsButNormal(Material material) {
     public static Material RadAway;
 
     /**
-     * GCyM Materials
+     * GCYM Materials
      */
     public static Material TantalumCarbide;
     public static Material HSLASteel;

diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/GTRecipeTypes.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTRecipeTypes.java
@@ -687,7 +687,7 @@ public static GTRecipeType register(String name, String group, RecipeType<?>...
     }
 
     public static void init() {
-        GCyMRecipeTypes.init();
+        GCYMRecipeTypes.init();
         if (GTCEu.isCreateLoaded()) {
             CREATE_MIXER_RECIPES = register("create_mixer", KINETIC).setMaxIOSize(6, 1, 2, 1).setEUIO(IO.IN)
                     .setSlotOverlay(false, false, GuiTextures.DUST_OVERLAY)

diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/GTRecipes.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTRecipes.java
@@ -74,8 +74,8 @@ public static void recipeAddition(Consumer<FinishedRecipe> originalConsumer) {
         ComponentRecipes.init(consumer);
         MetaTileEntityLoader.init(consumer);
 
-        // GCyM
-        GCyMRecipes.init(consumer);
+        // GCYM
+        GCYMRecipes.init(consumer);
 
         // Config-dependent recipes
         RecipeAddition.init(consumer);

diff --git a/...eu/common/data/machines/GCyMMachines.java → ...eu/common/data/machines/GCYMMachines.java b/...eu/common/data/machines/GCyMMachines.java → ...eu/common/data/machines/GCYMMachines.java
@@ -34,8 +34,8 @@
 import static com.gregtechceu.gtceu.api.machine.multiblock.PartAbility.*;
 import static com.gregtechceu.gtceu.api.pattern.Predicates.*;
 import static com.gregtechceu.gtceu.api.pattern.util.RelativeDirection.*;
-import static com.gregtechceu.gtceu.common.data.GCyMBlocks.*;
-import static com.gregtechceu.gtceu.common.data.GCyMRecipeTypes.ALLOY_BLAST_RECIPES;
+import static com.gregtechceu.gtceu.common.data.GCYMBlocks.*;
+import static com.gregtechceu.gtceu.common.data.GCYMRecipeTypes.ALLOY_BLAST_RECIPES;
 import static com.gregtechceu.gtceu.common.data.GTBlocks.*;
 import static com.gregtechceu.gtceu.common.data.GTMachines.*;
 import static com.gregtechceu.gtceu.common.data.GTMaterials.NaquadahAlloy;
@@ -46,7 +46,7 @@
  * @author Rundas
  * @implNote Gregicality Multiblocks
  */
-public class GCyMMachines {
+public class GCYMMachines {
 
     public static void init() {}
 

diff --git a/.../common/data/materials/GCyMMaterials.java → .../common/data/materials/GCYMMaterials.java b/.../common/data/materials/GCyMMaterials.java → .../common/data/materials/GCYMMaterials.java
@@ -9,7 +9,7 @@
 import static com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialIconSet.*;
 import static com.gregtechceu.gtceu.common.data.GTMaterials.*;
 
-public class GCyMMaterials {
+public class GCYMMaterials {
 
     public static void register() {
         TantalumCarbide = new Material.Builder(GTCEu.id("tantalum_carbide"))

diff --git a/src/main/java/com/gregtechceu/gtceu/data/lang/BlockLang.java b/src/main/java/com/gregtechceu/gtceu/data/lang/BlockLang.java
@@ -70,7 +70,7 @@ private static void initCasingLang(RegistrateLangProvider provider) {
         replace(provider, "block.gtceu.steam_casing_bricked_steel", "Bricked Wrought Iron Hull");
         provider.add("block.gtceu.steam_casing_bricked_steel.tooltip", "§7For improved Steam Machines");
 
-        // GCyM Casings
+        // GCYM Casings
         replace(provider, "block.gtceu.laser_safe_engraving_casing", "Laser-Safe Engraving Casing");
         replace(provider, "block.gtceu.large_scale_assembler_casing", "Large-Scale Assembler Casing");
         replace(provider, "block.gtceu.reaction_safe_mixing_casing", "Reaction-Safe Mixing Casing");

diff --git a/...u/gtceu/data/recipe/misc/GCyMRecipes.java → ...u/gtceu/data/recipe/misc/GCYMRecipes.java b/...u/gtceu/data/recipe/misc/GCyMRecipes.java → ...u/gtceu/data/recipe/misc/GCYMRecipes.java
@@ -21,19 +21,19 @@
 
 import static com.gregtechceu.gtceu.api.GTValues.*;
 import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*;
-import static com.gregtechceu.gtceu.common.data.GCyMBlocks.*;
+import static com.gregtechceu.gtceu.common.data.GCYMBlocks.*;
 import static com.gregtechceu.gtceu.common.data.GTBlocks.CASING_TEMPERED_GLASS;
 import static com.gregtechceu.gtceu.common.data.GTItems.*;
 import static com.gregtechceu.gtceu.common.data.GTMachines.*;
 import static com.gregtechceu.gtceu.common.data.GTMaterials.*;
 import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.ASSEMBLER_RECIPES;
 import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.MIXER_RECIPES;
-import static com.gregtechceu.gtceu.common.data.machines.GCyMMachines.*;
+import static com.gregtechceu.gtceu.common.data.machines.GCYMMachines.*;
 import static com.gregtechceu.gtceu.data.recipe.CustomTags.*;
 
-public class GCyMRecipes {
+public class GCYMRecipes {
 
-    private GCyMRecipes() {}
+    private GCYMRecipes() {}
 
     public static void init(Consumer<FinishedRecipe> provider) {
         registerManualRecipes(provider);
@@ -366,7 +366,7 @@ private static void registerFormulaic(Consumer<FinishedRecipe> provider) {
 
     private static void registerManual(Consumer<FinishedRecipe> provider) {
         // NZF
-        GCyMRecipeTypes.ALLOY_BLAST_RECIPES.recipeBuilder("nickel_zinc_ferrite")
+        GCYMRecipeTypes.ALLOY_BLAST_RECIPES.recipeBuilder("nickel_zinc_ferrite")
                 .inputItems(TagPrefix.dust, GTMaterials.Nickel)
                 .inputItems(TagPrefix.dust, GTMaterials.Zinc)
                 .inputItems(TagPrefix.dust, GTMaterials.Iron, 4)
@@ -384,7 +384,7 @@ private static void registerBinaryAlloy(@NotNull Material input1, int input1Amou
                                             @NotNull Material output, int outputAmount,
                                             int duration,
                                             Consumer<FinishedRecipe> provider) {
-        GCyMRecipeTypes.ALLOY_BLAST_RECIPES.recipeBuilder(output.getName())
+        GCYMRecipeTypes.ALLOY_BLAST_RECIPES.recipeBuilder(output.getName())
                 .inputItems(TagPrefix.dust, input1, input1Amount)
                 .inputItems(TagPrefix.dust, input2, input2Amount)
                 .circuitMeta(input1Amount + input2Amount)
@@ -402,7 +402,7 @@ private static void registerTrinaryAlloy(@NotNull Material input1, int input1Amo
                                              @NotNull Material output, int outputAmount,
                                              int duration,
                                              Consumer<FinishedRecipe> provider) {
-        GCyMRecipeTypes.ALLOY_BLAST_RECIPES.recipeBuilder(output.getName())
+        GCYMRecipeTypes.ALLOY_BLAST_RECIPES.recipeBuilder(output.getName())
                 .inputItems(TagPrefix.dust, input1, input1Amount)
                 .inputItems(TagPrefix.dust, input2, input2Amount)
                 .inputItems(TagPrefix.dust, input3, input3Amount)
@@ -417,7 +417,7 @@ private static void registerTrinaryAlloy(@NotNull Material input1, int input1Amo
     private static void registerBlastAlloyRecipes(Consumer<FinishedRecipe> provider) {
         registerFormulaic(provider);
         registerManual(provider);
-        ingot.executeHandler(provider, PropertyKey.ALLOY_BLAST, GCyMRecipes::generateAlloyBlastRecipes);
+        ingot.executeHandler(provider, PropertyKey.ALLOY_BLAST, GCYMRecipes::generateAlloyBlastRecipes);
     }
 
     /**

diff --git a/...main/java/com/gregtechceu/gtceu/data/recipe/misc/alloyblast/AlloyBlastRecipeProducer.java b/...main/java/com/gregtechceu/gtceu/data/recipe/misc/alloyblast/AlloyBlastRecipeProducer.java
@@ -9,7 +9,7 @@
 import com.gregtechceu.gtceu.api.data.tag.TagPrefix;
 import com.gregtechceu.gtceu.api.fluids.store.FluidStorageKeys;
 import com.gregtechceu.gtceu.api.recipe.ingredient.FluidIngredient;
-import com.gregtechceu.gtceu.common.data.GCyMRecipeTypes;
+import com.gregtechceu.gtceu.common.data.GCYMRecipeTypes;
 import com.gregtechceu.gtceu.common.data.GTItems;
 import com.gregtechceu.gtceu.common.data.GTMaterials;
 import com.gregtechceu.gtceu.common.data.GTRecipeTypes;
@@ -75,7 +75,7 @@ public void produce(@NotNull Material material, @NotNull BlastProperty property,
     @SuppressWarnings("MethodMayBeStatic")
     @NotNull
     protected GTRecipeBuilder createBuilder(@NotNull BlastProperty property, @NotNull Material material) {
-        GTRecipeBuilder builder = GCyMRecipeTypes.ALLOY_BLAST_RECIPES.recipeBuilder(material.getName());
+        GTRecipeBuilder builder = GCYMRecipeTypes.ALLOY_BLAST_RECIPES.recipeBuilder(material.getName());
         // apply the duration override
         int duration = property.getDurationOverride();
         if (duration < 0) duration = Math.max(1, (int) (material.getMass() * property.getBlastTemperature() / 100L));

diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/GregTechKubeJSPlugin.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/GregTechKubeJSPlugin.java
@@ -44,7 +44,7 @@
 import com.gregtechceu.gtceu.api.recipe.chance.logic.ChanceLogic;
 import com.gregtechceu.gtceu.api.registry.GTRegistries;
 import com.gregtechceu.gtceu.common.data.*;
-import com.gregtechceu.gtceu.common.data.machines.GCyMMachines;
+import com.gregtechceu.gtceu.common.data.machines.GCYMMachines;
 import com.gregtechceu.gtceu.common.item.armor.PowerlessJetpack;
 import com.gregtechceu.gtceu.common.unification.material.MaterialRegistryManager;
 import com.gregtechceu.gtceu.data.recipe.CraftingComponent;
@@ -198,9 +198,11 @@ public void registerBindings(BindingsEvent event) {
         event.add("GTElements", GTElements.class);
         event.add("GTSoundEntries", GTSoundEntries.class);
         event.add("GTBlocks", GTBlocks.class);
-        event.add("GCyMBlocks", GCyMBlocks.class);
+        event.add("GCyMBlocks", GCYMBlocks.class);
+        event.add("GCYMBlocks", GCYMBlocks.class);
         event.add("GTMachines", GTMachines.class);
-        event.add("GCyMMachines", GCyMMachines.class);
+        event.add("GCyMMachines", GCYMMachines.class);
+        event.add("GCYMMachines", GCYMMachines.class);
         event.add("GTItems", GTItems.class);
         event.add("GTRecipeTypes", GTRecipeTypes.class);
         event.add("GTMedicalConditions", GTMedicalConditions.class);