From c0c31373ced3008ee09a2569a04251ec28dc4797 Mon Sep 17 00:00:00 2001 From: YoungOnion <39562198+YoungOnionMC@users.noreply.github.com> Date: Thu, 26 Sep 2024 02:28:18 -0600 Subject: [PATCH] gcYm renaming --- .../chemical/material/info/MaterialFlags.java | 2 +- .../data/{GCyMBlocks.java => GCYMBlocks.java} | 2 +- ...GCyMRecipeTypes.java => GCYMRecipeTypes.java} | 2 +- .../gregtechceu/gtceu/common/data/GTBlocks.java | 8 ++++---- .../gtceu/common/data/GTMachines.java | 4 ++-- .../gtceu/common/data/GTMaterials.java | 4 ++-- .../gtceu/common/data/GTRecipeTypes.java | 2 +- .../gregtechceu/gtceu/common/data/GTRecipes.java | 4 ++-- .../{GCyMMachines.java => GCYMMachines.java} | 6 +++--- .../{GCyMMaterials.java => GCYMMaterials.java} | 2 +- .../gregtechceu/gtceu/data/lang/BlockLang.java | 2 +- .../misc/{GCyMRecipes.java => GCYMRecipes.java} | 16 ++++++++-------- .../alloyblast/AlloyBlastRecipeProducer.java | 4 ++-- .../integration/kjs/GregTechKubeJSPlugin.java | 8 +++++--- 14 files changed, 34 insertions(+), 32 deletions(-) rename src/main/java/com/gregtechceu/gtceu/common/data/{GCyMBlocks.java => GCYMBlocks.java} (99%) rename src/main/java/com/gregtechceu/gtceu/common/data/{GCyMRecipeTypes.java => GCYMRecipeTypes.java} (99%) rename src/main/java/com/gregtechceu/gtceu/common/data/machines/{GCyMMachines.java => GCYMMachines.java} (99%) rename src/main/java/com/gregtechceu/gtceu/common/data/materials/{GCyMMaterials.java => GCYMMaterials.java} (99%) rename src/main/java/com/gregtechceu/gtceu/data/recipe/misc/{GCyMRecipes.java => GCYMRecipes.java} (98%) 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 index 33b0a62b09..f984562ecf 100644 --- 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/src/main/java/com/gregtechceu/gtceu/common/data/GCyMBlocks.java b/src/main/java/com/gregtechceu/gtceu/common/data/GCYMBlocks.java similarity index 99% rename from src/main/java/com/gregtechceu/gtceu/common/data/GCyMBlocks.java rename to src/main/java/com/gregtechceu/gtceu/common/data/GCYMBlocks.java index fd5e9035dd..9c882fbcaf 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/GCyMBlocks.java +++ b/src/main/java/com/gregtechceu/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/src/main/java/com/gregtechceu/gtceu/common/data/GCyMRecipeTypes.java b/src/main/java/com/gregtechceu/gtceu/common/data/GCYMRecipeTypes.java similarity index 99% rename from src/main/java/com/gregtechceu/gtceu/common/data/GCyMRecipeTypes.java rename to src/main/java/com/gregtechceu/gtceu/common/data/GCYMRecipeTypes.java index e605772822..9520e77828 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/GCyMRecipeTypes.java +++ b/src/main/java/com/gregtechceu/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 index c123384a66..ce93effbfe 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java @@ -94,7 +94,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; @@ -559,7 +559,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); @@ -1719,8 +1719,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 index f930262e36..87b862ad3c 100644 --- 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; @@ -2740,7 +2740,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 index 1119778619..548ae321a1 100644 --- 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 index 84f8f6eae1..d9335a9a28 100644 --- 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 index f5e3f5dc2b..ec474e2921 100644 --- 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 originalConsumer) { ComponentRecipes.init(consumer); MetaTileEntityLoader.init(consumer); - // GCyM - GCyMRecipes.init(consumer); + // GCYM + GCYMRecipes.init(consumer); // Config-dependent recipes RecipeAddition.init(consumer); diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/machines/GCyMMachines.java b/src/main/java/com/gregtechceu/gtceu/common/data/machines/GCYMMachines.java similarity index 99% rename from src/main/java/com/gregtechceu/gtceu/common/data/machines/GCyMMachines.java rename to src/main/java/com/gregtechceu/gtceu/common/data/machines/GCYMMachines.java index 483156618c..a0b31e6f49 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/machines/GCyMMachines.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/machines/GCYMMachines.java @@ -31,8 +31,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; @@ -43,7 +43,7 @@ * @author Rundas * @implNote Gregicality Multiblocks */ -public class GCyMMachines { +public class GCYMMachines { public static void init() {} diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/materials/GCyMMaterials.java b/src/main/java/com/gregtechceu/gtceu/common/data/materials/GCYMMaterials.java similarity index 99% rename from src/main/java/com/gregtechceu/gtceu/common/data/materials/GCyMMaterials.java rename to src/main/java/com/gregtechceu/gtceu/common/data/materials/GCYMMaterials.java index 258f7f9554..55e2bb851d 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/materials/GCyMMaterials.java +++ b/src/main/java/com/gregtechceu/gtceu/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 index 440de04732..5015cc0350 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/lang/BlockLang.java +++ b/src/main/java/com/gregtechceu/gtceu/data/lang/BlockLang.java @@ -66,7 +66,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/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/GCyMRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/GCYMRecipes.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/data/recipe/misc/GCyMRecipes.java rename to src/main/java/com/gregtechceu/gtceu/data/recipe/misc/GCYMRecipes.java index 0ad9b66849..bedb552512 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/GCyMRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/GCYMRecipes.java @@ -23,19 +23,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 provider) { registerManualRecipes(provider); @@ -368,7 +368,7 @@ private static void registerFormulaic(Consumer provider) { private static void registerManual(Consumer 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) @@ -386,7 +386,7 @@ private static void registerBinaryAlloy(@NotNull Material input1, int input1Amou @NotNull Material output, int outputAmount, int duration, Consumer 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) @@ -404,7 +404,7 @@ private static void registerTrinaryAlloy(@NotNull Material input1, int input1Amo @NotNull Material output, int outputAmount, int duration, Consumer 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) @@ -419,7 +419,7 @@ private static void registerTrinaryAlloy(@NotNull Material input1, int input1Amo private static void registerBlastAlloyRecipes(Consumer provider) { registerFormulaic(provider); registerManual(provider); - ingot.executeHandler(provider, PropertyKey.ALLOY_BLAST, GCyMRecipes::generateAlloyBlastRecipes); + ingot.executeHandler(provider, PropertyKey.ALLOY_BLAST, GCYMRecipes::generateAlloyBlastRecipes); } /** diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/alloyblast/AlloyBlastRecipeProducer.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/alloyblast/AlloyBlastRecipeProducer.java index 43ae5eec28..2ae477b9f1 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/alloyblast/AlloyBlastRecipeProducer.java +++ b/src/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; @@ -76,7 +76,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 index d88abb592f..0414100c7f 100644 --- 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.unification.material.MaterialRegistryManager; import com.gregtechceu.gtceu.data.recipe.CraftingComponent; import com.gregtechceu.gtceu.data.recipe.builder.GTRecipeBuilder; @@ -197,9 +197,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);