Update mod group

gradle.properties

@@ -3,11 +3,11 @@ modName = GTExpertCore
 # This is a case-sensitive string to identify your mod. Convention is to use lower case.
 modId = gtexpert
 
-modGroup = gtexpert
+modGroup = com.github.gtexpert.core
 
 # Version of your mod.
 # This field can be left empty if you want your mod's version to be determined by the latest git tag instead.
-modVersion = 2.4.1-beta
+modVersion = 2.4.1-beta
 
 # Whether to use the old jar naming structure (modid-mcversion-version) instead of the new version (modid-version)
 includeMCVersionJar = true
@@ -62,7 +62,7 @@ enableModernJavaSyntax = true
 enableJava17RunTasks = false
 
 # Generate a class with String fields for the mod id, name and version named with the fields below
-generateGradleTokenClass = gtexpert.Tags
+generateGradleTokenClass = com.github.gtexpert.core.Tags
 gradleTokenModId = MODID
 gradleTokenModName = MODNAME
 gradleTokenVersion = VERSION

spotless.importorder

@@ -6,4 +6,4 @@
 4=com
 5=gregtech
 6=gregicality
-7=gtexpert
+7=com.github.gtexpert

src/main/java/gtexpert/GTExpertMod.java → src/main/java/com/github/gtexpert/core/GTExpertMod.java

@@ -1,4 +1,4 @@
-package gtexpert;
+package com.github.gtexpert.core;
 
 import java.util.function.Function;
 
@@ -22,13 +22,13 @@
 import gregtech.api.GregTechAPI;
 import gregtech.api.cover.CoverDefinition;
 
