Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Renames GCYM classes to proper capitalization #2047

Open
wants to merge 1 commit into
base: 1.20.1
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ public String toString() {
.requireProps(PropertyKey.DUST)
.build();

// GCyM
// GCYM
/**
* Use to disable alloy blast recipes from generating
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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() {}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
* @author Rundas
* @implNote Gregicality Multiblocks Recipe Types
*/
public class GCyMRecipeTypes {
public class GCYMRecipeTypes {

//////////////////////////////////////
// ******* Multiblock *******//
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -2740,7 +2740,7 @@ private static TraceabilityPredicate dataHatchPredicate(TraceabilityPredicate de
}

public static void init() {
GCyMMachines.init();
GCYMMachines.init();
GTResearchMachines.init();

if (GTCEu.isCreateLoaded()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public static void init() {
HigherDegreeMaterials.register();

// Gregicality Multiblocks
GCyMMaterials.register();
GCYMMaterials.register();

/*
* Register info for cyclical references
Expand Down Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -43,7 +43,7 @@
* @author Rundas
* @implNote Gregicality Multiblocks
*/
public class GCyMMachines {
public class GCYMMachines {

public static void init() {}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<FinishedRecipe> provider) {
registerManualRecipes(provider);
Expand Down Expand Up @@ -368,7 +368,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)
Expand All @@ -386,7 +386,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)
Expand All @@ -404,7 +404,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)
Expand All @@ -419,7 +419,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);
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
Loading