-import gtexpert.api.GTEValues;
-import gtexpert.api.util.GTELog;
-import gtexpert.api.util.Mods;
-import gtexpert.common.GTEConfigHolder;
-import gtexpert.common.items.behaviors.GTECoverBehaviors;
-import gtexpert.modules.GTEModuleManager;
-import gtexpert.modules.GTEModules;
+import com.github.gtexpert.core.api.GTEValues;
+import com.github.gtexpert.core.api.util.GTELog;
+import com.github.gtexpert.core.api.util.Mods;
+import com.github.gtexpert.core.common.GTEConfigHolder;
+import com.github.gtexpert.core.common.items.behaviors.GTECoverBehaviors;
+import com.github.gtexpert.core.modules.GTEModuleManager;
+import com.github.gtexpert.core.modules.GTEModules;
 
 @Mod(modid = GTEValues.MODID,
      name = GTEValues.MODNAME,

src/main/java/gtexpert/api/GTEValues.java → src/main/java/com/github/gtexpert/core/api/GTEValues.java

@@ -1,12 +1,12 @@
-package gtexpert.api;
+package com.github.gtexpert.core.api;
 
-import gtexpert.Tags;
-import gtexpert.api.util.GTELog;
-import gtexpert.api.util.Mods;
-import gtexpert.integration.ae.AEConfigHolder;
-import gtexpert.integration.deda.DEDAConfigHolder;
-import gtexpert.integration.eio.EnderIOConfigHolder;
-import gtexpert.modules.GTEModules;
+import com.github.gtexpert.core.Tags;
+import com.github.gtexpert.core.api.util.GTELog;
+import com.github.gtexpert.core.api.util.Mods;
+import com.github.gtexpert.core.integration.ae.AEConfigHolder;
+import com.github.gtexpert.core.integration.deda.DEDAConfigHolder;
+import com.github.gtexpert.core.integration.eio.EnderIOConfigHolder;
+import com.github.gtexpert.core.modules.GTEModules;
 
 public class GTEValues {
 

src/main/java/gtexpert/api/capability/GTEDataCodes.java → src/main/java/com/github/gtexpert/core/api/capability/GTEDataCodes.java

@@ -1,4 +1,4 @@
-package gtexpert.api.capability;
+package com.github.gtexpert.core.api.capability;
 
 public class GTEDataCodes {
 

src/main/java/gtexpert/api/capability/MultiblockRecipeLogicNoCache.java → src/main/java/com/github/gtexpert/core/api/capability/MultiblockRecipeLogicNoCache.java

@@ -1,9 +1,9 @@
-package gtexpert.api.capability;
+package com.github.gtexpert.core.api.capability;
 
 import gregtech.api.capability.impl.MultiblockRecipeLogic;
 import gregtech.api.metatileentity.multiblock.RecipeMapMultiblockController;
 
-import gtexpert.integration.deda.recipemaps.RecipeMapDraconicFusion;
+import com.github.gtexpert.core.integration.deda.recipemaps.RecipeMapDraconicFusion;
 
 /**
  * This recipe logic disables cache used for speeding up recipe check.

src/main/java/gtexpert/api/capability/SingleblockRecipeLogicNoCache.java → src/main/java/com/github/gtexpert/core/api/capability/SingleblockRecipeLogicNoCache.java

@@ -1,4 +1,4 @@
-package gtexpert.api.capability;
+package com.github.gtexpert.core.api.capability;
 
 import java.util.function.Supplier;
 

src/main/java/gtexpert/api/gui/GTEGuiTextures.java → src/main/java/com/github/gtexpert/core/api/gui/GTEGuiTextures.java

@@ -1,4 +1,4 @@
-package gtexpert.api.gui;
+package com.github.gtexpert.core.api.gui;
 
 import gregtech.api.gui.resources.SteamTexture;
 import gregtech.api.gui.resources.TextureArea;

src/main/java/gtexpert/api/modules/GTEModule.java → src/main/java/com/github/gtexpert/core/api/modules/GTEModule.java

@@ -1,4 +1,4 @@
-package gtexpert.api.modules;
+package com.github.gtexpert.core.api.modules;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/main/java/gtexpert/api/modules/IGTEModule.java → src/main/java/com/github/gtexpert/core/api/modules/IGTEModule.java

@@ -1,4 +1,4 @@
-package gtexpert.api.modules;
+package com.github.gtexpert.core.api.modules;
 
 import java.util.Collections;
 import java.util.List;

src/main/java/gtexpert/api/modules/IModuleContainer.java → src/main/java/com/github/gtexpert/core/api/modules/IModuleContainer.java

@@ -1,4 +1,4 @@
-package gtexpert.api.modules;
+package com.github.gtexpert.core.api.modules;
 
 public interface IModuleContainer {
 

src/main/java/gtexpert/api/modules/IModuleManager.java → src/main/java/com/github/gtexpert/core/api/modules/IModuleManager.java

@@ -1,8 +1,8 @@
-package gtexpert.api.modules;
+package com.github.gtexpert.core.api.modules;
 
 import net.minecraft.util.ResourceLocation;
 
-import gtexpert.api.util.GTEUtility;
+import com.github.gtexpert.core.api.util.GTEUtility;
 
 public interface IModuleManager {
 

src/main/java/gtexpert/api/modules/ModuleContainer.java → src/main/java/com/github/gtexpert/core/api/modules/ModuleContainer.java

@@ -1,4 +1,4 @@
-package gtexpert.api.modules;
+package com.github.gtexpert.core.api.modules;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/main/java/gtexpert/api/modules/ModuleStage.java → src/main/java/com/github/gtexpert/core/api/modules/ModuleStage.java

@@ -1,4 +1,4 @@
-package gtexpert.api.modules;
+package com.github.gtexpert.core.api.modules;
 
 /**
  * Basically {@link net.minecraftforge.fml.common.LoaderState} but only for launch stages.

src/main/java/gtexpert/api/recipes/GTERecipeMaps.java → src/main/java/com/github/gtexpert/core/api/recipes/GTERecipeMaps.java

@@ -1,4 +1,4 @@
-package gtexpert.api.recipes;
+package com.github.gtexpert.core.api.recipes;
 
 import net.minecraft.init.SoundEvents;
 
@@ -8,7 +8,7 @@
 import gregtech.api.recipes.builders.SimpleRecipeBuilder;
 import gregtech.core.sound.GTSoundEvents;
 
-import gtexpert.api.gui.GTEGuiTextures;
+import com.github.gtexpert.core.api.gui.GTEGuiTextures;
 
 import crafttweaker.annotations.ZenRegister;
 import stanhebben.zenscript.annotations.ZenExpansion;

src/main/java/gtexpert/api/unification/GTEElements.java → src/main/java/com/github/gtexpert/core/api/unification/GTEElements.java

@@ -1,4 +1,4 @@
-package gtexpert.api.unification;
+package com.github.gtexpert.core.api.unification;
 
 import java.util.*;
 

src/main/java/gtexpert/api/unification/material/GTEFirstDegreeMaterials.java → src/main/java/com/github/gtexpert/core/api/unification/material/GTEFirstDegreeMaterials.java

@@ -1,11 +1,11 @@
-package gtexpert.api.unification.material;
+package com.github.gtexpert.core.api.unification.material;
 
+import static com.github.gtexpert.core.api.unification.material.GTEMaterials.*;
+import static com.github.gtexpert.core.api.util.GTEUtility.gteId;
 import static gregtech.api.GTValues.*;
 import static gregtech.api.unification.material.Materials.*;
 import static gregtech.api.unification.material.info.MaterialFlags.*;
 import static gregtech.api.unification.material.info.MaterialIconSet.*;
-import static gtexpert.api.unification.material.GTEMaterials.*;
-import static gtexpert.api.util.GTEUtility.gteId;
 
 import gregtech.api.fluids.FluidBuilder;
 import gregtech.api.unification.material.Material;

src/main/java/gtexpert/api/unification/material/GTEMaterialFlags.java → src/main/java/com/github/gtexpert/core/api/unification/material/GTEMaterialFlags.java

@@ -1,4 +1,4 @@
-package gtexpert.api.unification.material;
+package com.github.gtexpert.core.api.unification.material;
 
 import static gregtech.api.unification.material.info.MaterialFlags.*;
 
@@ -8,7 +8,7 @@
 import gregtech.api.unification.material.properties.*;
 import gregtech.api.unification.ore.OrePrefix;
 
-import gtexpert.api.util.Mods;
+import com.github.gtexpert.core.api.util.Mods;
 
 public class GTEMaterialFlags {
 

src/main/java/gtexpert/api/unification/material/GTEMaterials.java → src/main/java/com/github/gtexpert/core/api/unification/material/GTEMaterials.java

@@ -1,10 +1,10 @@
-package gtexpert.api.unification.material;
+package com.github.gtexpert.core.api.unification.material;
 
 import gregtech.api.unification.material.Material;
 
-import gtexpert.api.GTEValues;
-import gtexpert.api.unification.material.ingredients.*;
-import gtexpert.api.util.Mods;
+import com.github.gtexpert.core.api.GTEValues;
+import com.github.gtexpert.core.api.unification.material.ingredients.*;
+import com.github.gtexpert.core.api.util.Mods;
 
 /**
  * Material Registration.

src/main/java/gtexpert/api/unification/material/info/GTEMaterialIconSet.java → src/main/java/com/github/gtexpert/core/api/unification/material/info/GTEMaterialIconSet.java

@@ -1,4 +1,4 @@
-package gtexpert.api.unification.material.info;
+package com.github.gtexpert.core.api.unification.material.info;
 
 import gregtech.api.unification.material.info.MaterialIconSet;
 

src/main/java/gtexpert/api/unification/material/ingredients/AEFirstDegreeMaterials.java → src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/AEFirstDegreeMaterials.java

@@ -1,11 +1,11 @@
-package gtexpert.api.unification.material.ingredients;
+package com.github.gtexpert.core.api.unification.material.ingredients;
 
+import static com.github.gtexpert.core.api.unification.material.GTEMaterials.*;
+import static com.github.gtexpert.core.api.util.GTEUtility.gteId;
 import static gregicality.multiblocks.api.unification.GCYMMaterialFlags.NO_ALLOY_BLAST_RECIPES;
 import static gregtech.api.GTValues.*;
 import static gregtech.api.unification.material.Materials.*;
 import static gregtech.api.unification.material.info.MaterialFlags.*;
-import static gtexpert.api.unification.material.GTEMaterials.*;
-import static gtexpert.api.util.GTEUtility.gteId;
 
 import gregtech.api.fluids.FluidBuilder;
 import gregtech.api.unification.material.Material;
@@ -14,7 +14,7 @@
 import gregtech.api.unification.material.properties.BlastProperty.GasTier;
 import gregtech.api.unification.ore.OrePrefix;
 
-import gtexpert.api.GTEValues;
+import com.github.gtexpert.core.api.GTEValues;
 
 public class AEFirstDegreeMaterials {
 

src/main/java/gtexpert/api/unification/material/ingredients/AvaritiaFirstDegreeMaterials.java → src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/AvaritiaFirstDegreeMaterials.java

@@ -1,17 +1,17 @@
-package gtexpert.api.unification.material.ingredients;
+package com.github.gtexpert.core.api.unification.material.ingredients;
 
+import static com.github.gtexpert.core.api.unification.GTEElements.*;
+import static com.github.gtexpert.core.api.unification.material.GTEMaterials.*;
+import static com.github.gtexpert.core.api.util.GTEUtility.gteId;
 import static gregtech.api.GTValues.*;
 import static gregtech.api.unification.material.Materials.*;
 import static gregtech.api.unification.material.info.MaterialFlags.*;
-import static gtexpert.api.unification.GTEElements.*;
-import static gtexpert.api.unification.material.GTEMaterials.*;
-import static gtexpert.api.util.GTEUtility.gteId;
 
 import gregtech.api.fluids.FluidBuilder;
 import gregtech.api.unification.material.Material;
 import gregtech.api.unification.material.properties.ToolProperty;
 
-import gtexpert.api.unification.material.info.GTEMaterialIconSet;
+import com.github.gtexpert.core.api.unification.material.info.GTEMaterialIconSet;
 
 public class AvaritiaFirstDegreeMaterials {
 

src/main/java/gtexpert/api/unification/material/ingredients/DEFirstDegreeMaterials.java → src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/DEFirstDegreeMaterials.java

@@ -1,11 +1,11 @@
-package gtexpert.api.unification.material.ingredients;
+package com.github.gtexpert.core.api.unification.material.ingredients;
 
+import static com.github.gtexpert.core.api.unification.GTEElements.*;
+import static com.github.gtexpert.core.api.unification.material.GTEMaterials.*;
+import static com.github.gtexpert.core.api.util.GTEUtility.gteId;
 import static gregtech.api.GTValues.*;
 import static gregtech.api.unification.material.Materials.*;
 import static gregtech.api.unification.material.info.MaterialFlags.*;
-import static gtexpert.api.unification.GTEElements.*;
-import static gtexpert.api.unification.material.GTEMaterials.*;
-import static gtexpert.api.util.GTEUtility.gteId;
 
 import gregtech.api.fluids.FluidBuilder;
 import gregtech.api.unification.material.Material;
@@ -15,8 +15,8 @@
 
 import gregicality.multiblocks.api.fluids.GCYMFluidStorageKeys;
 
-import gtexpert.api.GTEValues;
-import gtexpert.api.util.Mods;
+import com.github.gtexpert.core.api.GTEValues;
+import com.github.gtexpert.core.api.util.Mods;
 
 public class DEFirstDegreeMaterials {
 

src/main/java/gtexpert/api/unification/material/ingredients/EIOFirstDegreeMaterials.java → src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/EIOFirstDegreeMaterials.java

@@ -1,17 +1,17 @@
-package gtexpert.api.unification.material.ingredients;
+package com.github.gtexpert.core.api.unification.material.ingredients;
 
+import static com.github.gtexpert.core.api.unification.material.GTEMaterials.*;
+import static com.github.gtexpert.core.api.util.GTEUtility.gteId;
 import static gregtech.api.GTValues.*;
 import static gregtech.api.unification.material.Materials.*;
 import static gregtech.api.unification.material.info.MaterialFlags.*;
-import static gtexpert.api.unification.material.GTEMaterials.*;
-import static gtexpert.api.util.GTEUtility.gteId;
 
 import gregtech.api.fluids.FluidBuilder;
 import gregtech.api.unification.material.Material;
 import gregtech.api.unification.material.info.MaterialIconSet;
 import gregtech.api.unification.material.properties.BlastProperty.GasTier;
 
-import gtexpert.api.GTEValues;
+import com.github.gtexpert.core.api.GTEValues;
 
 public class EIOFirstDegreeMaterials {
 

src/main/java/gtexpert/api/unification/material/ingredients/TCFirstDegreeMaterials.java → src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/TCFirstDegreeMaterials.java

@@ -1,10 +1,10 @@
-package gtexpert.api.unification.material.ingredients;
+package com.github.gtexpert.core.api.unification.material.ingredients;
 
+import static com.github.gtexpert.core.api.unification.GTEElements.*;
+import static com.github.gtexpert.core.api.unification.material.GTEMaterials.*;
+import static com.github.gtexpert.core.api.util.GTEUtility.gteId;
 import static gregtech.api.unification.material.Materials.*;
 import static gregtech.api.unification.material.info.MaterialFlags.*;
-import static gtexpert.api.unification.GTEElements.*;
-import static gtexpert.api.unification.material.GTEMaterials.*;
-import static gtexpert.api.util.GTEUtility.gteId;
 
 import gregtech.api.fluids.FluidBuilder;
 import gregtech.api.unification.material.Material;

src/main/java/gtexpert/api/util/GTELog.java → src/main/java/com/github/gtexpert/core/api/util/GTELog.java

@@ -1,9 +1,9 @@
-package gtexpert.api.util;
+package com.github.gtexpert.core.api.util;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import gtexpert.api.GTEValues;
+import com.github.gtexpert.core.api.GTEValues;
 
 public class GTELog {
 

src/main/java/gtexpert/api/util/GTEUtility.java → src/main/java/com/github/gtexpert/core/api/util/GTEUtility.java

@@ -1,4 +1,4 @@
-package gtexpert.api.util;
+package com.github.gtexpert.core.api.util;
 
 import java.util.Objects;
 import java.util.Random;
@@ -21,8 +21,8 @@
 import gregtech.api.unification.stack.MaterialStack;
 import gregtech.common.items.MetaItems;
 
-import gtexpert.api.GTEValues;
-import gtexpert.common.items.GTEMetaItems;
+import com.github.gtexpert.core.api.GTEValues;
+import com.github.gtexpert.core.common.items.GTEMetaItems;
 
 public class GTEUtility {
 

src/main/java/gtexpert/api/util/ModIncompatibilityException.java → src/main/java/com/github/gtexpert/core/api/util/ModIncompatibilityException.java

@@ -1,4 +1,4 @@
-package gtexpert.api.util;
+package com.github.gtexpert.core.api.util;
 
 import java.util.List;
 

src/main/java/gtexpert/api/util/Mods.java → src/main/java/com/github/gtexpert/core/api/util/Mods.java

@@ -1,4 +1,4 @@
-package gtexpert.api.util;
+package com.github.gtexpert.core.api.util;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -21,7 +21,7 @@
 
 import gregtech.api.GTValues;
 
-import gtexpert.api.GTEValues;
+import com.github.gtexpert.core.api.GTEValues;
 
 public enum Mods {
 

src/main/java/gtexpert/client/ClientProxy.java → src/main/java/com/github/gtexpert/core/client/ClientProxy.java

@@ -1,13 +1,13 @@
-package gtexpert.client;
+package com.github.gtexpert.core.client;
 
 import net.minecraftforge.client.event.ModelRegistryEvent;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.relauncher.Side;
 
-import gtexpert.common.CommonProxy;
-import gtexpert.common.blocks.GTEMetaBlocks;
+import com.github.gtexpert.core.common.CommonProxy;
+import com.github.gtexpert.core.common.blocks.GTEMetaBlocks;
 
 @Mod.EventBusSubscriber(Side.CLIENT)
 public class ClientProxy extends CommonProxy {