diff --git a/gradle.properties b/gradle.properties index b9c11931..c96f1d25 100644 --- a/gradle.properties +++ b/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 diff --git a/spotless.importorder b/spotless.importorder index e503714d..41019cc1 100644 --- a/spotless.importorder +++ b/spotless.importorder @@ -6,4 +6,4 @@ 4=com 5=gregtech 6=gregicality -7=gtexpert +7=com.github.gtexpert diff --git a/src/main/java/gtexpert/GTExpertMod.java b/src/main/java/com/github/gtexpert/core/GTExpertMod.java similarity index 94% rename from src/main/java/gtexpert/GTExpertMod.java rename to src/main/java/com/github/gtexpert/core/GTExpertMod.java index 82effca7..ebc7c7c6 100644 --- a/src/main/java/gtexpert/GTExpertMod.java +++ b/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, diff --git a/src/main/java/gtexpert/api/GTEValues.java b/src/main/java/com/github/gtexpert/core/api/GTEValues.java similarity index 85% rename from src/main/java/gtexpert/api/GTEValues.java rename to src/main/java/com/github/gtexpert/core/api/GTEValues.java index 7eb9d878..0ba1d9cd 100644 --- a/src/main/java/gtexpert/api/GTEValues.java +++ b/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 { diff --git a/src/main/java/gtexpert/api/capability/GTEDataCodes.java b/src/main/java/com/github/gtexpert/core/api/capability/GTEDataCodes.java similarity index 62% rename from src/main/java/gtexpert/api/capability/GTEDataCodes.java rename to src/main/java/com/github/gtexpert/core/api/capability/GTEDataCodes.java index 3b62c86e..fdb17697 100644 --- a/src/main/java/gtexpert/api/capability/GTEDataCodes.java +++ b/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 { diff --git a/src/main/java/gtexpert/api/capability/MultiblockRecipeLogicNoCache.java b/src/main/java/com/github/gtexpert/core/api/capability/MultiblockRecipeLogicNoCache.java similarity index 85% rename from src/main/java/gtexpert/api/capability/MultiblockRecipeLogicNoCache.java rename to src/main/java/com/github/gtexpert/core/api/capability/MultiblockRecipeLogicNoCache.java index a2ff5644..2c92eab9 100644 --- a/src/main/java/gtexpert/api/capability/MultiblockRecipeLogicNoCache.java +++ b/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. diff --git a/src/main/java/gtexpert/api/capability/SingleblockRecipeLogicNoCache.java b/src/main/java/com/github/gtexpert/core/api/capability/SingleblockRecipeLogicNoCache.java similarity index 92% rename from src/main/java/gtexpert/api/capability/SingleblockRecipeLogicNoCache.java rename to src/main/java/com/github/gtexpert/core/api/capability/SingleblockRecipeLogicNoCache.java index 62c1fcf4..d54f759d 100644 --- a/src/main/java/gtexpert/api/capability/SingleblockRecipeLogicNoCache.java +++ b/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; diff --git a/src/main/java/gtexpert/api/gui/GTEGuiTextures.java b/src/main/java/com/github/gtexpert/core/api/gui/GTEGuiTextures.java similarity index 98% rename from src/main/java/gtexpert/api/gui/GTEGuiTextures.java rename to src/main/java/com/github/gtexpert/core/api/gui/GTEGuiTextures.java index 3ffc3d06..26ffd5ec 100644 --- a/src/main/java/gtexpert/api/gui/GTEGuiTextures.java +++ b/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; diff --git a/src/main/java/gtexpert/api/modules/GTEModule.java b/src/main/java/com/github/gtexpert/core/api/modules/GTEModule.java similarity index 96% rename from src/main/java/gtexpert/api/modules/GTEModule.java rename to src/main/java/com/github/gtexpert/core/api/modules/GTEModule.java index 585312f8..e1ad0483 100644 --- a/src/main/java/gtexpert/api/modules/GTEModule.java +++ b/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; diff --git a/src/main/java/gtexpert/api/modules/IGTEModule.java b/src/main/java/com/github/gtexpert/core/api/modules/IGTEModule.java similarity index 98% rename from src/main/java/gtexpert/api/modules/IGTEModule.java rename to src/main/java/com/github/gtexpert/core/api/modules/IGTEModule.java index cdce86cb..99b8fdbd 100644 --- a/src/main/java/gtexpert/api/modules/IGTEModule.java +++ b/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; diff --git a/src/main/java/gtexpert/api/modules/IModuleContainer.java b/src/main/java/com/github/gtexpert/core/api/modules/IModuleContainer.java similarity index 81% rename from src/main/java/gtexpert/api/modules/IModuleContainer.java rename to src/main/java/com/github/gtexpert/core/api/modules/IModuleContainer.java index 113a083d..179f9006 100644 --- a/src/main/java/gtexpert/api/modules/IModuleContainer.java +++ b/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 { diff --git a/src/main/java/gtexpert/api/modules/IModuleManager.java b/src/main/java/com/github/gtexpert/core/api/modules/IModuleManager.java similarity index 85% rename from src/main/java/gtexpert/api/modules/IModuleManager.java rename to src/main/java/com/github/gtexpert/core/api/modules/IModuleManager.java index cea44ae5..1ce2b49f 100644 --- a/src/main/java/gtexpert/api/modules/IModuleManager.java +++ b/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 { diff --git a/src/main/java/gtexpert/api/modules/ModuleContainer.java b/src/main/java/com/github/gtexpert/core/api/modules/ModuleContainer.java similarity index 88% rename from src/main/java/gtexpert/api/modules/ModuleContainer.java rename to src/main/java/com/github/gtexpert/core/api/modules/ModuleContainer.java index 2375ba86..f79537dd 100644 --- a/src/main/java/gtexpert/api/modules/ModuleContainer.java +++ b/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; diff --git a/src/main/java/gtexpert/api/modules/ModuleStage.java b/src/main/java/com/github/gtexpert/core/api/modules/ModuleStage.java similarity index 93% rename from src/main/java/gtexpert/api/modules/ModuleStage.java rename to src/main/java/com/github/gtexpert/core/api/modules/ModuleStage.java index 7ec27da5..bb87ecc4 100644 --- a/src/main/java/gtexpert/api/modules/ModuleStage.java +++ b/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. diff --git a/src/main/java/gtexpert/api/recipes/GTERecipeMaps.java b/src/main/java/com/github/gtexpert/core/api/recipes/GTERecipeMaps.java similarity index 94% rename from src/main/java/gtexpert/api/recipes/GTERecipeMaps.java rename to src/main/java/com/github/gtexpert/core/api/recipes/GTERecipeMaps.java index 7046a620..8b1388c6 100644 --- a/src/main/java/gtexpert/api/recipes/GTERecipeMaps.java +++ b/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; diff --git a/src/main/java/gtexpert/api/unification/GTEElements.java b/src/main/java/com/github/gtexpert/core/api/unification/GTEElements.java similarity index 95% rename from src/main/java/gtexpert/api/unification/GTEElements.java rename to src/main/java/com/github/gtexpert/core/api/unification/GTEElements.java index 841004dd..6486aed8 100644 --- a/src/main/java/gtexpert/api/unification/GTEElements.java +++ b/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.*; diff --git a/src/main/java/gtexpert/api/unification/material/GTEFirstDegreeMaterials.java b/src/main/java/com/github/gtexpert/core/api/unification/material/GTEFirstDegreeMaterials.java similarity index 90% rename from src/main/java/gtexpert/api/unification/material/GTEFirstDegreeMaterials.java rename to src/main/java/com/github/gtexpert/core/api/unification/material/GTEFirstDegreeMaterials.java index 5ebe546d..b1365731 100644 --- a/src/main/java/gtexpert/api/unification/material/GTEFirstDegreeMaterials.java +++ b/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; diff --git a/src/main/java/gtexpert/api/unification/material/GTEMaterialFlags.java b/src/main/java/com/github/gtexpert/core/api/unification/material/GTEMaterialFlags.java similarity index 96% rename from src/main/java/gtexpert/api/unification/material/GTEMaterialFlags.java rename to src/main/java/com/github/gtexpert/core/api/unification/material/GTEMaterialFlags.java index edfab495..f21cb54f 100644 --- a/src/main/java/gtexpert/api/unification/material/GTEMaterialFlags.java +++ b/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 { diff --git a/src/main/java/gtexpert/api/unification/material/GTEMaterials.java b/src/main/java/com/github/gtexpert/core/api/unification/material/GTEMaterials.java similarity index 94% rename from src/main/java/gtexpert/api/unification/material/GTEMaterials.java rename to src/main/java/com/github/gtexpert/core/api/unification/material/GTEMaterials.java index e963f363..ab4c950e 100644 --- a/src/main/java/gtexpert/api/unification/material/GTEMaterials.java +++ b/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. diff --git a/src/main/java/gtexpert/api/unification/material/info/GTEMaterialIconSet.java b/src/main/java/com/github/gtexpert/core/api/unification/material/info/GTEMaterialIconSet.java similarity index 82% rename from src/main/java/gtexpert/api/unification/material/info/GTEMaterialIconSet.java rename to src/main/java/com/github/gtexpert/core/api/unification/material/info/GTEMaterialIconSet.java index c9e4c793..9211591a 100644 --- a/src/main/java/gtexpert/api/unification/material/info/GTEMaterialIconSet.java +++ b/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; diff --git a/src/main/java/gtexpert/api/unification/material/ingredients/AEFirstDegreeMaterials.java b/src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/AEFirstDegreeMaterials.java similarity index 90% rename from src/main/java/gtexpert/api/unification/material/ingredients/AEFirstDegreeMaterials.java rename to src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/AEFirstDegreeMaterials.java index 94e747bb..7ac4427c 100644 --- a/src/main/java/gtexpert/api/unification/material/ingredients/AEFirstDegreeMaterials.java +++ b/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 { diff --git a/src/main/java/gtexpert/api/unification/material/ingredients/AvaritiaFirstDegreeMaterials.java b/src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/AvaritiaFirstDegreeMaterials.java similarity index 82% rename from src/main/java/gtexpert/api/unification/material/ingredients/AvaritiaFirstDegreeMaterials.java rename to src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/AvaritiaFirstDegreeMaterials.java index d256ac30..94faf3d7 100644 --- a/src/main/java/gtexpert/api/unification/material/ingredients/AvaritiaFirstDegreeMaterials.java +++ b/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 { diff --git a/src/main/java/gtexpert/api/unification/material/ingredients/DEFirstDegreeMaterials.java b/src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/DEFirstDegreeMaterials.java similarity index 92% rename from src/main/java/gtexpert/api/unification/material/ingredients/DEFirstDegreeMaterials.java rename to src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/DEFirstDegreeMaterials.java index 22341ace..d6e4533b 100644 --- a/src/main/java/gtexpert/api/unification/material/ingredients/DEFirstDegreeMaterials.java +++ b/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 { diff --git a/src/main/java/gtexpert/api/unification/material/ingredients/EIOFirstDegreeMaterials.java b/src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/EIOFirstDegreeMaterials.java similarity index 97% rename from src/main/java/gtexpert/api/unification/material/ingredients/EIOFirstDegreeMaterials.java rename to src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/EIOFirstDegreeMaterials.java index fc25cd76..68cefbc3 100644 --- a/src/main/java/gtexpert/api/unification/material/ingredients/EIOFirstDegreeMaterials.java +++ b/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 { diff --git a/src/main/java/gtexpert/api/unification/material/ingredients/TCFirstDegreeMaterials.java b/src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/TCFirstDegreeMaterials.java similarity index 86% rename from src/main/java/gtexpert/api/unification/material/ingredients/TCFirstDegreeMaterials.java rename to src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/TCFirstDegreeMaterials.java index f616b5fd..a7a62ce8 100644 --- a/src/main/java/gtexpert/api/unification/material/ingredients/TCFirstDegreeMaterials.java +++ b/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; diff --git a/src/main/java/gtexpert/api/util/GTELog.java b/src/main/java/com/github/gtexpert/core/api/util/GTELog.java similarity index 70% rename from src/main/java/gtexpert/api/util/GTELog.java rename to src/main/java/com/github/gtexpert/core/api/util/GTELog.java index 337deaf9..4b4b6453 100644 --- a/src/main/java/gtexpert/api/util/GTELog.java +++ b/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 { diff --git a/src/main/java/gtexpert/api/util/GTEUtility.java b/src/main/java/com/github/gtexpert/core/api/util/GTEUtility.java similarity index 98% rename from src/main/java/gtexpert/api/util/GTEUtility.java rename to src/main/java/com/github/gtexpert/core/api/util/GTEUtility.java index 2708b808..323bc9f7 100644 --- a/src/main/java/gtexpert/api/util/GTEUtility.java +++ b/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 { diff --git a/src/main/java/gtexpert/api/util/ModIncompatibilityException.java b/src/main/java/com/github/gtexpert/core/api/util/ModIncompatibilityException.java similarity index 96% rename from src/main/java/gtexpert/api/util/ModIncompatibilityException.java rename to src/main/java/com/github/gtexpert/core/api/util/ModIncompatibilityException.java index 6e4396bd..d4f1a7de 100644 --- a/src/main/java/gtexpert/api/util/ModIncompatibilityException.java +++ b/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; diff --git a/src/main/java/gtexpert/api/util/Mods.java b/src/main/java/com/github/gtexpert/core/api/util/Mods.java similarity index 99% rename from src/main/java/gtexpert/api/util/Mods.java rename to src/main/java/com/github/gtexpert/core/api/util/Mods.java index 554046d4..40793965 100644 --- a/src/main/java/gtexpert/api/util/Mods.java +++ b/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 { diff --git a/src/main/java/gtexpert/client/ClientProxy.java b/src/main/java/com/github/gtexpert/core/client/ClientProxy.java similarity index 80% rename from src/main/java/gtexpert/client/ClientProxy.java rename to src/main/java/com/github/gtexpert/core/client/ClientProxy.java index ccd10eb3..fa3d73a8 100644 --- a/src/main/java/gtexpert/client/ClientProxy.java +++ b/src/main/java/com/github/gtexpert/core/client/ClientProxy.java @@ -1,4 +1,4 @@ -package gtexpert.client; +package com.github.gtexpert.core.client; import net.minecraftforge.client.event.ModelRegistryEvent; import net.minecraftforge.fml.common.Mod; @@ -6,8 +6,8 @@ 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 { diff --git a/src/main/java/gtexpert/client/GTETextures.java b/src/main/java/com/github/gtexpert/core/client/GTETextures.java similarity index 94% rename from src/main/java/gtexpert/client/GTETextures.java rename to src/main/java/com/github/gtexpert/core/client/GTETextures.java index 5478421c..6bee8c4b 100644 --- a/src/main/java/gtexpert/client/GTETextures.java +++ b/src/main/java/com/github/gtexpert/core/client/GTETextures.java @@ -1,11 +1,11 @@ -package gtexpert.client; +package com.github.gtexpert.core.client; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.relauncher.Side; import gregtech.client.renderer.texture.cube.*; -import gtexpert.api.GTEValues; +import com.github.gtexpert.core.api.GTEValues; @Mod.EventBusSubscriber(modid = GTEValues.MODID, value = Side.CLIENT) public class GTETextures { diff --git a/src/main/java/gtexpert/common/CommonProxy.java b/src/main/java/com/github/gtexpert/core/common/CommonProxy.java similarity index 74% rename from src/main/java/gtexpert/common/CommonProxy.java rename to src/main/java/com/github/gtexpert/core/common/CommonProxy.java index b08b956e..5b94493e 100644 --- a/src/main/java/gtexpert/common/CommonProxy.java +++ b/src/main/java/com/github/gtexpert/core/common/CommonProxy.java @@ -1,9 +1,9 @@ -package gtexpert.common; +package com.github.gtexpert.core.common; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import gtexpert.api.GTEValues; +import com.github.gtexpert.core.api.GTEValues; @Mod.EventBusSubscriber(modid = GTEValues.MODID) public class CommonProxy { diff --git a/src/main/java/gtexpert/common/GTEConfigHolder.java b/src/main/java/com/github/gtexpert/core/common/GTEConfigHolder.java similarity index 96% rename from src/main/java/gtexpert/common/GTEConfigHolder.java rename to src/main/java/com/github/gtexpert/core/common/GTEConfigHolder.java index d16e4f6a..7ee99cbf 100644 --- a/src/main/java/gtexpert/common/GTEConfigHolder.java +++ b/src/main/java/com/github/gtexpert/core/common/GTEConfigHolder.java @@ -1,8 +1,8 @@ -package gtexpert.common; +package com.github.gtexpert.core.common; import net.minecraftforge.common.config.Config; -import gtexpert.api.GTEValues; +import com.github.gtexpert.core.api.GTEValues; @Config(modid = GTEValues.MODID, name = GTEValues.MODID + "/" + GTEValues.MODID, diff --git a/src/main/java/gtexpert/common/GTEEventHandlers.java b/src/main/java/com/github/gtexpert/core/common/GTEEventHandlers.java similarity index 94% rename from src/main/java/gtexpert/common/GTEEventHandlers.java rename to src/main/java/com/github/gtexpert/core/common/GTEEventHandlers.java index 6e0a25a7..80ffa7c4 100644 --- a/src/main/java/gtexpert/common/GTEEventHandlers.java +++ b/src/main/java/com/github/gtexpert/core/common/GTEEventHandlers.java @@ -1,4 +1,4 @@ -package gtexpert.common; +package com.github.gtexpert.core.common; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; @@ -23,9 +23,9 @@ import gregtech.api.items.armor.ArmorMetaItem; import gregtech.api.unification.material.event.MaterialEvent; -import gtexpert.api.GTEValues; -import gtexpert.api.unification.material.GTEMaterials; -import gtexpert.common.items.GTEMetaItems; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.common.items.GTEMetaItems; @Mod.EventBusSubscriber(modid = GTEValues.MODID) public class GTEEventHandlers { diff --git a/src/main/java/gtexpert/common/blocks/GTEBlockMetalCasing.java b/src/main/java/com/github/gtexpert/core/common/blocks/GTEBlockMetalCasing.java similarity index 96% rename from src/main/java/gtexpert/common/blocks/GTEBlockMetalCasing.java rename to src/main/java/com/github/gtexpert/core/common/blocks/GTEBlockMetalCasing.java index 798f2427..7fb48b94 100644 --- a/src/main/java/gtexpert/common/blocks/GTEBlockMetalCasing.java +++ b/src/main/java/com/github/gtexpert/core/common/blocks/GTEBlockMetalCasing.java @@ -1,4 +1,4 @@ -package gtexpert.common.blocks; +package com.github.gtexpert.core.common.blocks; import net.minecraft.block.SoundType; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/gtexpert/common/blocks/GTEBlockWireCoil.java b/src/main/java/com/github/gtexpert/core/common/blocks/GTEBlockWireCoil.java similarity index 97% rename from src/main/java/gtexpert/common/blocks/GTEBlockWireCoil.java rename to src/main/java/com/github/gtexpert/core/common/blocks/GTEBlockWireCoil.java index 033344f1..0d10e0e9 100644 --- a/src/main/java/gtexpert/common/blocks/GTEBlockWireCoil.java +++ b/src/main/java/com/github/gtexpert/core/common/blocks/GTEBlockWireCoil.java @@ -1,4 +1,4 @@ -package gtexpert.common.blocks; +package com.github.gtexpert.core.common.blocks; import java.util.List; @@ -28,7 +28,7 @@ import gregtech.common.ConfigHolder; import gregtech.common.metatileentities.multi.electric.MetaTileEntityMultiSmelter; -import gtexpert.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; public class GTEBlockWireCoil extends VariantActiveBlock { diff --git a/src/main/java/gtexpert/common/blocks/GTEMetaBlocks.java b/src/main/java/com/github/gtexpert/core/common/blocks/GTEMetaBlocks.java similarity index 96% rename from src/main/java/gtexpert/common/blocks/GTEMetaBlocks.java rename to src/main/java/com/github/gtexpert/core/common/blocks/GTEMetaBlocks.java index 377d7804..1843a153 100644 --- a/src/main/java/gtexpert/common/blocks/GTEMetaBlocks.java +++ b/src/main/java/com/github/gtexpert/core/common/blocks/GTEMetaBlocks.java @@ -1,4 +1,4 @@ -package gtexpert.common.blocks; +package com.github.gtexpert.core.common.blocks; import static gregtech.common.blocks.MetaBlocks.statePropertiesToString; diff --git a/src/main/java/gtexpert/common/items/GTEMetaItem1.java b/src/main/java/com/github/gtexpert/core/common/items/GTEMetaItem1.java similarity index 94% rename from src/main/java/gtexpert/common/items/GTEMetaItem1.java rename to src/main/java/com/github/gtexpert/core/common/items/GTEMetaItem1.java index 68efc45e..ca08c46b 100644 --- a/src/main/java/gtexpert/common/items/GTEMetaItem1.java +++ b/src/main/java/com/github/gtexpert/core/common/items/GTEMetaItem1.java @@ -1,6 +1,6 @@ -package gtexpert.common.items; +package com.github.gtexpert.core.common.items; -import static gtexpert.common.items.GTEMetaItems.*; +import static com.github.gtexpert.core.common.items.GTEMetaItems.*; import net.minecraft.client.resources.I18n; @@ -11,9 +11,9 @@ import gregtech.api.unification.stack.MaterialStack; import gregtech.common.items.behaviors.TooltipBehavior; -import gtexpert.api.util.GTELog; -import gtexpert.common.GTEConfigHolder; -import gtexpert.integration.ae.AEConfigHolder; +import com.github.gtexpert.core.api.util.GTELog; +import com.github.gtexpert.core.common.GTEConfigHolder; +import com.github.gtexpert.core.integration.ae.AEConfigHolder; public class GTEMetaItem1 extends StandardMetaItem { diff --git a/src/main/java/gtexpert/common/items/GTEMetaItems.java b/src/main/java/com/github/gtexpert/core/common/items/GTEMetaItems.java similarity index 94% rename from src/main/java/gtexpert/common/items/GTEMetaItems.java rename to src/main/java/com/github/gtexpert/core/common/items/GTEMetaItems.java index f797aa92..62dd8118 100644 --- a/src/main/java/gtexpert/common/items/GTEMetaItems.java +++ b/src/main/java/com/github/gtexpert/core/common/items/GTEMetaItems.java @@ -1,9 +1,9 @@ -package gtexpert.common.items; +package com.github.gtexpert.core.common.items; import gregtech.api.items.armor.ArmorMetaItem; import gregtech.api.items.metaitem.MetaItem; -import gtexpert.common.items.armor.GTEMetaArmor; +import com.github.gtexpert.core.common.items.armor.GTEMetaArmor; public final class GTEMetaItems { diff --git a/src/main/java/gtexpert/common/items/armor/GTEMetaArmor.java b/src/main/java/com/github/gtexpert/core/common/items/armor/GTEMetaArmor.java similarity index 81% rename from src/main/java/gtexpert/common/items/armor/GTEMetaArmor.java rename to src/main/java/com/github/gtexpert/core/common/items/armor/GTEMetaArmor.java index 213e2564..7dacf79f 100644 --- a/src/main/java/gtexpert/common/items/armor/GTEMetaArmor.java +++ b/src/main/java/com/github/gtexpert/core/common/items/armor/GTEMetaArmor.java @@ -1,11 +1,11 @@ -package gtexpert.common.items.armor; +package com.github.gtexpert.core.common.items.armor; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.EnumRarity; import gregtech.api.items.armor.ArmorMetaItem; -import gtexpert.common.items.GTEMetaItems; +import com.github.gtexpert.core.common.items.GTEMetaItems; public class GTEMetaArmor extends ArmorMetaItem.ArmorMetaValueItem> { diff --git a/src/main/java/gtexpert/common/items/armor/PistonBoots.java b/src/main/java/com/github/gtexpert/core/common/items/armor/PistonBoots.java similarity index 99% rename from src/main/java/gtexpert/common/items/armor/PistonBoots.java rename to src/main/java/com/github/gtexpert/core/common/items/armor/PistonBoots.java index 6c70713d..53df27a6 100644 --- a/src/main/java/gtexpert/common/items/armor/PistonBoots.java +++ b/src/main/java/com/github/gtexpert/core/common/items/armor/PistonBoots.java @@ -1,4 +1,4 @@ -package gtexpert.common.items.armor; +package com.github.gtexpert.core.common.items.armor; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/gtexpert/common/items/behaviors/GTECoverBehaviors.java b/src/main/java/com/github/gtexpert/core/common/items/behaviors/GTECoverBehaviors.java similarity index 83% rename from src/main/java/gtexpert/common/items/behaviors/GTECoverBehaviors.java rename to src/main/java/com/github/gtexpert/core/common/items/behaviors/GTECoverBehaviors.java index 8b8817ed..6a675505 100644 --- a/src/main/java/gtexpert/common/items/behaviors/GTECoverBehaviors.java +++ b/src/main/java/com/github/gtexpert/core/common/items/behaviors/GTECoverBehaviors.java @@ -1,7 +1,7 @@ -package gtexpert.common.items.behaviors; +package com.github.gtexpert.core.common.items.behaviors; +import static com.github.gtexpert.core.api.util.GTEUtility.gteId; import static gregtech.common.covers.CoverBehaviors.registerBehavior; -import static gtexpert.api.util.GTEUtility.gteId; import gregtech.api.GTValues; import gregtech.common.covers.CoverConveyor; @@ -9,8 +9,8 @@ import gregtech.common.covers.CoverPump; import gregtech.common.covers.CoverRoboticArm; -import gtexpert.common.GTEConfigHolder; -import gtexpert.common.items.GTEMetaItems; +import com.github.gtexpert.core.common.GTEConfigHolder; +import com.github.gtexpert.core.common.items.GTEMetaItems; public class GTECoverBehaviors { diff --git a/src/main/java/gtexpert/common/metatileentities/GTEMetaTileEntities.java b/src/main/java/com/github/gtexpert/core/common/metatileentities/GTEMetaTileEntities.java similarity index 91% rename from src/main/java/gtexpert/common/metatileentities/GTEMetaTileEntities.java rename to src/main/java/com/github/gtexpert/core/common/metatileentities/GTEMetaTileEntities.java index b8ad3416..45526f06 100644 --- a/src/main/java/gtexpert/common/metatileentities/GTEMetaTileEntities.java +++ b/src/main/java/com/github/gtexpert/core/common/metatileentities/GTEMetaTileEntities.java @@ -1,7 +1,7 @@ -package gtexpert.common.metatileentities; +package com.github.gtexpert.core.common.metatileentities; +import static com.github.gtexpert.core.api.util.GTEUtility.gteId; import static gregtech.common.metatileentities.MetaTileEntities.*; -import static gtexpert.api.util.GTEUtility.gteId; import java.util.function.Function; @@ -11,8 +11,8 @@ import gregtech.api.recipes.RecipeMap; import gregtech.client.renderer.ICubeRenderer; -import gtexpert.common.GTEConfigHolder; -import gtexpert.common.metatileentities.multi.*; +import com.github.gtexpert.core.common.GTEConfigHolder; +import com.github.gtexpert.core.common.metatileentities.multi.*; public class GTEMetaTileEntities { diff --git a/src/main/java/gtexpert/common/metatileentities/GTESimpleMachineMetaTileEntity.java b/src/main/java/com/github/gtexpert/core/common/metatileentities/GTESimpleMachineMetaTileEntity.java similarity index 97% rename from src/main/java/gtexpert/common/metatileentities/GTESimpleMachineMetaTileEntity.java rename to src/main/java/com/github/gtexpert/core/common/metatileentities/GTESimpleMachineMetaTileEntity.java index bb6e265c..15acc9a2 100644 --- a/src/main/java/gtexpert/common/metatileentities/GTESimpleMachineMetaTileEntity.java +++ b/src/main/java/com/github/gtexpert/core/common/metatileentities/GTESimpleMachineMetaTileEntity.java @@ -1,4 +1,4 @@ -package gtexpert.common.metatileentities; +package com.github.gtexpert.core.common.metatileentities; import java.util.function.Function; @@ -15,7 +15,7 @@ import gregtech.api.recipes.RecipeMap; import gregtech.client.renderer.ICubeRenderer; -import gtexpert.api.gui.GTEGuiTextures; +import com.github.gtexpert.core.api.gui.GTEGuiTextures; public class GTESimpleMachineMetaTileEntity extends SimpleMachineMetaTileEntity { diff --git a/src/main/java/gtexpert/common/metatileentities/multi/MetaTileEntityAdvancedChemicalPlant.java b/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityAdvancedChemicalPlant.java similarity index 97% rename from src/main/java/gtexpert/common/metatileentities/multi/MetaTileEntityAdvancedChemicalPlant.java rename to src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityAdvancedChemicalPlant.java index e6c815e4..85d8f85f 100644 --- a/src/main/java/gtexpert/common/metatileentities/multi/MetaTileEntityAdvancedChemicalPlant.java +++ b/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityAdvancedChemicalPlant.java @@ -1,4 +1,4 @@ -package gtexpert.common.metatileentities.multi; +package com.github.gtexpert.core.common.metatileentities.multi; import java.util.List; @@ -31,7 +31,7 @@ import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; -import gtexpert.api.gui.GTEGuiTextures; +import com.github.gtexpert.core.api.gui.GTEGuiTextures; public class MetaTileEntityAdvancedChemicalPlant extends GCYMRecipeMapMultiblockController { diff --git a/src/main/java/gtexpert/common/metatileentities/multi/MetaTileEntityLargeCrackingUnit.java b/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityLargeCrackingUnit.java similarity index 97% rename from src/main/java/gtexpert/common/metatileentities/multi/MetaTileEntityLargeCrackingUnit.java rename to src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityLargeCrackingUnit.java index 7d100313..05f622b8 100644 --- a/src/main/java/gtexpert/common/metatileentities/multi/MetaTileEntityLargeCrackingUnit.java +++ b/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityLargeCrackingUnit.java @@ -1,4 +1,4 @@ -package gtexpert.common.metatileentities.multi; +package com.github.gtexpert.core.common.metatileentities.multi; import java.util.List; @@ -40,8 +40,8 @@ import gregicality.multiblocks.api.capability.impl.GCYMMultiblockRecipeLogic; import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; -import gtexpert.api.gui.GTEGuiTextures; -import gtexpert.common.GTEConfigHolder; +import com.github.gtexpert.core.api.gui.GTEGuiTextures; +import com.github.gtexpert.core.common.GTEConfigHolder; public class MetaTileEntityLargeCrackingUnit extends GCYMRecipeMapMultiblockController { diff --git a/src/main/java/gtexpert/common/metatileentities/multi/MetaTileEntityLargeGasCollector.java b/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityLargeGasCollector.java similarity index 91% rename from src/main/java/gtexpert/common/metatileentities/multi/MetaTileEntityLargeGasCollector.java rename to src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityLargeGasCollector.java index d5d7729c..d3d293e9 100644 --- a/src/main/java/gtexpert/common/metatileentities/multi/MetaTileEntityLargeGasCollector.java +++ b/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityLargeGasCollector.java @@ -1,4 +1,4 @@ -package gtexpert.common.metatileentities.multi; +package com.github.gtexpert.core.common.metatileentities.multi; import java.util.List; @@ -30,12 +30,12 @@ import gregicality.multiblocks.api.metatileentity.GCYMRecipeMapMultiblockController; -import gtexpert.api.gui.GTEGuiTextures; -import gtexpert.api.recipes.GTERecipeMaps; -import gtexpert.client.GTETextures; -import gtexpert.common.GTEConfigHolder; -import gtexpert.common.blocks.GTEBlockMetalCasing; -import gtexpert.common.blocks.GTEMetaBlocks; +import com.github.gtexpert.core.api.gui.GTEGuiTextures; +import com.github.gtexpert.core.api.recipes.GTERecipeMaps; +import com.github.gtexpert.core.client.GTETextures; +import com.github.gtexpert.core.common.GTEConfigHolder; +import com.github.gtexpert.core.common.blocks.GTEBlockMetalCasing; +import com.github.gtexpert.core.common.blocks.GTEMetaBlocks; public class MetaTileEntityLargeGasCollector extends GCYMRecipeMapMultiblockController { diff --git a/src/main/java/gtexpert/common/metatileentities/multi/MetaTileEntityVoidOreMiner.java b/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityVoidOreMiner.java similarity index 91% rename from src/main/java/gtexpert/common/metatileentities/multi/MetaTileEntityVoidOreMiner.java rename to src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityVoidOreMiner.java index 899c155f..b9b76cd4 100644 --- a/src/main/java/gtexpert/common/metatileentities/multi/MetaTileEntityVoidOreMiner.java +++ b/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityVoidOreMiner.java @@ -1,4 +1,4 @@ -package gtexpert.common.metatileentities.multi; +package com.github.gtexpert.core.common.metatileentities.multi; import java.util.List; @@ -27,12 +27,12 @@ import gregtech.common.blocks.MetaBlocks; import gregtech.core.sound.GTSoundEvents; -import gtexpert.api.gui.GTEGuiTextures; -import gtexpert.api.recipes.GTERecipeMaps; -import gtexpert.api.unification.material.GTEMaterials; -import gtexpert.client.GTETextures; -import gtexpert.common.blocks.GTEBlockMetalCasing; -import gtexpert.common.blocks.GTEMetaBlocks; +import com.github.gtexpert.core.api.gui.GTEGuiTextures; +import com.github.gtexpert.core.api.recipes.GTERecipeMaps; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.client.GTETextures; +import com.github.gtexpert.core.common.blocks.GTEBlockMetalCasing; +import com.github.gtexpert.core.common.blocks.GTEMetaBlocks; public class MetaTileEntityVoidOreMiner extends RecipeMapMultiblockController { diff --git a/src/main/java/gtexpert/core/GTECoreMod.java b/src/main/java/com/github/gtexpert/core/core/GTECoreMod.java similarity index 89% rename from src/main/java/gtexpert/core/GTECoreMod.java rename to src/main/java/com/github/gtexpert/core/core/GTECoreMod.java index 47bf99eb..3118c09c 100644 --- a/src/main/java/gtexpert/core/GTECoreMod.java +++ b/src/main/java/com/github/gtexpert/core/core/GTECoreMod.java @@ -1,4 +1,4 @@ -package gtexpert.core; +package com.github.gtexpert.core.core; import java.io.*; import java.util.Map; @@ -8,8 +8,8 @@ import org.jetbrains.annotations.Nullable; -import gtexpert.api.GTEValues; -import gtexpert.api.util.GTELog; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.util.GTELog; public class GTECoreMod implements IFMLLoadingPlugin { @@ -29,7 +29,7 @@ public String getModContainerClass() { @Nullable @Override public String getSetupClass() { - return "gtexpert.core.deploader.DepLoader"; + return "com.github.gtexpert.core.core.deploader.DepLoader"; } @Override diff --git a/src/main/java/gtexpert/core/GTECoreModule.java b/src/main/java/com/github/gtexpert/core/core/GTECoreModule.java similarity index 73% rename from src/main/java/gtexpert/core/GTECoreModule.java rename to src/main/java/com/github/gtexpert/core/core/GTECoreModule.java index 3cc9e6d0..5a095a5f 100644 --- a/src/main/java/gtexpert/core/GTECoreModule.java +++ b/src/main/java/com/github/gtexpert/core/core/GTECoreModule.java @@ -1,8 +1,8 @@ -package gtexpert.core; +package com.github.gtexpert.core.core; +import static com.github.gtexpert.core.GTExpertMod.createItemBlock; +import static com.github.gtexpert.core.common.blocks.GTEMetaBlocks.*; import static gregtech.api.GregTechAPI.HEATING_COILS; -import static gtexpert.GTExpertMod.createItemBlock; -import static gtexpert.common.blocks.GTEMetaBlocks.*; import net.minecraft.block.Block; import net.minecraft.item.Item; @@ -23,19 +23,19 @@ import gregtech.api.recipes.RecipeMaps; import gregtech.loaders.recipe.RecyclingRecipes; -import gtexpert.api.GTEValues; -import gtexpert.api.modules.GTEModule; -import gtexpert.api.modules.IGTEModule; -import gtexpert.common.CommonProxy; -import gtexpert.common.blocks.GTEBlockWireCoil; -import gtexpert.common.blocks.GTEMetaBlocks; -import gtexpert.common.items.GTEMetaItems; -import gtexpert.common.metatileentities.GTEMetaTileEntities; -import gtexpert.loaders.GTEOreDictionaryLoader; -import gtexpert.loaders.recipe.CEUOverrideRecipe; -import gtexpert.loaders.recipe.GTERecipe; -import gtexpert.loaders.recipe.GTEVanillaOverrideRecipes; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.modules.GTEModule; +import com.github.gtexpert.core.api.modules.IGTEModule; +import com.github.gtexpert.core.common.CommonProxy; +import com.github.gtexpert.core.common.blocks.GTEBlockWireCoil; +import com.github.gtexpert.core.common.blocks.GTEMetaBlocks; +import com.github.gtexpert.core.common.items.GTEMetaItems; +import com.github.gtexpert.core.common.metatileentities.GTEMetaTileEntities; +import com.github.gtexpert.core.loaders.GTEOreDictionaryLoader; +import com.github.gtexpert.core.loaders.recipe.CEUOverrideRecipe; +import com.github.gtexpert.core.loaders.recipe.GTERecipe; +import com.github.gtexpert.core.loaders.recipe.GTEVanillaOverrideRecipes; +import com.github.gtexpert.core.modules.GTEModules; @GTEModule( moduleID = GTEModules.MODULE_CORE, @@ -48,8 +48,8 @@ public class GTECoreModule implements IGTEModule { public static final Logger logger = LogManager.getLogger("GTExpert Core"); @SidedProxy(modId = GTEValues.MODID, - clientSide = "gtexpert.client.ClientProxy", - serverSide = "gtexpert.common.CommonProxy") + clientSide = "com.github.gtexpert.core.client.ClientProxy", + serverSide = "com.github.gtexpert.core.common.CommonProxy") public static CommonProxy proxy; @Override diff --git a/src/main/java/gtexpert/core/deploader/DepLoader.java b/src/main/java/com/github/gtexpert/core/core/deploader/DepLoader.java similarity index 98% rename from src/main/java/gtexpert/core/deploader/DepLoader.java rename to src/main/java/com/github/gtexpert/core/core/deploader/DepLoader.java index 40c17dbe..cca68007 100644 --- a/src/main/java/gtexpert/core/deploader/DepLoader.java +++ b/src/main/java/com/github/gtexpert/core/core/deploader/DepLoader.java @@ -1,4 +1,4 @@ -package gtexpert.core.deploader; +package com.github.gtexpert.core.core.deploader; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; @@ -27,7 +27,7 @@ import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; -import gtexpert.core.GTECoreMod; +import com.github.gtexpert.core.core.GTECoreMod; public class DepLoader implements IFMLCallHook { diff --git a/src/main/java/gtexpert/core/deploader/DownloadProgressDialog.java b/src/main/java/com/github/gtexpert/core/core/deploader/DownloadProgressDialog.java similarity index 96% rename from src/main/java/gtexpert/core/deploader/DownloadProgressDialog.java rename to src/main/java/com/github/gtexpert/core/core/deploader/DownloadProgressDialog.java index fd3ca2d2..66f5040c 100644 --- a/src/main/java/gtexpert/core/deploader/DownloadProgressDialog.java +++ b/src/main/java/com/github/gtexpert/core/core/deploader/DownloadProgressDialog.java @@ -1,4 +1,4 @@ -package gtexpert.core.deploader; +package com.github.gtexpert.core.core.deploader; import java.awt.*; import java.awt.event.WindowEvent; @@ -6,7 +6,7 @@ import javax.swing.*; import javax.swing.border.EmptyBorder; -import gtexpert.Tags; +import com.github.gtexpert.core.Tags; class DownloadProgressDialog extends JDialog { diff --git a/src/main/java/gtexpert/core/deploader/LetsEncryptAdder.java b/src/main/java/com/github/gtexpert/core/core/deploader/LetsEncryptAdder.java similarity index 99% rename from src/main/java/gtexpert/core/deploader/LetsEncryptAdder.java rename to src/main/java/com/github/gtexpert/core/core/deploader/LetsEncryptAdder.java index 4da32bd0..bac2792d 100644 --- a/src/main/java/gtexpert/core/deploader/LetsEncryptAdder.java +++ b/src/main/java/com/github/gtexpert/core/core/deploader/LetsEncryptAdder.java @@ -1,4 +1,4 @@ -package gtexpert.core.deploader; +package com.github.gtexpert.core.core.deploader; import java.io.BufferedInputStream; import java.io.InputStream; diff --git a/src/main/java/gtexpert/integration/GTEIntegrationModule.java b/src/main/java/com/github/gtexpert/core/integration/GTEIntegrationModule.java similarity index 79% rename from src/main/java/gtexpert/integration/GTEIntegrationModule.java rename to src/main/java/com/github/gtexpert/core/integration/GTEIntegrationModule.java index 82fc271a..0e1f357b 100644 --- a/src/main/java/gtexpert/integration/GTEIntegrationModule.java +++ b/src/main/java/com/github/gtexpert/core/integration/GTEIntegrationModule.java @@ -1,4 +1,4 @@ -package gtexpert.integration; +package com.github.gtexpert.core.integration; import java.util.Collections; import java.util.List; @@ -9,10 +9,10 @@ import org.apache.logging.log4j.Logger; import org.jetbrains.annotations.NotNull; -import gtexpert.api.GTEValues; -import gtexpert.api.modules.GTEModule; -import gtexpert.modules.BaseGTEModule; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.modules.GTEModule; +import com.github.gtexpert.core.modules.BaseGTEModule; +import com.github.gtexpert.core.modules.GTEModules; @GTEModule( moduleID = GTEModules.MODULE_INTEGRATION, diff --git a/src/main/java/gtexpert/integration/GTEIntegrationSubmodule.java b/src/main/java/com/github/gtexpert/core/integration/GTEIntegrationSubmodule.java similarity index 79% rename from src/main/java/gtexpert/integration/GTEIntegrationSubmodule.java rename to src/main/java/com/github/gtexpert/core/integration/GTEIntegrationSubmodule.java index bf1de70c..517a9c13 100644 --- a/src/main/java/gtexpert/integration/GTEIntegrationSubmodule.java +++ b/src/main/java/com/github/gtexpert/core/integration/GTEIntegrationSubmodule.java @@ -1,4 +1,4 @@ -package gtexpert.integration; +package com.github.gtexpert.core.integration; import java.util.Collections; import java.util.Set; @@ -8,9 +8,9 @@ import org.apache.logging.log4j.Logger; import org.jetbrains.annotations.NotNull; -import gtexpert.api.util.GTEUtility; -import gtexpert.modules.BaseGTEModule; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.modules.BaseGTEModule; +import com.github.gtexpert.core.modules.GTEModules; /** * Abstract class meant to be used by mod-specific compatibility modules. diff --git a/src/main/java/gtexpert/integration/ae/AEConfigHolder.java b/src/main/java/com/github/gtexpert/core/integration/ae/AEConfigHolder.java similarity index 88% rename from src/main/java/gtexpert/integration/ae/AEConfigHolder.java rename to src/main/java/com/github/gtexpert/core/integration/ae/AEConfigHolder.java index e0476b4b..02572bde 100644 --- a/src/main/java/gtexpert/integration/ae/AEConfigHolder.java +++ b/src/main/java/com/github/gtexpert/core/integration/ae/AEConfigHolder.java @@ -1,10 +1,10 @@ -package gtexpert.integration.ae; +package com.github.gtexpert.core.integration.ae; import net.minecraftforge.common.config.Config; import net.minecraftforge.common.config.Config.LangKey; -import gtexpert.api.GTEValues; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.modules.GTEModules; @LangKey(GTEValues.MODID + ".config.integration.ae") @Config(modid = GTEValues.MODID, diff --git a/src/main/java/gtexpert/integration/ae/AEModule.java b/src/main/java/com/github/gtexpert/core/integration/ae/AEModule.java similarity index 53% rename from src/main/java/gtexpert/integration/ae/AEModule.java rename to src/main/java/com/github/gtexpert/core/integration/ae/AEModule.java index 8569fb59..2121398c 100644 --- a/src/main/java/gtexpert/integration/ae/AEModule.java +++ b/src/main/java/com/github/gtexpert/core/integration/ae/AEModule.java @@ -1,19 +1,19 @@ -package gtexpert.integration.ae; +package com.github.gtexpert.core.integration.ae; import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.event.RegistryEvent; -import gtexpert.api.GTEValues; -import gtexpert.api.modules.GTEModule; -import gtexpert.api.util.Mods; -import gtexpert.integration.GTEIntegrationSubmodule; -import gtexpert.integration.ae.loaders.AEMaterialInfoLoader; -import gtexpert.integration.ae.loaders.AEOreDictionaryLoader; -import gtexpert.integration.ae.recipes.AEBlocksRecipe; -import gtexpert.integration.ae.recipes.AEItemsRecipe; -import gtexpert.integration.ae.recipes.AEMaterialsRecipe; -import gtexpert.integration.ae.recipes.AEToolsRecipe; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.modules.GTEModule; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.GTEIntegrationSubmodule; +import com.github.gtexpert.core.integration.ae.loaders.AEMaterialInfoLoader; +import com.github.gtexpert.core.integration.ae.loaders.AEOreDictionaryLoader; +import com.github.gtexpert.core.integration.ae.recipes.AEBlocksRecipe; +import com.github.gtexpert.core.integration.ae.recipes.AEItemsRecipe; +import com.github.gtexpert.core.integration.ae.recipes.AEMaterialsRecipe; +import com.github.gtexpert.core.integration.ae.recipes.AEToolsRecipe; +import com.github.gtexpert.core.modules.GTEModules; @GTEModule( moduleID = GTEModules.MODULE_AE, diff --git a/src/main/java/gtexpert/integration/ae/AEUtil.java b/src/main/java/com/github/gtexpert/core/integration/ae/AEUtil.java similarity index 91% rename from src/main/java/gtexpert/integration/ae/AEUtil.java rename to src/main/java/com/github/gtexpert/core/integration/ae/AEUtil.java index 60d41c92..0603ceed 100644 --- a/src/main/java/gtexpert/integration/ae/AEUtil.java +++ b/src/main/java/com/github/gtexpert/core/integration/ae/AEUtil.java @@ -1,4 +1,4 @@ -package gtexpert.integration.ae; +package com.github.gtexpert.core.integration.ae; import gregtech.api.unification.material.Material; import gregtech.api.unification.material.Materials; diff --git a/src/main/java/gtexpert/integration/ae/loaders/AEMaterialInfoLoader.java b/src/main/java/com/github/gtexpert/core/integration/ae/loaders/AEMaterialInfoLoader.java similarity index 93% rename from src/main/java/gtexpert/integration/ae/loaders/AEMaterialInfoLoader.java rename to src/main/java/com/github/gtexpert/core/integration/ae/loaders/AEMaterialInfoLoader.java index ac3eee5d..071f6570 100644 --- a/src/main/java/gtexpert/integration/ae/loaders/AEMaterialInfoLoader.java +++ b/src/main/java/com/github/gtexpert/core/integration/ae/loaders/AEMaterialInfoLoader.java @@ -1,4 +1,4 @@ -package gtexpert.integration.ae.loaders; +package com.github.gtexpert.core.integration.ae.loaders; import gregtech.api.GTValues; import gregtech.api.unification.OreDictUnifier; @@ -6,8 +6,8 @@ import gregtech.api.unification.stack.ItemMaterialInfo; import gregtech.api.unification.stack.MaterialStack; -import gtexpert.api.unification.material.GTEMaterials; -import gtexpert.api.util.Mods; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.Mods; public class AEMaterialInfoLoader { diff --git a/src/main/java/gtexpert/integration/ae/loaders/AEOreDictionaryLoader.java b/src/main/java/com/github/gtexpert/core/integration/ae/loaders/AEOreDictionaryLoader.java similarity index 95% rename from src/main/java/gtexpert/integration/ae/loaders/AEOreDictionaryLoader.java rename to src/main/java/com/github/gtexpert/core/integration/ae/loaders/AEOreDictionaryLoader.java index 02d91227..8ae92ef5 100644 --- a/src/main/java/gtexpert/integration/ae/loaders/AEOreDictionaryLoader.java +++ b/src/main/java/com/github/gtexpert/core/integration/ae/loaders/AEOreDictionaryLoader.java @@ -1,4 +1,4 @@ -package gtexpert.integration.ae.loaders; +package com.github.gtexpert.core.integration.ae.loaders; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; @@ -8,8 +8,8 @@ import gregtech.api.unification.material.Materials; import gregtech.api.unification.ore.OrePrefix; -import gtexpert.api.util.GTEUtility; -import gtexpert.api.util.Mods; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; public class AEOreDictionaryLoader { diff --git a/src/main/java/gtexpert/integration/ae/recipes/AEBlocksRecipe.java b/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEBlocksRecipe.java similarity index 99% rename from src/main/java/gtexpert/integration/ae/recipes/AEBlocksRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEBlocksRecipe.java index a8289b2d..eedab8e3 100644 --- a/src/main/java/gtexpert/integration/ae/recipes/AEBlocksRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEBlocksRecipe.java @@ -1,8 +1,8 @@ -package gtexpert.integration.ae.recipes; +package com.github.gtexpert.core.integration.ae.recipes; +import static com.github.gtexpert.core.integration.ae.AEUtil.tierMaterials; import static gregtech.api.GTValues.*; import static gregtech.api.unification.ore.OrePrefix.*; -import static gtexpert.integration.ae.AEUtil.tierMaterials; import java.util.Map; import java.util.stream.IntStream; @@ -18,11 +18,11 @@ import gregtech.common.items.MetaItems; import gregtech.common.metatileentities.MetaTileEntities; -import gtexpert.api.GTEValues; -import gtexpert.api.unification.material.GTEMaterials; -import gtexpert.api.util.Mods; -import gtexpert.common.GTEConfigHolder; -import gtexpert.integration.ae.AEConfigHolder; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.common.GTEConfigHolder; +import com.github.gtexpert.core.integration.ae.AEConfigHolder; import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; diff --git a/src/main/java/gtexpert/integration/ae/recipes/AEItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEItemsRecipe.java similarity index 99% rename from src/main/java/gtexpert/integration/ae/recipes/AEItemsRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEItemsRecipe.java index da602827..f35548ef 100644 --- a/src/main/java/gtexpert/integration/ae/recipes/AEItemsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEItemsRecipe.java @@ -1,8 +1,8 @@ -package gtexpert.integration.ae.recipes; +package com.github.gtexpert.core.integration.ae.recipes; +import static com.github.gtexpert.core.integration.ae.AEUtil.tierMaterials; import static gregtech.api.GTValues.*; import static gregtech.api.unification.ore.OrePrefix.*; -import static gtexpert.integration.ae.AEUtil.tierMaterials; import java.util.Arrays; import java.util.Objects; @@ -16,12 +16,12 @@ import gregtech.api.unification.material.Materials; import gregtech.common.items.MetaItems; -import gtexpert.api.GTEValues; -import gtexpert.api.unification.material.GTEMaterials; -import gtexpert.api.util.Mods; -import gtexpert.common.GTEConfigHolder; -import gtexpert.common.items.GTEMetaItems; -import gtexpert.integration.ae.AEConfigHolder; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.common.GTEConfigHolder; +import com.github.gtexpert.core.common.items.GTEMetaItems; +import com.github.gtexpert.core.integration.ae.AEConfigHolder; public class AEItemsRecipe { diff --git a/src/main/java/gtexpert/integration/ae/recipes/AEMaterialsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEMaterialsRecipe.java similarity index 98% rename from src/main/java/gtexpert/integration/ae/recipes/AEMaterialsRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEMaterialsRecipe.java index 25174752..9588f21a 100644 --- a/src/main/java/gtexpert/integration/ae/recipes/AEMaterialsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEMaterialsRecipe.java @@ -1,8 +1,8 @@ -package gtexpert.integration.ae.recipes; +package com.github.gtexpert.core.integration.ae.recipes; +import static com.github.gtexpert.core.integration.deda.recipes.DraconicMaterialsRecipe.ABFDurationMultiplier; import static gregtech.api.GTValues.*; import static gregtech.api.unification.ore.OrePrefix.*; -import static gtexpert.integration.deda.recipes.DraconicMaterialsRecipe.ABFDurationMultiplier; import net.minecraftforge.fluids.FluidStack; @@ -23,10 +23,10 @@ import gregicality.multiblocks.api.fluids.GCYMFluidStorageKeys; import gregicality.multiblocks.api.recipes.GCYMRecipeMaps; -import gtexpert.api.GTEValues; -import gtexpert.api.unification.material.GTEMaterials; -import gtexpert.api.util.Mods; -import gtexpert.loaders.recipe.handlers.GTEImplosionRecipeHandler; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.loaders.recipe.handlers.GTEImplosionRecipeHandler; public class AEMaterialsRecipe { diff --git a/src/main/java/gtexpert/integration/ae/recipes/AEToolsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEToolsRecipe.java similarity index 97% rename from src/main/java/gtexpert/integration/ae/recipes/AEToolsRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEToolsRecipe.java index 2f9cce47..bf91d2c3 100644 --- a/src/main/java/gtexpert/integration/ae/recipes/AEToolsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEToolsRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.ae.recipes; +package com.github.gtexpert.core.integration.ae.recipes; import static gregtech.api.unification.ore.OrePrefix.*; @@ -7,8 +7,8 @@ import gregtech.api.unification.material.Materials; import gregtech.common.ConfigHolder; -import gtexpert.api.util.Mods; -import gtexpert.integration.ae.AEConfigHolder; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.ae.AEConfigHolder; public class AEToolsRecipe { diff --git a/src/main/java/gtexpert/integration/aeaditions/AEAConfigHolder.java b/src/main/java/com/github/gtexpert/core/integration/aeaditions/AEAConfigHolder.java similarity index 68% rename from src/main/java/gtexpert/integration/aeaditions/AEAConfigHolder.java rename to src/main/java/com/github/gtexpert/core/integration/aeaditions/AEAConfigHolder.java index 31a4e7b8..1c89546d 100644 --- a/src/main/java/gtexpert/integration/aeaditions/AEAConfigHolder.java +++ b/src/main/java/com/github/gtexpert/core/integration/aeaditions/AEAConfigHolder.java @@ -1,10 +1,10 @@ -package gtexpert.integration.aeaditions; +package com.github.gtexpert.core.integration.aeaditions; import net.minecraftforge.common.config.Config; import net.minecraftforge.common.config.Config.LangKey; -import gtexpert.api.GTEValues; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.modules.GTEModules; @LangKey(GTEValues.MODID + ".config.integration.aeadditions") @Config(modid = GTEValues.MODID, diff --git a/src/main/java/gtexpert/integration/aeaditions/AEAModule.java b/src/main/java/com/github/gtexpert/core/integration/aeaditions/AEAModule.java similarity index 59% rename from src/main/java/gtexpert/integration/aeaditions/AEAModule.java rename to src/main/java/com/github/gtexpert/core/integration/aeaditions/AEAModule.java index 1557efdd..170fa604 100644 --- a/src/main/java/gtexpert/integration/aeaditions/AEAModule.java +++ b/src/main/java/com/github/gtexpert/core/integration/aeaditions/AEAModule.java @@ -1,14 +1,14 @@ -package gtexpert.integration.aeaditions; +package com.github.gtexpert.core.integration.aeaditions; import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.event.RegistryEvent; -import gtexpert.api.GTEValues; -import gtexpert.api.modules.GTEModule; -import gtexpert.api.util.Mods; -import gtexpert.integration.GTEIntegrationSubmodule; -import gtexpert.integration.aeaditions.recipes.AEAItemsRecipe; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.modules.GTEModule; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.GTEIntegrationSubmodule; +import com.github.gtexpert.core.integration.aeaditions.recipes.AEAItemsRecipe; +import com.github.gtexpert.core.modules.GTEModules; @GTEModule( moduleID = GTEModules.MODULE_AEA, diff --git a/src/main/java/gtexpert/integration/aeaditions/recipes/AEAItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/aeaditions/recipes/AEAItemsRecipe.java similarity index 97% rename from src/main/java/gtexpert/integration/aeaditions/recipes/AEAItemsRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/aeaditions/recipes/AEAItemsRecipe.java index 288701bf..358c0923 100644 --- a/src/main/java/gtexpert/integration/aeaditions/recipes/AEAItemsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/aeaditions/recipes/AEAItemsRecipe.java @@ -1,15 +1,15 @@ -package gtexpert.integration.aeaditions.recipes; +package com.github.gtexpert.core.integration.aeaditions.recipes; +import static com.github.gtexpert.core.integration.ae.AEUtil.tierMaterials; import static gregtech.api.GTValues.*; import static gregtech.api.unification.ore.OrePrefix.*; -import static gtexpert.integration.ae.AEUtil.tierMaterials; import gregtech.api.recipes.ModHandler; import gregtech.api.recipes.RecipeMaps; import gregtech.api.unification.OreDictUnifier; -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 AEAItemsRecipe { diff --git a/src/main/java/gtexpert/integration/avaritia/AvaritiaModule.java b/src/main/java/com/github/gtexpert/core/integration/avaritia/AvaritiaModule.java similarity index 59% rename from src/main/java/gtexpert/integration/avaritia/AvaritiaModule.java rename to src/main/java/com/github/gtexpert/core/integration/avaritia/AvaritiaModule.java index 86d27d9a..1a21ecef 100644 --- a/src/main/java/gtexpert/integration/avaritia/AvaritiaModule.java +++ b/src/main/java/com/github/gtexpert/core/integration/avaritia/AvaritiaModule.java @@ -1,14 +1,14 @@ -package gtexpert.integration.avaritia; +package com.github.gtexpert.core.integration.avaritia; import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.event.RegistryEvent; -import gtexpert.api.GTEValues; -import gtexpert.api.modules.GTEModule; -import gtexpert.api.util.Mods; -import gtexpert.integration.GTEIntegrationSubmodule; -import gtexpert.integration.avaritia.recipes.AvaritiaMaterialsRecipe; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.modules.GTEModule; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.GTEIntegrationSubmodule; +import com.github.gtexpert.core.integration.avaritia.recipes.AvaritiaMaterialsRecipe; +import com.github.gtexpert.core.modules.GTEModules; @GTEModule( moduleID = GTEModules.MODULE_AVARITIA, diff --git a/src/main/java/gtexpert/integration/avaritia/recipes/AvaritiaMaterialsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/avaritia/recipes/AvaritiaMaterialsRecipe.java similarity index 97% rename from src/main/java/gtexpert/integration/avaritia/recipes/AvaritiaMaterialsRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/avaritia/recipes/AvaritiaMaterialsRecipe.java index cd4a74eb..a5aaa9e8 100644 --- a/src/main/java/gtexpert/integration/avaritia/recipes/AvaritiaMaterialsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/avaritia/recipes/AvaritiaMaterialsRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.avaritia.recipes; +package com.github.gtexpert.core.integration.avaritia.recipes; import static gregtech.api.unification.ore.OrePrefix.*; @@ -9,8 +9,8 @@ import gregtech.common.ConfigHolder; import gregtech.common.items.MetaItems; -import gtexpert.api.unification.material.GTEMaterials; -import gtexpert.api.util.Mods; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.Mods; public class AvaritiaMaterialsRecipe { diff --git a/src/main/java/gtexpert/integration/binnies/BinniesModule.java b/src/main/java/com/github/gtexpert/core/integration/binnies/BinniesModule.java similarity index 66% rename from src/main/java/gtexpert/integration/binnies/BinniesModule.java rename to src/main/java/com/github/gtexpert/core/integration/binnies/BinniesModule.java index d54006dc..91318a2f 100644 --- a/src/main/java/gtexpert/integration/binnies/BinniesModule.java +++ b/src/main/java/com/github/gtexpert/core/integration/binnies/BinniesModule.java @@ -1,15 +1,15 @@ -package gtexpert.integration.binnies; +package com.github.gtexpert.core.integration.binnies; import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; -import gtexpert.api.GTEValues; -import gtexpert.api.modules.GTEModule; -import gtexpert.api.util.Mods; -import gtexpert.integration.GTEIntegrationSubmodule; -import gtexpert.integration.binnies.recipes.BinniesItemsRecipe; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.modules.GTEModule; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.GTEIntegrationSubmodule; +import com.github.gtexpert.core.integration.binnies.recipes.BinniesItemsRecipe; +import com.github.gtexpert.core.modules.GTEModules; @GTEModule( moduleID = GTEModules.MODULE_BINNIES, diff --git a/src/main/java/gtexpert/integration/binnies/botany/BotanyModule.java b/src/main/java/com/github/gtexpert/core/integration/binnies/botany/BotanyModule.java similarity index 64% rename from src/main/java/gtexpert/integration/binnies/botany/BotanyModule.java rename to src/main/java/com/github/gtexpert/core/integration/binnies/botany/BotanyModule.java index a2bd8d9e..40e91830 100644 --- a/src/main/java/gtexpert/integration/binnies/botany/BotanyModule.java +++ b/src/main/java/com/github/gtexpert/core/integration/binnies/botany/BotanyModule.java @@ -1,15 +1,15 @@ -package gtexpert.integration.binnies.botany; +package com.github.gtexpert.core.integration.binnies.botany; import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; -import gtexpert.api.GTEValues; -import gtexpert.api.modules.GTEModule; -import gtexpert.api.util.Mods; -import gtexpert.integration.GTEIntegrationSubmodule; -import gtexpert.integration.binnies.botany.recipes.BotanyItemsRecipe; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.modules.GTEModule; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.GTEIntegrationSubmodule; +import com.github.gtexpert.core.integration.binnies.botany.recipes.BotanyItemsRecipe; +import com.github.gtexpert.core.modules.GTEModules; @GTEModule( moduleID = GTEModules.MODULE_BOTANY, diff --git a/src/main/java/gtexpert/integration/binnies/botany/recipes/BotanyItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/binnies/botany/recipes/BotanyItemsRecipe.java similarity index 82% rename from src/main/java/gtexpert/integration/binnies/botany/recipes/BotanyItemsRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/binnies/botany/recipes/BotanyItemsRecipe.java index d230b812..e3be2b08 100644 --- a/src/main/java/gtexpert/integration/binnies/botany/recipes/BotanyItemsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/binnies/botany/recipes/BotanyItemsRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.binnies.botany.recipes; +package com.github.gtexpert.core.integration.binnies.botany.recipes; import static gregtech.api.unification.ore.OrePrefix.*; @@ -7,10 +7,10 @@ import gregtech.api.unification.material.Materials; import gregtech.api.unification.stack.UnificationEntry; -import gtexpert.api.util.Mods; -import gtexpert.integration.ffm.FFMConfigHolder; -import gtexpert.integration.ffm.FFMUtility; -import gtexpert.integration.ffm.recipes.machines.CarpenterLoader; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.ffm.FFMConfigHolder; +import com.github.gtexpert.core.integration.ffm.FFMUtility; +import com.github.gtexpert.core.integration.ffm.recipes.machines.CarpenterLoader; import forestry.api.recipes.RecipeManagers; diff --git a/src/main/java/gtexpert/integration/binnies/extrabees/ExtraBeesModule.java b/src/main/java/com/github/gtexpert/core/integration/binnies/extrabees/ExtraBeesModule.java similarity index 64% rename from src/main/java/gtexpert/integration/binnies/extrabees/ExtraBeesModule.java rename to src/main/java/com/github/gtexpert/core/integration/binnies/extrabees/ExtraBeesModule.java index 8e9057e2..1ad77955 100644 --- a/src/main/java/gtexpert/integration/binnies/extrabees/ExtraBeesModule.java +++ b/src/main/java/com/github/gtexpert/core/integration/binnies/extrabees/ExtraBeesModule.java @@ -1,15 +1,15 @@ -package gtexpert.integration.binnies.extrabees; +package com.github.gtexpert.core.integration.binnies.extrabees; import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; -import gtexpert.api.GTEValues; -import gtexpert.api.modules.GTEModule; -import gtexpert.api.util.Mods; -import gtexpert.integration.GTEIntegrationSubmodule; -import gtexpert.integration.binnies.extrabees.recipes.ExtraBeesItemsRecipe; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.modules.GTEModule; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.GTEIntegrationSubmodule; +import com.github.gtexpert.core.integration.binnies.extrabees.recipes.ExtraBeesItemsRecipe; +import com.github.gtexpert.core.modules.GTEModules; @GTEModule( moduleID = GTEModules.MODULE_EXBEES, diff --git a/src/main/java/gtexpert/integration/binnies/extrabees/recipes/ExtraBeesItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/binnies/extrabees/recipes/ExtraBeesItemsRecipe.java similarity index 82% rename from src/main/java/gtexpert/integration/binnies/extrabees/recipes/ExtraBeesItemsRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/binnies/extrabees/recipes/ExtraBeesItemsRecipe.java index 606becd5..fb402170 100644 --- a/src/main/java/gtexpert/integration/binnies/extrabees/recipes/ExtraBeesItemsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/binnies/extrabees/recipes/ExtraBeesItemsRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.binnies.extrabees.recipes; +package com.github.gtexpert.core.integration.binnies.extrabees.recipes; import static gregtech.api.unification.ore.OrePrefix.*; @@ -7,10 +7,10 @@ import gregtech.api.unification.material.Materials; import gregtech.api.unification.stack.UnificationEntry; -import gtexpert.api.util.Mods; -import gtexpert.integration.ffm.FFMConfigHolder; -import gtexpert.integration.ffm.FFMUtility; -import gtexpert.integration.ffm.recipes.machines.CarpenterLoader; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.ffm.FFMConfigHolder; +import com.github.gtexpert.core.integration.ffm.FFMUtility; +import com.github.gtexpert.core.integration.ffm.recipes.machines.CarpenterLoader; import forestry.api.recipes.RecipeManagers; diff --git a/src/main/java/gtexpert/integration/binnies/extratrees/ExtraTreesModule.java b/src/main/java/com/github/gtexpert/core/integration/binnies/extratrees/ExtraTreesModule.java similarity index 65% rename from src/main/java/gtexpert/integration/binnies/extratrees/ExtraTreesModule.java rename to src/main/java/com/github/gtexpert/core/integration/binnies/extratrees/ExtraTreesModule.java index ffb06910..69b4dcfc 100644 --- a/src/main/java/gtexpert/integration/binnies/extratrees/ExtraTreesModule.java +++ b/src/main/java/com/github/gtexpert/core/integration/binnies/extratrees/ExtraTreesModule.java @@ -1,15 +1,15 @@ -package gtexpert.integration.binnies.extratrees; +package com.github.gtexpert.core.integration.binnies.extratrees; import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; -import gtexpert.api.GTEValues; -import gtexpert.api.modules.GTEModule; -import gtexpert.api.util.Mods; -import gtexpert.integration.GTEIntegrationSubmodule; -import gtexpert.integration.binnies.extratrees.recipes.*; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.modules.GTEModule; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.GTEIntegrationSubmodule; +import com.github.gtexpert.core.integration.binnies.extratrees.recipes.*; +import com.github.gtexpert.core.modules.GTEModules; @GTEModule( moduleID = GTEModules.MODULE_EXTREES, diff --git a/src/main/java/gtexpert/integration/binnies/extratrees/recipes/ExtraTreesItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/binnies/extratrees/recipes/ExtraTreesItemsRecipe.java similarity index 88% rename from src/main/java/gtexpert/integration/binnies/extratrees/recipes/ExtraTreesItemsRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/binnies/extratrees/recipes/ExtraTreesItemsRecipe.java index 45d7c219..72bbea70 100644 --- a/src/main/java/gtexpert/integration/binnies/extratrees/recipes/ExtraTreesItemsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/binnies/extratrees/recipes/ExtraTreesItemsRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.binnies.extratrees.recipes; +package com.github.gtexpert.core.integration.binnies.extratrees.recipes; import static gregtech.api.unification.ore.OrePrefix.*; @@ -7,10 +7,10 @@ import gregtech.api.unification.material.Materials; import gregtech.api.unification.stack.UnificationEntry; -import gtexpert.api.util.Mods; -import gtexpert.integration.ffm.FFMConfigHolder; -import gtexpert.integration.ffm.FFMUtility; -import gtexpert.integration.ffm.recipes.machines.CarpenterLoader; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.ffm.FFMConfigHolder; +import com.github.gtexpert.core.integration.ffm.FFMUtility; +import com.github.gtexpert.core.integration.ffm.recipes.machines.CarpenterLoader; import forestry.api.recipes.RecipeManagers; diff --git a/src/main/java/gtexpert/integration/binnies/genetics/GeneticsModule.java b/src/main/java/com/github/gtexpert/core/integration/binnies/genetics/GeneticsModule.java similarity index 64% rename from src/main/java/gtexpert/integration/binnies/genetics/GeneticsModule.java rename to src/main/java/com/github/gtexpert/core/integration/binnies/genetics/GeneticsModule.java index fa9c4262..01575677 100644 --- a/src/main/java/gtexpert/integration/binnies/genetics/GeneticsModule.java +++ b/src/main/java/com/github/gtexpert/core/integration/binnies/genetics/GeneticsModule.java @@ -1,15 +1,15 @@ -package gtexpert.integration.binnies.genetics; +package com.github.gtexpert.core.integration.binnies.genetics; import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; -import gtexpert.api.GTEValues; -import gtexpert.api.modules.GTEModule; -import gtexpert.api.util.Mods; -import gtexpert.integration.GTEIntegrationSubmodule; -import gtexpert.integration.binnies.genetics.recipes.GeneticsItemsRecipe; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.modules.GTEModule; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.GTEIntegrationSubmodule; +import com.github.gtexpert.core.integration.binnies.genetics.recipes.GeneticsItemsRecipe; +import com.github.gtexpert.core.modules.GTEModules; @GTEModule( moduleID = GTEModules.MODULE_GENETICS, diff --git a/src/main/java/gtexpert/integration/binnies/genetics/recipes/GeneticsItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/binnies/genetics/recipes/GeneticsItemsRecipe.java similarity index 96% rename from src/main/java/gtexpert/integration/binnies/genetics/recipes/GeneticsItemsRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/binnies/genetics/recipes/GeneticsItemsRecipe.java index 3db1ce1b..ebb5cca9 100644 --- a/src/main/java/gtexpert/integration/binnies/genetics/recipes/GeneticsItemsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/binnies/genetics/recipes/GeneticsItemsRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.binnies.genetics.recipes; +package com.github.gtexpert.core.integration.binnies.genetics.recipes; import static gregtech.api.GTValues.*; import static gregtech.api.unification.ore.OrePrefix.*; @@ -14,11 +14,11 @@ import gregtech.api.unification.material.Materials; import gregtech.api.unification.stack.UnificationEntry; -import gtexpert.api.util.GTEUtility; -import gtexpert.api.util.Mods; -import gtexpert.integration.ffm.FFMConfigHolder; -import gtexpert.integration.ffm.FFMUtility; -import gtexpert.integration.ffm.recipes.machines.CarpenterLoader; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.ffm.FFMConfigHolder; +import com.github.gtexpert.core.integration.ffm.FFMUtility; +import com.github.gtexpert.core.integration.ffm.recipes.machines.CarpenterLoader; import forestry.api.recipes.RecipeManagers; diff --git a/src/main/java/gtexpert/integration/binnies/recipes/BinniesItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/binnies/recipes/BinniesItemsRecipe.java similarity index 82% rename from src/main/java/gtexpert/integration/binnies/recipes/BinniesItemsRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/binnies/recipes/BinniesItemsRecipe.java index 7ce1c7e9..c1b6c545 100644 --- a/src/main/java/gtexpert/integration/binnies/recipes/BinniesItemsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/binnies/recipes/BinniesItemsRecipe.java @@ -1,11 +1,11 @@ -package gtexpert.integration.binnies.recipes; +package com.github.gtexpert.core.integration.binnies.recipes; import gregtech.api.recipes.ModHandler; import gregtech.api.unification.material.Materials; -import gtexpert.api.util.Mods; -import gtexpert.integration.ffm.FFMConfigHolder; -import gtexpert.integration.ffm.FFMUtility; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.ffm.FFMConfigHolder; +import com.github.gtexpert.core.integration.ffm.FFMUtility; import forestry.api.recipes.RecipeManagers; diff --git a/src/main/java/gtexpert/integration/chisel/ChiselConfigHolder.java b/src/main/java/com/github/gtexpert/core/integration/chisel/ChiselConfigHolder.java similarity index 81% rename from src/main/java/gtexpert/integration/chisel/ChiselConfigHolder.java rename to src/main/java/com/github/gtexpert/core/integration/chisel/ChiselConfigHolder.java index 6f40d8f4..87271fc0 100644 --- a/src/main/java/gtexpert/integration/chisel/ChiselConfigHolder.java +++ b/src/main/java/com/github/gtexpert/core/integration/chisel/ChiselConfigHolder.java @@ -1,9 +1,9 @@ -package gtexpert.integration.chisel; +package com.github.gtexpert.core.integration.chisel; import net.minecraftforge.common.config.Config; -import gtexpert.api.GTEValues; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.modules.GTEModules; @Config.LangKey(GTEValues.MODID + ".config.integration.chisel") @Config(modid = GTEValues.MODID, diff --git a/src/main/java/gtexpert/integration/chisel/ChiselModule.java b/src/main/java/com/github/gtexpert/core/integration/chisel/ChiselModule.java similarity index 57% rename from src/main/java/gtexpert/integration/chisel/ChiselModule.java rename to src/main/java/com/github/gtexpert/core/integration/chisel/ChiselModule.java index 98038696..a7f0696f 100644 --- a/src/main/java/gtexpert/integration/chisel/ChiselModule.java +++ b/src/main/java/com/github/gtexpert/core/integration/chisel/ChiselModule.java @@ -1,18 +1,18 @@ -package gtexpert.integration.chisel; +package com.github.gtexpert.core.integration.chisel; import net.minecraft.block.Block; import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.event.RegistryEvent; -import gtexpert.api.GTEValues; -import gtexpert.api.modules.GTEModule; -import gtexpert.api.util.Mods; -import gtexpert.integration.GTEIntegrationSubmodule; -import gtexpert.integration.chisel.loaders.ChiselOreDictionaryLoader; -import gtexpert.integration.chisel.metatileentities.ChiselMetaTileEntities; -import gtexpert.integration.chisel.recipes.ChiselBlocksRecipe; -import gtexpert.integration.chisel.recipes.ChiselToolsRecipe; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.modules.GTEModule; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.GTEIntegrationSubmodule; +import com.github.gtexpert.core.integration.chisel.loaders.ChiselOreDictionaryLoader; +import com.github.gtexpert.core.integration.chisel.metatileentities.ChiselMetaTileEntities; +import com.github.gtexpert.core.integration.chisel.recipes.ChiselBlocksRecipe; +import com.github.gtexpert.core.integration.chisel.recipes.ChiselToolsRecipe; +import com.github.gtexpert.core.modules.GTEModules; @GTEModule( moduleID = GTEModules.MODULE_CHISEL, diff --git a/src/main/java/gtexpert/integration/chisel/ChiselRecipeMaps.java b/src/main/java/com/github/gtexpert/core/integration/chisel/ChiselRecipeMaps.java similarity index 89% rename from src/main/java/gtexpert/integration/chisel/ChiselRecipeMaps.java rename to src/main/java/com/github/gtexpert/core/integration/chisel/ChiselRecipeMaps.java index 3a6a8ef6..b1bb387b 100644 --- a/src/main/java/gtexpert/integration/chisel/ChiselRecipeMaps.java +++ b/src/main/java/com/github/gtexpert/core/integration/chisel/ChiselRecipeMaps.java @@ -1,4 +1,4 @@ -package gtexpert.integration.chisel; +package com.github.gtexpert.core.integration.chisel; import gregtech.api.gui.GuiTextures; import gregtech.api.gui.widgets.ProgressWidget; @@ -6,7 +6,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; diff --git a/src/main/java/gtexpert/integration/chisel/ChiselUtil.java b/src/main/java/com/github/gtexpert/core/integration/chisel/ChiselUtil.java similarity index 93% rename from src/main/java/gtexpert/integration/chisel/ChiselUtil.java rename to src/main/java/com/github/gtexpert/core/integration/chisel/ChiselUtil.java index bb53545f..24582254 100644 --- a/src/main/java/gtexpert/integration/chisel/ChiselUtil.java +++ b/src/main/java/com/github/gtexpert/core/integration/chisel/ChiselUtil.java @@ -1,4 +1,4 @@ -package gtexpert.integration.chisel; +package com.github.gtexpert.core.integration.chisel; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; diff --git a/src/main/java/gtexpert/integration/chisel/loaders/ChiselOreDictionaryLoader.java b/src/main/java/com/github/gtexpert/core/integration/chisel/loaders/ChiselOreDictionaryLoader.java similarity index 67% rename from src/main/java/gtexpert/integration/chisel/loaders/ChiselOreDictionaryLoader.java rename to src/main/java/com/github/gtexpert/core/integration/chisel/loaders/ChiselOreDictionaryLoader.java index a341bc55..d7544907 100644 --- a/src/main/java/gtexpert/integration/chisel/loaders/ChiselOreDictionaryLoader.java +++ b/src/main/java/com/github/gtexpert/core/integration/chisel/loaders/ChiselOreDictionaryLoader.java @@ -1,7 +1,7 @@ -package gtexpert.integration.chisel.loaders; +package com.github.gtexpert.core.integration.chisel.loaders; -import gtexpert.api.util.GTEUtility; -import gtexpert.api.util.Mods; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; public class ChiselOreDictionaryLoader { diff --git a/src/main/java/gtexpert/integration/chisel/metatileentities/ChiselMetaTileEntities.java b/src/main/java/com/github/gtexpert/core/integration/chisel/metatileentities/ChiselMetaTileEntities.java similarity index 82% rename from src/main/java/gtexpert/integration/chisel/metatileentities/ChiselMetaTileEntities.java rename to src/main/java/com/github/gtexpert/core/integration/chisel/metatileentities/ChiselMetaTileEntities.java index 23c37ff1..24feb158 100644 --- a/src/main/java/gtexpert/integration/chisel/metatileentities/ChiselMetaTileEntities.java +++ b/src/main/java/com/github/gtexpert/core/integration/chisel/metatileentities/ChiselMetaTileEntities.java @@ -1,13 +1,13 @@ -package gtexpert.integration.chisel.metatileentities; +package com.github.gtexpert.core.integration.chisel.metatileentities; +import static com.github.gtexpert.core.api.util.GTEUtility.gteId; import static gregtech.api.GTValues.*; import static gregtech.common.metatileentities.MetaTileEntities.registerMetaTileEntity; -import static gtexpert.api.util.GTEUtility.gteId; import gregtech.api.util.GTUtility; -import gtexpert.client.GTETextures; -import gtexpert.integration.chisel.ChiselRecipeMaps; +import com.github.gtexpert.core.client.GTETextures; +import com.github.gtexpert.core.integration.chisel.ChiselRecipeMaps; public class ChiselMetaTileEntities { diff --git a/src/main/java/gtexpert/integration/chisel/metatileentities/MetaTileEntityAutoChisel.java b/src/main/java/com/github/gtexpert/core/integration/chisel/metatileentities/MetaTileEntityAutoChisel.java similarity index 81% rename from src/main/java/gtexpert/integration/chisel/metatileentities/MetaTileEntityAutoChisel.java rename to src/main/java/com/github/gtexpert/core/integration/chisel/metatileentities/MetaTileEntityAutoChisel.java index c521b26a..666fd3fd 100644 --- a/src/main/java/gtexpert/integration/chisel/metatileentities/MetaTileEntityAutoChisel.java +++ b/src/main/java/com/github/gtexpert/core/integration/chisel/metatileentities/MetaTileEntityAutoChisel.java @@ -1,4 +1,4 @@ -package gtexpert.integration.chisel.metatileentities; +package com.github.gtexpert.core.integration.chisel.metatileentities; import java.util.function.Function; @@ -9,8 +9,8 @@ import gregtech.api.recipes.RecipeMap; import gregtech.client.renderer.ICubeRenderer; -import gtexpert.api.capability.SingleblockRecipeLogicNoCache; -import gtexpert.common.metatileentities.GTESimpleMachineMetaTileEntity; +import com.github.gtexpert.core.api.capability.SingleblockRecipeLogicNoCache; +import com.github.gtexpert.core.common.metatileentities.GTESimpleMachineMetaTileEntity; public class MetaTileEntityAutoChisel extends GTESimpleMachineMetaTileEntity { diff --git a/src/main/java/gtexpert/integration/chisel/recipes/ChiselBlocksRecipe.java b/src/main/java/com/github/gtexpert/core/integration/chisel/recipes/ChiselBlocksRecipe.java similarity index 98% rename from src/main/java/gtexpert/integration/chisel/recipes/ChiselBlocksRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/chisel/recipes/ChiselBlocksRecipe.java index fa88a59e..d1b8e63a 100644 --- a/src/main/java/gtexpert/integration/chisel/recipes/ChiselBlocksRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/chisel/recipes/ChiselBlocksRecipe.java @@ -1,9 +1,9 @@ -package gtexpert.integration.chisel.recipes; +package com.github.gtexpert.core.integration.chisel.recipes; +import static com.github.gtexpert.core.integration.chisel.metatileentities.ChiselMetaTileEntities.AUTO_CHISEL; import static gregtech.api.GTValues.*; import static gregtech.api.unification.ore.OrePrefix.*; import static gregtech.loaders.recipe.CraftingComponent.*; -import static gtexpert.integration.chisel.metatileentities.ChiselMetaTileEntities.AUTO_CHISEL; import java.util.Arrays; import java.util.List; @@ -26,11 +26,11 @@ import gregtech.common.blocks.*; import gregtech.loaders.recipe.MetaTileEntityLoader; -import gtexpert.api.util.GTEUtility; -import gtexpert.api.util.Mods; -import gtexpert.integration.chisel.ChiselConfigHolder; -import gtexpert.integration.chisel.ChiselRecipeMaps; -import gtexpert.integration.chisel.ChiselUtil; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.chisel.ChiselConfigHolder; +import com.github.gtexpert.core.integration.chisel.ChiselRecipeMaps; +import com.github.gtexpert.core.integration.chisel.ChiselUtil; public class ChiselBlocksRecipe { diff --git a/src/main/java/gtexpert/integration/chisel/recipes/ChiselToolsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/chisel/recipes/ChiselToolsRecipe.java similarity index 89% rename from src/main/java/gtexpert/integration/chisel/recipes/ChiselToolsRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/chisel/recipes/ChiselToolsRecipe.java index 4a2b59b3..fb968370 100644 --- a/src/main/java/gtexpert/integration/chisel/recipes/ChiselToolsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/chisel/recipes/ChiselToolsRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.chisel.recipes; +package com.github.gtexpert.core.integration.chisel.recipes; import static gregtech.api.unification.ore.OrePrefix.*; @@ -7,9 +7,9 @@ import gregtech.api.unification.stack.UnificationEntry; import gregtech.common.ConfigHolder; -import gtexpert.api.util.GTEUtility; -import gtexpert.api.util.Mods; -import gtexpert.integration.chisel.ChiselConfigHolder; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.chisel.ChiselConfigHolder; public class ChiselToolsRecipe { diff --git a/src/main/java/gtexpert/integration/crafttweaker/CraftTweakerModule.java b/src/main/java/com/github/gtexpert/core/integration/crafttweaker/CraftTweakerModule.java similarity index 50% rename from src/main/java/gtexpert/integration/crafttweaker/CraftTweakerModule.java rename to src/main/java/com/github/gtexpert/core/integration/crafttweaker/CraftTweakerModule.java index 9ed245ef..edc32015 100644 --- a/src/main/java/gtexpert/integration/crafttweaker/CraftTweakerModule.java +++ b/src/main/java/com/github/gtexpert/core/integration/crafttweaker/CraftTweakerModule.java @@ -1,10 +1,10 @@ -package gtexpert.integration.crafttweaker; +package com.github.gtexpert.core.integration.crafttweaker; -import gtexpert.api.GTEValues; -import gtexpert.api.modules.GTEModule; -import gtexpert.api.util.Mods; -import gtexpert.integration.GTEIntegrationSubmodule; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.modules.GTEModule; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.GTEIntegrationSubmodule; +import com.github.gtexpert.core.modules.GTEModules; @GTEModule( moduleID = GTEModules.MODULE_CT, diff --git a/src/main/java/gtexpert/integration/crafttweaker/provider/CrTI18nProvider.java b/src/main/java/com/github/gtexpert/core/integration/crafttweaker/provider/CrTI18nProvider.java similarity index 90% rename from src/main/java/gtexpert/integration/crafttweaker/provider/CrTI18nProvider.java rename to src/main/java/com/github/gtexpert/core/integration/crafttweaker/provider/CrTI18nProvider.java index 3f46b006..abfd7fe5 100644 --- a/src/main/java/gtexpert/integration/crafttweaker/provider/CrTI18nProvider.java +++ b/src/main/java/com/github/gtexpert/core/integration/crafttweaker/provider/CrTI18nProvider.java @@ -1,4 +1,4 @@ -package gtexpert.integration.crafttweaker.provider; +package com.github.gtexpert.core.integration.crafttweaker.provider; import net.minecraft.util.text.translation.I18n; diff --git a/src/main/java/gtexpert/integration/ctm/IFacadeWrapper.java b/src/main/java/com/github/gtexpert/core/integration/ctm/IFacadeWrapper.java similarity index 93% rename from src/main/java/gtexpert/integration/ctm/IFacadeWrapper.java rename to src/main/java/com/github/gtexpert/core/integration/ctm/IFacadeWrapper.java index 2397ba73..ed7f5b41 100644 --- a/src/main/java/gtexpert/integration/ctm/IFacadeWrapper.java +++ b/src/main/java/com/github/gtexpert/core/integration/ctm/IFacadeWrapper.java @@ -1,4 +1,4 @@ -package gtexpert.integration.ctm; +package com.github.gtexpert.core.integration.ctm; import javax.annotation.Nonnull; diff --git a/src/main/java/gtexpert/integration/deda/DEDAConfigHolder.java b/src/main/java/com/github/gtexpert/core/integration/deda/DEDAConfigHolder.java similarity index 78% rename from src/main/java/gtexpert/integration/deda/DEDAConfigHolder.java rename to src/main/java/com/github/gtexpert/core/integration/deda/DEDAConfigHolder.java index 44218ddd..d056415a 100644 --- a/src/main/java/gtexpert/integration/deda/DEDAConfigHolder.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/DEDAConfigHolder.java @@ -1,9 +1,9 @@ -package gtexpert.integration.deda; +package com.github.gtexpert.core.integration.deda; import net.minecraftforge.common.config.Config; -import gtexpert.api.GTEValues; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.modules.GTEModules; @Config.LangKey(GTEValues.MODID + ".config.integration.deda") @Config(modid = GTEValues.MODID, diff --git a/src/main/java/gtexpert/integration/deda/DEDAModule.java b/src/main/java/com/github/gtexpert/core/integration/deda/DEDAModule.java similarity index 71% rename from src/main/java/gtexpert/integration/deda/DEDAModule.java rename to src/main/java/com/github/gtexpert/core/integration/deda/DEDAModule.java index d6e791db..9fee098c 100644 --- a/src/main/java/gtexpert/integration/deda/DEDAModule.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/DEDAModule.java @@ -1,19 +1,19 @@ -package gtexpert.integration.deda; +package com.github.gtexpert.core.integration.deda; import net.minecraft.block.Block; import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; -import gtexpert.api.GTEValues; -import gtexpert.api.modules.GTEModule; -import gtexpert.api.util.Mods; -import gtexpert.integration.GTEIntegrationSubmodule; -import gtexpert.integration.deda.loaders.DEDAMaterialInfoLoader; -import gtexpert.integration.deda.loaders.DEDAOreDictionaryLoader; -import gtexpert.integration.deda.metatileentities.DEDAMetaTileEntities; -import gtexpert.integration.deda.recipes.*; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.modules.GTEModule; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.GTEIntegrationSubmodule; +import com.github.gtexpert.core.integration.deda.loaders.DEDAMaterialInfoLoader; +import com.github.gtexpert.core.integration.deda.loaders.DEDAOreDictionaryLoader; +import com.github.gtexpert.core.integration.deda.metatileentities.DEDAMetaTileEntities; +import com.github.gtexpert.core.integration.deda.recipes.*; +import com.github.gtexpert.core.modules.GTEModules; @GTEModule( moduleID = GTEModules.MODULE_DEDA, diff --git a/src/main/java/gtexpert/integration/deda/loaders/DEDAMaterialInfoLoader.java b/src/main/java/com/github/gtexpert/core/integration/deda/loaders/DEDAMaterialInfoLoader.java similarity index 81% rename from src/main/java/gtexpert/integration/deda/loaders/DEDAMaterialInfoLoader.java rename to src/main/java/com/github/gtexpert/core/integration/deda/loaders/DEDAMaterialInfoLoader.java index a51b987e..737df53c 100644 --- a/src/main/java/gtexpert/integration/deda/loaders/DEDAMaterialInfoLoader.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/loaders/DEDAMaterialInfoLoader.java @@ -1,4 +1,4 @@ -package gtexpert.integration.deda.loaders; +package com.github.gtexpert.core.integration.deda.loaders; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; @@ -9,11 +9,11 @@ import gregtech.api.unification.stack.MaterialStack; import gregtech.common.ConfigHolder; -import gtexpert.api.unification.material.GTEMaterials; -import gtexpert.api.util.GTEUtility; -import gtexpert.api.util.Mods; -import gtexpert.common.blocks.GTEBlockMetalCasing; -import gtexpert.common.blocks.GTEMetaBlocks; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.common.blocks.GTEBlockMetalCasing; +import com.github.gtexpert.core.common.blocks.GTEMetaBlocks; public class DEDAMaterialInfoLoader { diff --git a/src/main/java/gtexpert/integration/deda/loaders/DEDAOreDictionaryLoader.java b/src/main/java/com/github/gtexpert/core/integration/deda/loaders/DEDAOreDictionaryLoader.java similarity index 87% rename from src/main/java/gtexpert/integration/deda/loaders/DEDAOreDictionaryLoader.java rename to src/main/java/com/github/gtexpert/core/integration/deda/loaders/DEDAOreDictionaryLoader.java index d63701a0..f0af4d9d 100644 --- a/src/main/java/gtexpert/integration/deda/loaders/DEDAOreDictionaryLoader.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/loaders/DEDAOreDictionaryLoader.java @@ -1,8 +1,8 @@ -package gtexpert.integration.deda.loaders; +package com.github.gtexpert.core.integration.deda.loaders; import net.minecraftforge.oredict.OreDictionary; -import gtexpert.api.util.Mods; +import com.github.gtexpert.core.api.util.Mods; public class DEDAOreDictionaryLoader { diff --git a/src/main/java/gtexpert/integration/deda/metatileentities/DEDAMetaTileEntities.java b/src/main/java/com/github/gtexpert/core/integration/deda/metatileentities/DEDAMetaTileEntities.java similarity index 82% rename from src/main/java/gtexpert/integration/deda/metatileentities/DEDAMetaTileEntities.java rename to src/main/java/com/github/gtexpert/core/integration/deda/metatileentities/DEDAMetaTileEntities.java index 399f1a7a..b9f74a13 100644 --- a/src/main/java/gtexpert/integration/deda/metatileentities/DEDAMetaTileEntities.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/metatileentities/DEDAMetaTileEntities.java @@ -1,7 +1,7 @@ -package gtexpert.integration.deda.metatileentities; +package com.github.gtexpert.core.integration.deda.metatileentities; +import static com.github.gtexpert.core.api.util.GTEUtility.gteId; import static gregtech.common.metatileentities.MetaTileEntities.registerMetaTileEntity; -import static gtexpert.api.util.GTEUtility.gteId; public class DEDAMetaTileEntities { diff --git a/src/main/java/gtexpert/integration/deda/metatileentities/MetaTileEntityDraconiumFusion.java b/src/main/java/com/github/gtexpert/core/integration/deda/metatileentities/MetaTileEntityDraconiumFusion.java similarity index 91% rename from src/main/java/gtexpert/integration/deda/metatileentities/MetaTileEntityDraconiumFusion.java rename to src/main/java/com/github/gtexpert/core/integration/deda/metatileentities/MetaTileEntityDraconiumFusion.java index 8a65149e..27dcd58f 100644 --- a/src/main/java/gtexpert/integration/deda/metatileentities/MetaTileEntityDraconiumFusion.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/metatileentities/MetaTileEntityDraconiumFusion.java @@ -1,4 +1,4 @@ -package gtexpert.integration.deda.metatileentities; +package com.github.gtexpert.core.integration.deda.metatileentities; import java.util.List; @@ -26,12 +26,12 @@ import gregtech.client.renderer.ICubeRenderer; import gregtech.core.sound.GTSoundEvents; -import gtexpert.api.capability.MultiblockRecipeLogicNoCache; -import gtexpert.api.gui.GTEGuiTextures; -import gtexpert.client.GTETextures; -import gtexpert.common.blocks.GTEBlockMetalCasing; -import gtexpert.common.blocks.GTEMetaBlocks; -import gtexpert.integration.deda.recipemaps.GTEDraconicRecipeMaps; +import com.github.gtexpert.core.api.capability.MultiblockRecipeLogicNoCache; +import com.github.gtexpert.core.api.gui.GTEGuiTextures; +import com.github.gtexpert.core.client.GTETextures; +import com.github.gtexpert.core.common.blocks.GTEBlockMetalCasing; +import com.github.gtexpert.core.common.blocks.GTEMetaBlocks; +import com.github.gtexpert.core.integration.deda.recipemaps.GTEDraconicRecipeMaps; public abstract class MetaTileEntityDraconiumFusion extends RecipeMapMultiblockController { diff --git a/src/main/java/gtexpert/integration/deda/provider/DEDAJEIProvider.java b/src/main/java/com/github/gtexpert/core/integration/deda/provider/DEDAJEIProvider.java similarity index 82% rename from src/main/java/gtexpert/integration/deda/provider/DEDAJEIProvider.java rename to src/main/java/com/github/gtexpert/core/integration/deda/provider/DEDAJEIProvider.java index 8c3cdfa8..81735de4 100644 --- a/src/main/java/gtexpert/integration/deda/provider/DEDAJEIProvider.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/provider/DEDAJEIProvider.java @@ -1,12 +1,12 @@ -package gtexpert.integration.deda.provider; +package com.github.gtexpert.core.integration.deda.provider; import org.jetbrains.annotations.NotNull; import gregtech.api.GTValues; -import gtexpert.api.GTEValues; -import gtexpert.integration.deda.metatileentities.DEDAMetaTileEntities; -import gtexpert.integration.deda.recipemaps.GTEDraconicRecipeMaps; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.integration.deda.metatileentities.DEDAMetaTileEntities; +import com.github.gtexpert.core.integration.deda.recipemaps.GTEDraconicRecipeMaps; import mezz.jei.api.IModPlugin; import mezz.jei.api.IModRegistry; diff --git a/src/main/java/gtexpert/integration/deda/recipemaps/GTEDraconicRecipeMaps.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/GTEDraconicRecipeMaps.java similarity index 96% rename from src/main/java/gtexpert/integration/deda/recipemaps/GTEDraconicRecipeMaps.java rename to src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/GTEDraconicRecipeMaps.java index 25edb4dd..6a8c0ec1 100644 --- a/src/main/java/gtexpert/integration/deda/recipemaps/GTEDraconicRecipeMaps.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/GTEDraconicRecipeMaps.java @@ -1,4 +1,4 @@ -package gtexpert.integration.deda.recipemaps; +package com.github.gtexpert.core.integration.deda.recipemaps; import gregtech.api.gui.GuiTextures; import gregtech.api.gui.widgets.ProgressWidget; @@ -7,8 +7,8 @@ import gregtech.api.recipes.ingredients.GTRecipeInput; import gregtech.core.sound.GTSoundEvents; -import gtexpert.integration.deda.recipemaps.tierup.TierUpRecipeBuilder; -import gtexpert.integration.deda.recipemaps.upgrade.UpgradeRecipeBuilder; +import com.github.gtexpert.core.integration.deda.recipemaps.tierup.TierUpRecipeBuilder; +import com.github.gtexpert.core.integration.deda.recipemaps.upgrade.UpgradeRecipeBuilder; import crafttweaker.annotations.ZenRegister; import stanhebben.zenscript.annotations.ZenExpansion; diff --git a/src/main/java/gtexpert/integration/deda/recipemaps/RecipeMapDraconicFusion.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/RecipeMapDraconicFusion.java similarity index 94% rename from src/main/java/gtexpert/integration/deda/recipemaps/RecipeMapDraconicFusion.java rename to src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/RecipeMapDraconicFusion.java index 439eb8bd..455f0075 100644 --- a/src/main/java/gtexpert/integration/deda/recipemaps/RecipeMapDraconicFusion.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/RecipeMapDraconicFusion.java @@ -1,4 +1,4 @@ -package gtexpert.integration.deda.recipemaps; +package com.github.gtexpert.core.integration.deda.recipemaps; import java.util.List; @@ -25,11 +25,11 @@ import gregtech.api.recipes.RecipeMap; import gregtech.api.recipes.builders.SimpleRecipeBuilder; -import gtexpert.api.util.GTELog; -import gtexpert.integration.deda.recipemaps.tierup.TierUpRecipeBuilder; -import gtexpert.integration.deda.recipemaps.tierup.TierUpRecipeProperty; -import gtexpert.integration.deda.recipemaps.upgrade.UpgradeRecipeBuilder; -import gtexpert.integration.deda.recipemaps.upgrade.UpgradeRecipeProperty; +import com.github.gtexpert.core.api.util.GTELog; +import com.github.gtexpert.core.integration.deda.recipemaps.tierup.TierUpRecipeBuilder; +import com.github.gtexpert.core.integration.deda.recipemaps.tierup.TierUpRecipeProperty; +import com.github.gtexpert.core.integration.deda.recipemaps.upgrade.UpgradeRecipeBuilder; +import com.github.gtexpert.core.integration.deda.recipemaps.upgrade.UpgradeRecipeProperty; import cofh.redstoneflux.api.IEnergyContainerItem; diff --git a/src/main/java/gtexpert/integration/deda/recipemaps/RecipeMapDraconicUpgrade.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/RecipeMapDraconicUpgrade.java similarity index 93% rename from src/main/java/gtexpert/integration/deda/recipemaps/RecipeMapDraconicUpgrade.java rename to src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/RecipeMapDraconicUpgrade.java index c4b3eb96..f437f39a 100644 --- a/src/main/java/gtexpert/integration/deda/recipemaps/RecipeMapDraconicUpgrade.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/RecipeMapDraconicUpgrade.java @@ -1,4 +1,4 @@ -package gtexpert.integration.deda.recipemaps; +package com.github.gtexpert.core.integration.deda.recipemaps; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/gtexpert/integration/deda/recipemaps/tierup/TierUpRecipeBuilder.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/tierup/TierUpRecipeBuilder.java similarity index 97% rename from src/main/java/gtexpert/integration/deda/recipemaps/tierup/TierUpRecipeBuilder.java rename to src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/tierup/TierUpRecipeBuilder.java index a47a7dd3..e97a6fae 100644 --- a/src/main/java/gtexpert/integration/deda/recipemaps/tierup/TierUpRecipeBuilder.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/tierup/TierUpRecipeBuilder.java @@ -1,4 +1,4 @@ -package gtexpert.integration.deda.recipemaps.tierup; +package com.github.gtexpert.core.integration.deda.recipemaps.tierup; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; @@ -19,7 +19,7 @@ import gregtech.api.util.EnumValidationResult; import gregtech.api.util.ValidationResult; -import gtexpert.api.util.GTELog; +import com.github.gtexpert.core.api.util.GTELog; public class TierUpRecipeBuilder extends RecipeBuilder { diff --git a/src/main/java/gtexpert/integration/deda/recipemaps/tierup/TierUpRecipeProperty.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/tierup/TierUpRecipeProperty.java similarity index 93% rename from src/main/java/gtexpert/integration/deda/recipemaps/tierup/TierUpRecipeProperty.java rename to src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/tierup/TierUpRecipeProperty.java index c944db8d..9f2d7daa 100644 --- a/src/main/java/gtexpert/integration/deda/recipemaps/tierup/TierUpRecipeProperty.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/tierup/TierUpRecipeProperty.java @@ -1,4 +1,4 @@ -package gtexpert.integration.deda.recipemaps.tierup; +package com.github.gtexpert.core.integration.deda.recipemaps.tierup; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; diff --git a/src/main/java/gtexpert/integration/deda/recipemaps/upgrade/UpgradeRecipeBuilder.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/upgrade/UpgradeRecipeBuilder.java similarity index 98% rename from src/main/java/gtexpert/integration/deda/recipemaps/upgrade/UpgradeRecipeBuilder.java rename to src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/upgrade/UpgradeRecipeBuilder.java index 69870746..dcecb6eb 100644 --- a/src/main/java/gtexpert/integration/deda/recipemaps/upgrade/UpgradeRecipeBuilder.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/upgrade/UpgradeRecipeBuilder.java @@ -1,4 +1,4 @@ -package gtexpert.integration.deda.recipemaps.upgrade; +package com.github.gtexpert.core.integration.deda.recipemaps.upgrade; import net.minecraft.item.ItemStack; @@ -22,7 +22,7 @@ import gregtech.api.util.EnumValidationResult; import gregtech.api.util.ValidationResult; -import gtexpert.api.util.GTELog; +import com.github.gtexpert.core.api.util.GTELog; public class UpgradeRecipeBuilder extends RecipeBuilder { diff --git a/src/main/java/gtexpert/integration/deda/recipemaps/upgrade/UpgradeRecipeProperty.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/upgrade/UpgradeRecipeProperty.java similarity index 93% rename from src/main/java/gtexpert/integration/deda/recipemaps/upgrade/UpgradeRecipeProperty.java rename to src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/upgrade/UpgradeRecipeProperty.java index 701f2d14..fcd25e69 100644 --- a/src/main/java/gtexpert/integration/deda/recipemaps/upgrade/UpgradeRecipeProperty.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/upgrade/UpgradeRecipeProperty.java @@ -1,4 +1,4 @@ -package gtexpert.integration.deda.recipemaps.upgrade; +package com.github.gtexpert.core.integration.deda.recipemaps.upgrade; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; diff --git a/src/main/java/gtexpert/integration/deda/recipes/DraconicBlocksRecipe.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicBlocksRecipe.java similarity index 95% rename from src/main/java/gtexpert/integration/deda/recipes/DraconicBlocksRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicBlocksRecipe.java index c4911fe3..3eebb4b6 100644 --- a/src/main/java/gtexpert/integration/deda/recipes/DraconicBlocksRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicBlocksRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.deda.recipes; +package com.github.gtexpert.core.integration.deda.recipes; import static gregtech.api.GTValues.*; import static gregtech.api.unification.ore.OrePrefix.*; @@ -24,15 +24,15 @@ import gregicality.multiblocks.api.fluids.GCYMFluidStorageKeys; -import gtexpert.api.GTEValues; -import gtexpert.api.unification.material.GTEMaterials; -import gtexpert.api.util.GTEUtility; -import gtexpert.api.util.Mods; -import gtexpert.common.blocks.GTEBlockMetalCasing; -import gtexpert.common.blocks.GTEBlockWireCoil; -import gtexpert.common.blocks.GTEMetaBlocks; -import gtexpert.integration.deda.metatileentities.DEDAMetaTileEntities; -import gtexpert.integration.deda.recipemaps.GTEDraconicRecipeMaps; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.common.blocks.GTEBlockMetalCasing; +import com.github.gtexpert.core.common.blocks.GTEBlockWireCoil; +import com.github.gtexpert.core.common.blocks.GTEMetaBlocks; +import com.github.gtexpert.core.integration.deda.metatileentities.DEDAMetaTileEntities; +import com.github.gtexpert.core.integration.deda.recipemaps.GTEDraconicRecipeMaps; public class DraconicBlocksRecipe { diff --git a/src/main/java/gtexpert/integration/deda/recipes/DraconicFluidRecipe.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicFluidRecipe.java similarity index 92% rename from src/main/java/gtexpert/integration/deda/recipes/DraconicFluidRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicFluidRecipe.java index 41fbbdaf..08606459 100644 --- a/src/main/java/gtexpert/integration/deda/recipes/DraconicFluidRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicFluidRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.deda.recipes; +package com.github.gtexpert.core.integration.deda.recipes; import static gregtech.api.GTValues.VA; import static gregtech.api.unification.ore.OrePrefix.dust; @@ -9,8 +9,8 @@ import gregicality.multiblocks.api.fluids.GCYMFluidStorageKeys; import gregicality.multiblocks.api.recipes.GCYMRecipeMaps; -import gtexpert.api.GTEValues; -import gtexpert.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; public class DraconicFluidRecipe { diff --git a/src/main/java/gtexpert/integration/deda/recipes/DraconicImplosionMaterialsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicImplosionMaterialsRecipe.java similarity index 80% rename from src/main/java/gtexpert/integration/deda/recipes/DraconicImplosionMaterialsRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicImplosionMaterialsRecipe.java index 6a00909a..4f1d0e1a 100644 --- a/src/main/java/gtexpert/integration/deda/recipes/DraconicImplosionMaterialsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicImplosionMaterialsRecipe.java @@ -1,11 +1,11 @@ -package gtexpert.integration.deda.recipes; +package com.github.gtexpert.core.integration.deda.recipes; import static gregtech.api.unification.ore.OrePrefix.block; import com.brandon3055.draconicevolution.DEFeatures; -import com.github.gtexpert.inb.api.recipes.INBRecipeMaps; -import gtexpert.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.inb.api.recipes.INBRecipeMaps; public class DraconicImplosionMaterialsRecipe { diff --git a/src/main/java/gtexpert/integration/deda/recipes/DraconicItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicItemsRecipe.java similarity index 98% rename from src/main/java/gtexpert/integration/deda/recipes/DraconicItemsRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicItemsRecipe.java index a4828a29..69420d5a 100644 --- a/src/main/java/gtexpert/integration/deda/recipes/DraconicItemsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicItemsRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.deda.recipes; +package com.github.gtexpert.core.integration.deda.recipes; import static gregtech.api.GTValues.*; import static gregtech.api.unification.ore.OrePrefix.*; @@ -22,11 +22,11 @@ import gregicality.multiblocks.api.fluids.GCYMFluidStorageKeys; -import gtexpert.api.GTEValues; -import gtexpert.api.unification.material.GTEMaterials; -import gtexpert.api.util.GTEUtility; -import gtexpert.api.util.Mods; -import gtexpert.integration.deda.recipemaps.GTEDraconicRecipeMaps; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.deda.recipemaps.GTEDraconicRecipeMaps; public class DraconicItemsRecipe { diff --git a/src/main/java/gtexpert/integration/deda/recipes/DraconicMaterialsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicMaterialsRecipe.java similarity index 98% rename from src/main/java/gtexpert/integration/deda/recipes/DraconicMaterialsRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicMaterialsRecipe.java index 8292990b..35f9f7e8 100644 --- a/src/main/java/gtexpert/integration/deda/recipes/DraconicMaterialsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicMaterialsRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.deda.recipes; +package com.github.gtexpert.core.integration.deda.recipes; import static gregtech.api.GTValues.*; import static gregtech.api.unification.material.info.MaterialFlags.*; @@ -40,9 +40,9 @@ import gregicality.multiblocks.api.unification.GCYMMaterialFlags; import gregicality.multiblocks.api.unification.properties.GCYMPropertyKey; -import gtexpert.api.GTEValues; -import gtexpert.api.unification.material.GTEMaterials; -import gtexpert.api.util.Mods; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.Mods; public class DraconicMaterialsRecipe { diff --git a/src/main/java/gtexpert/integration/deda/recipes/DraconicTierupRecipe.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicTierupRecipe.java similarity index 96% rename from src/main/java/gtexpert/integration/deda/recipes/DraconicTierupRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicTierupRecipe.java index 10d6b606..f1c506ce 100644 --- a/src/main/java/gtexpert/integration/deda/recipes/DraconicTierupRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicTierupRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.deda.recipes; +package com.github.gtexpert.core.integration.deda.recipes; import static gregtech.api.GTValues.VA; import static gregtech.api.unification.ore.OrePrefix.plate; @@ -22,12 +22,12 @@ import gregicality.multiblocks.api.fluids.GCYMFluidStorageKeys; -import gtexpert.api.GTEValues; -import gtexpert.api.unification.material.GTEMaterials; -import gtexpert.api.util.GTEUtility; -import gtexpert.api.util.Mods; -import gtexpert.integration.deda.recipemaps.GTEDraconicRecipeMaps; -import gtexpert.integration.deda.recipemaps.tierup.TierUpRecipeBuilder; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.deda.recipemaps.GTEDraconicRecipeMaps; +import com.github.gtexpert.core.integration.deda.recipemaps.tierup.TierUpRecipeBuilder; public class DraconicTierupRecipe { diff --git a/src/main/java/gtexpert/integration/deda/recipes/DraconicToolsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicToolsRecipe.java similarity index 96% rename from src/main/java/gtexpert/integration/deda/recipes/DraconicToolsRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicToolsRecipe.java index a332bb95..668cdf12 100644 --- a/src/main/java/gtexpert/integration/deda/recipes/DraconicToolsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicToolsRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.deda.recipes; +package com.github.gtexpert.core.integration.deda.recipes; import static gregtech.api.GTValues.*; import static gregtech.api.unification.ore.OrePrefix.*; @@ -18,10 +18,10 @@ import gregicality.multiblocks.api.fluids.GCYMFluidStorageKeys; -import gtexpert.api.GTEValues; -import gtexpert.api.unification.material.GTEMaterials; -import gtexpert.api.util.Mods; -import gtexpert.integration.deda.recipemaps.GTEDraconicRecipeMaps; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.deda.recipemaps.GTEDraconicRecipeMaps; public class DraconicToolsRecipe { diff --git a/src/main/java/gtexpert/integration/deda/recipes/DraconicUpgradeRecipe.java b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicUpgradeRecipe.java similarity index 94% rename from src/main/java/gtexpert/integration/deda/recipes/DraconicUpgradeRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicUpgradeRecipe.java index d8839090..d2c0c9e2 100644 --- a/src/main/java/gtexpert/integration/deda/recipes/DraconicUpgradeRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicUpgradeRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.deda.recipes; +package com.github.gtexpert.core.integration.deda.recipes; import static gregtech.api.GTValues.VA; @@ -17,11 +17,11 @@ import gregicality.multiblocks.api.fluids.GCYMFluidStorageKeys; -import gtexpert.api.GTEValues; -import gtexpert.api.unification.material.GTEMaterials; -import gtexpert.api.util.GTELog; -import gtexpert.integration.deda.recipemaps.GTEDraconicRecipeMaps; -import gtexpert.integration.deda.recipemaps.upgrade.UpgradeRecipeBuilder; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.GTELog; +import com.github.gtexpert.core.integration.deda.recipemaps.GTEDraconicRecipeMaps; +import com.github.gtexpert.core.integration.deda.recipemaps.upgrade.UpgradeRecipeBuilder; public class DraconicUpgradeRecipe { diff --git a/src/main/java/gtexpert/integration/eio/EnderIOConfigHolder.java b/src/main/java/com/github/gtexpert/core/integration/eio/EnderIOConfigHolder.java similarity index 87% rename from src/main/java/gtexpert/integration/eio/EnderIOConfigHolder.java rename to src/main/java/com/github/gtexpert/core/integration/eio/EnderIOConfigHolder.java index b60b9a09..c85fb05e 100644 --- a/src/main/java/gtexpert/integration/eio/EnderIOConfigHolder.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/EnderIOConfigHolder.java @@ -1,9 +1,9 @@ -package gtexpert.integration.eio; +package com.github.gtexpert.core.integration.eio; import net.minecraftforge.common.config.Config; -import gtexpert.api.GTEValues; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.modules.GTEModules; @Config.LangKey(GTEValues.MODID + ".config.integration.eio") @Config(modid = GTEValues.MODID, diff --git a/src/main/java/gtexpert/integration/eio/EnderIOModule.java b/src/main/java/com/github/gtexpert/core/integration/eio/EnderIOModule.java similarity index 86% rename from src/main/java/gtexpert/integration/eio/EnderIOModule.java rename to src/main/java/com/github/gtexpert/core/integration/eio/EnderIOModule.java index ca2b8b54..e552de6b 100644 --- a/src/main/java/gtexpert/integration/eio/EnderIOModule.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/EnderIOModule.java @@ -1,4 +1,4 @@ -package gtexpert.integration.eio; +package com.github.gtexpert.core.integration.eio; import static gregtech.api.GTValues.*; @@ -22,16 +22,16 @@ import gregtech.api.recipes.ingredients.nbtmatch.NBTMatcher; import gregtech.api.recipes.ingredients.nbtmatch.NBTTagType; -import gtexpert.api.GTEValues; -import gtexpert.api.modules.GTEModule; -import gtexpert.api.util.GTEUtility; -import gtexpert.api.util.Mods; -import gtexpert.integration.GTEIntegrationSubmodule; -import gtexpert.integration.eio.loaders.EIOMaterialInfoLoader; -import gtexpert.integration.eio.loaders.EIOOreDictionaryLoader; -import gtexpert.integration.eio.metatileentities.EIOMetaTileEntities; -import gtexpert.integration.eio.recipes.*; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.modules.GTEModule; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.GTEIntegrationSubmodule; +import com.github.gtexpert.core.integration.eio.loaders.EIOMaterialInfoLoader; +import com.github.gtexpert.core.integration.eio.loaders.EIOOreDictionaryLoader; +import com.github.gtexpert.core.integration.eio.metatileentities.EIOMetaTileEntities; +import com.github.gtexpert.core.integration.eio.recipes.*; +import com.github.gtexpert.core.modules.GTEModules; import crazypants.enderio.base.init.ModObject; diff --git a/src/main/java/gtexpert/integration/eio/EnderIORecipeMaps.java b/src/main/java/com/github/gtexpert/core/integration/eio/EnderIORecipeMaps.java similarity index 92% rename from src/main/java/gtexpert/integration/eio/EnderIORecipeMaps.java rename to src/main/java/com/github/gtexpert/core/integration/eio/EnderIORecipeMaps.java index 99fd2b22..9e45d9d9 100644 --- a/src/main/java/gtexpert/integration/eio/EnderIORecipeMaps.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/EnderIORecipeMaps.java @@ -1,4 +1,4 @@ -package gtexpert.integration.eio; +package com.github.gtexpert.core.integration.eio; import net.minecraft.util.SoundEvent; @@ -8,8 +8,8 @@ import gregtech.api.recipes.builders.SimpleRecipeBuilder; import gregtech.core.sound.GTSoundEvents; -import gtexpert.api.gui.GTEGuiTextures; -import gtexpert.api.util.Mods; +import com.github.gtexpert.core.api.gui.GTEGuiTextures; +import com.github.gtexpert.core.api.util.Mods; import crafttweaker.annotations.ZenRegister; import stanhebben.zenscript.annotations.ZenExpansion; diff --git a/src/main/java/gtexpert/integration/eio/loaders/EIOMaterialInfoLoader.java b/src/main/java/com/github/gtexpert/core/integration/eio/loaders/EIOMaterialInfoLoader.java similarity index 93% rename from src/main/java/gtexpert/integration/eio/loaders/EIOMaterialInfoLoader.java rename to src/main/java/com/github/gtexpert/core/integration/eio/loaders/EIOMaterialInfoLoader.java index af60fcdb..edb009f9 100644 --- a/src/main/java/gtexpert/integration/eio/loaders/EIOMaterialInfoLoader.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/loaders/EIOMaterialInfoLoader.java @@ -1,4 +1,4 @@ -package gtexpert.integration.eio.loaders; +package com.github.gtexpert.core.integration.eio.loaders; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; @@ -10,9 +10,9 @@ import gregtech.api.unification.stack.MaterialStack; import gregtech.common.ConfigHolder; -import gtexpert.api.unification.material.GTEMaterials; -import gtexpert.api.util.GTEUtility; -import gtexpert.api.util.Mods; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; public class EIOMaterialInfoLoader { diff --git a/src/main/java/gtexpert/integration/eio/loaders/EIOOreDictionaryLoader.java b/src/main/java/com/github/gtexpert/core/integration/eio/loaders/EIOOreDictionaryLoader.java similarity index 93% rename from src/main/java/gtexpert/integration/eio/loaders/EIOOreDictionaryLoader.java rename to src/main/java/com/github/gtexpert/core/integration/eio/loaders/EIOOreDictionaryLoader.java index 32d16269..03e13811 100644 --- a/src/main/java/gtexpert/integration/eio/loaders/EIOOreDictionaryLoader.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/loaders/EIOOreDictionaryLoader.java @@ -1,10 +1,10 @@ -package gtexpert.integration.eio.loaders; +package com.github.gtexpert.core.integration.eio.loaders; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; -import gtexpert.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.GTEUtility; import crazypants.enderio.base.init.ModObject; import crazypants.enderio.base.material.material.Material; diff --git a/src/main/java/gtexpert/integration/eio/metatileentities/EIOMetaTileEntities.java b/src/main/java/com/github/gtexpert/core/integration/eio/metatileentities/EIOMetaTileEntities.java similarity index 79% rename from src/main/java/gtexpert/integration/eio/metatileentities/EIOMetaTileEntities.java rename to src/main/java/com/github/gtexpert/core/integration/eio/metatileentities/EIOMetaTileEntities.java index 188c8ab4..b3449696 100644 --- a/src/main/java/gtexpert/integration/eio/metatileentities/EIOMetaTileEntities.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/metatileentities/EIOMetaTileEntities.java @@ -1,16 +1,16 @@ -package gtexpert.integration.eio.metatileentities; +package com.github.gtexpert.core.integration.eio.metatileentities; +import static com.github.gtexpert.core.api.util.GTEUtility.gteId; +import static com.github.gtexpert.core.common.metatileentities.GTEMetaTileEntities.registerGTESimpleMetaTileEntity; import static gregtech.api.GTValues.*; import static gregtech.common.metatileentities.MetaTileEntities.registerMetaTileEntities; -import static gtexpert.api.util.GTEUtility.gteId; -import static gtexpert.common.metatileentities.GTEMetaTileEntities.registerGTESimpleMetaTileEntity; import gregtech.api.util.GTUtility; -import gtexpert.api.util.GTEUtility; -import gtexpert.client.GTETextures; -import gtexpert.common.metatileentities.GTESimpleMachineMetaTileEntity; -import gtexpert.integration.eio.EnderIORecipeMaps; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.client.GTETextures; +import com.github.gtexpert.core.common.metatileentities.GTESimpleMachineMetaTileEntity; +import com.github.gtexpert.core.integration.eio.EnderIORecipeMaps; public class EIOMetaTileEntities { diff --git a/src/main/java/gtexpert/integration/eio/metatileentities/ElectricSpawnerLogic.java b/src/main/java/com/github/gtexpert/core/integration/eio/metatileentities/ElectricSpawnerLogic.java similarity index 99% rename from src/main/java/gtexpert/integration/eio/metatileentities/ElectricSpawnerLogic.java rename to src/main/java/com/github/gtexpert/core/integration/eio/metatileentities/ElectricSpawnerLogic.java index 1ab5312d..0cf027ba 100644 --- a/src/main/java/gtexpert/integration/eio/metatileentities/ElectricSpawnerLogic.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/metatileentities/ElectricSpawnerLogic.java @@ -1,4 +1,4 @@ -package gtexpert.integration.eio.metatileentities; +package com.github.gtexpert.core.integration.eio.metatileentities; import java.util.Collections; import java.util.function.Supplier; @@ -29,7 +29,7 @@ import gregtech.api.util.GTTransferUtils; import gregtech.api.util.GTUtility; -import gtexpert.api.capability.GTEDataCodes; +import com.github.gtexpert.core.api.capability.GTEDataCodes; import crazypants.enderio.base.init.ModObject; import crazypants.enderio.base.item.soulvial.ItemSoulVial; diff --git a/src/main/java/gtexpert/integration/eio/metatileentities/MetaTileEntityElectricSpawner.java b/src/main/java/com/github/gtexpert/core/integration/eio/metatileentities/MetaTileEntityElectricSpawner.java similarity index 97% rename from src/main/java/gtexpert/integration/eio/metatileentities/MetaTileEntityElectricSpawner.java rename to src/main/java/com/github/gtexpert/core/integration/eio/metatileentities/MetaTileEntityElectricSpawner.java index 67cc94bb..82683ceb 100644 --- a/src/main/java/gtexpert/integration/eio/metatileentities/MetaTileEntityElectricSpawner.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/metatileentities/MetaTileEntityElectricSpawner.java @@ -1,4 +1,4 @@ -package gtexpert.integration.eio.metatileentities; +package com.github.gtexpert.core.integration.eio.metatileentities; import java.util.Arrays; import java.util.List; @@ -36,10 +36,10 @@ import gregtech.api.util.Size; import gregtech.client.renderer.ICubeRenderer; -import gtexpert.api.gui.GTEGuiTextures; -import gtexpert.api.util.GTEUtility; -import gtexpert.api.util.Mods; -import gtexpert.common.metatileentities.GTESimpleMachineMetaTileEntity; +import com.github.gtexpert.core.api.gui.GTEGuiTextures; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.common.metatileentities.GTESimpleMachineMetaTileEntity; public class MetaTileEntityElectricSpawner extends GTESimpleMachineMetaTileEntity { diff --git a/src/main/java/gtexpert/integration/eio/recipes/EIOBlocksRecipe.java b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOBlocksRecipe.java similarity index 98% rename from src/main/java/gtexpert/integration/eio/recipes/EIOBlocksRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOBlocksRecipe.java index 20a8e564..da215a81 100644 --- a/src/main/java/gtexpert/integration/eio/recipes/EIOBlocksRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOBlocksRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.eio.recipes; +package com.github.gtexpert.core.integration.eio.recipes; import static gregtech.api.GTValues.*; import static gregtech.api.unification.ore.OrePrefix.*; @@ -18,13 +18,13 @@ import gregtech.common.metatileentities.MetaTileEntities; import gregtech.loaders.recipe.MetaTileEntityLoader; -import gtexpert.api.GTEValues; -import gtexpert.api.unification.material.GTEMaterials; -import gtexpert.api.util.GTEUtility; -import gtexpert.api.util.Mods; -import gtexpert.common.GTEConfigHolder; -import gtexpert.integration.eio.EnderIOConfigHolder; -import gtexpert.integration.eio.metatileentities.EIOMetaTileEntities; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.common.GTEConfigHolder; +import com.github.gtexpert.core.integration.eio.EnderIOConfigHolder; +import com.github.gtexpert.core.integration.eio.metatileentities.EIOMetaTileEntities; import crazypants.enderio.conduits.init.ConduitObject; import crazypants.enderio.endergy.init.EndergyObject; diff --git a/src/main/java/gtexpert/integration/eio/recipes/EIOFluidRecipe.java b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOFluidRecipe.java similarity index 96% rename from src/main/java/gtexpert/integration/eio/recipes/EIOFluidRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOFluidRecipe.java index 0aa30675..9772cdb8 100644 --- a/src/main/java/gtexpert/integration/eio/recipes/EIOFluidRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOFluidRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.eio.recipes; +package com.github.gtexpert.core.integration.eio.recipes; import static gregtech.api.GTValues.*; import static gregtech.api.unification.ore.OrePrefix.dust; @@ -9,10 +9,10 @@ import gregtech.api.recipes.RecipeMaps; import gregtech.api.unification.material.Materials; -import gtexpert.api.GTEValues; -import gtexpert.api.unification.material.GTEMaterials; -import gtexpert.api.util.GTEUtility; -import gtexpert.api.util.Mods; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; import crazypants.enderio.base.init.ModObject; diff --git a/src/main/java/gtexpert/integration/eio/recipes/EIOItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOItemsRecipe.java similarity index 94% rename from src/main/java/gtexpert/integration/eio/recipes/EIOItemsRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOItemsRecipe.java index ac0761cd..9f9b6306 100644 --- a/src/main/java/gtexpert/integration/eio/recipes/EIOItemsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOItemsRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.eio.recipes; +package com.github.gtexpert.core.integration.eio.recipes; import static gregtech.api.GTValues.*; import static gregtech.api.unification.ore.OrePrefix.dust; @@ -11,12 +11,12 @@ import gregtech.api.unification.material.Materials; import gregtech.api.unification.stack.UnificationEntry; -import gtexpert.api.GTEValues; -import gtexpert.api.unification.material.GTEMaterials; -import gtexpert.api.util.GTEUtility; -import gtexpert.api.util.Mods; -import gtexpert.common.GTEConfigHolder; -import gtexpert.common.items.GTEMetaItems; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.common.GTEConfigHolder; +import com.github.gtexpert.core.common.items.GTEMetaItems; import crazypants.enderio.base.init.ModObject; import crazypants.enderio.endergy.init.EndergyObject; diff --git a/src/main/java/gtexpert/integration/eio/recipes/EIOMaterialsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOMaterialsRecipe.java similarity index 97% rename from src/main/java/gtexpert/integration/eio/recipes/EIOMaterialsRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOMaterialsRecipe.java index d4a73d30..a35f338c 100644 --- a/src/main/java/gtexpert/integration/eio/recipes/EIOMaterialsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOMaterialsRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.eio.recipes; +package com.github.gtexpert.core.integration.eio.recipes; import static gregtech.api.GTValues.VA; import static gregtech.api.unification.ore.OrePrefix.*; @@ -14,9 +14,9 @@ import gregtech.api.unification.material.Materials; import gregtech.common.ConfigHolder; -import gtexpert.api.GTEValues; -import gtexpert.api.unification.material.GTEMaterials; -import gtexpert.loaders.recipe.handlers.GTEImplosionRecipeHandler; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.loaders.recipe.handlers.GTEImplosionRecipeHandler; import crazypants.enderio.base.init.ModObject; diff --git a/src/main/java/gtexpert/integration/eio/recipes/EIOSliceNSpliceRecipe.java b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOSliceNSpliceRecipe.java similarity index 95% rename from src/main/java/gtexpert/integration/eio/recipes/EIOSliceNSpliceRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOSliceNSpliceRecipe.java index 6fd7ff59..6151c257 100644 --- a/src/main/java/gtexpert/integration/eio/recipes/EIOSliceNSpliceRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOSliceNSpliceRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.eio.recipes; +package com.github.gtexpert.core.integration.eio.recipes; import static gregtech.api.GTValues.*; import static gregtech.api.unification.ore.OrePrefix.*; @@ -8,8 +8,8 @@ import gregtech.api.unification.material.Materials; import gregtech.common.items.MetaItems; -import gtexpert.api.unification.material.GTEMaterials; -import gtexpert.integration.eio.EnderIORecipeMaps; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.integration.eio.EnderIORecipeMaps; import crazypants.enderio.base.init.ModObject; import crazypants.enderio.endergy.init.EndergyObject; diff --git a/src/main/java/gtexpert/integration/eio/recipes/EIOSoulBinderRecipe.java b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOSoulBinderRecipe.java similarity index 95% rename from src/main/java/gtexpert/integration/eio/recipes/EIOSoulBinderRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOSoulBinderRecipe.java index 6f255f18..7ae7f14b 100644 --- a/src/main/java/gtexpert/integration/eio/recipes/EIOSoulBinderRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOSoulBinderRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.eio.recipes; +package com.github.gtexpert.core.integration.eio.recipes; import static gregtech.api.GTValues.*; import static gregtech.api.unification.ore.OrePrefix.gem; @@ -16,9 +16,9 @@ import gregtech.api.recipes.ingredients.nbtmatch.NBTTagType; import gregtech.api.unification.material.Materials; -import gtexpert.api.util.GTEUtility; -import gtexpert.integration.eio.EnderIOModule; -import gtexpert.integration.eio.EnderIORecipeMaps; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.integration.eio.EnderIOModule; +import com.github.gtexpert.core.integration.eio.EnderIORecipeMaps; import crazypants.enderio.base.init.ModObject; diff --git a/src/main/java/gtexpert/integration/eio/recipes/EIOToolsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOToolsRecipe.java similarity index 98% rename from src/main/java/gtexpert/integration/eio/recipes/EIOToolsRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOToolsRecipe.java index b09226d0..760502bf 100644 --- a/src/main/java/gtexpert/integration/eio/recipes/EIOToolsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOToolsRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.eio.recipes; +package com.github.gtexpert.core.integration.eio.recipes; import static gregtech.api.unification.ore.OrePrefix.*; @@ -9,8 +9,8 @@ import gregtech.api.unification.OreDictUnifier; import gregtech.common.ConfigHolder; -import gtexpert.api.unification.material.GTEMaterials; -import gtexpert.integration.eio.EnderIOConfigHolder; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.integration.eio.EnderIOConfigHolder; import crazypants.enderio.base.init.ModObject; import crazypants.enderio.endergy.init.EndergyObject; diff --git a/src/main/java/gtexpert/integration/eio/recipes/EIOVialExtractorRecipe.java b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOVialExtractorRecipe.java similarity index 95% rename from src/main/java/gtexpert/integration/eio/recipes/EIOVialExtractorRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOVialExtractorRecipe.java index 3283211d..2cac9802 100644 --- a/src/main/java/gtexpert/integration/eio/recipes/EIOVialExtractorRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOVialExtractorRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.eio.recipes; +package com.github.gtexpert.core.integration.eio.recipes; import static gregtech.api.unification.ore.OrePrefix.ingot; @@ -10,8 +10,8 @@ import gregtech.api.unification.material.Materials; -import gtexpert.api.util.Mods; -import gtexpert.integration.eio.EnderIOModule; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.eio.EnderIOModule; import crazypants.enderio.base.init.ModObject; diff --git a/src/main/java/gtexpert/integration/extracpus/EXCPUSConfigHolder.java b/src/main/java/com/github/gtexpert/core/integration/extracpus/EXCPUSConfigHolder.java similarity index 78% rename from src/main/java/gtexpert/integration/extracpus/EXCPUSConfigHolder.java rename to src/main/java/com/github/gtexpert/core/integration/extracpus/EXCPUSConfigHolder.java index 8112365a..19530140 100644 --- a/src/main/java/gtexpert/integration/extracpus/EXCPUSConfigHolder.java +++ b/src/main/java/com/github/gtexpert/core/integration/extracpus/EXCPUSConfigHolder.java @@ -1,10 +1,10 @@ -package gtexpert.integration.extracpus; +package com.github.gtexpert.core.integration.extracpus; import net.minecraftforge.common.config.Config; import net.minecraftforge.common.config.Config.LangKey; -import gtexpert.api.GTEValues; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.modules.GTEModules; @LangKey(GTEValues.MODID + ".config.integration.extracpus") @Config(modid = GTEValues.MODID, diff --git a/src/main/java/gtexpert/integration/extracpus/EXCPUSModule.java b/src/main/java/com/github/gtexpert/core/integration/extracpus/EXCPUSModule.java similarity index 57% rename from src/main/java/gtexpert/integration/extracpus/EXCPUSModule.java rename to src/main/java/com/github/gtexpert/core/integration/extracpus/EXCPUSModule.java index d14be857..11fafbbc 100644 --- a/src/main/java/gtexpert/integration/extracpus/EXCPUSModule.java +++ b/src/main/java/com/github/gtexpert/core/integration/extracpus/EXCPUSModule.java @@ -1,15 +1,15 @@ -package gtexpert.integration.extracpus; +package com.github.gtexpert.core.integration.extracpus; import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.event.RegistryEvent; -import gtexpert.api.GTEValues; -import gtexpert.api.modules.GTEModule; -import gtexpert.api.util.Mods; -import gtexpert.integration.GTEIntegrationSubmodule; -import gtexpert.integration.extracpus.recipes.EXCPUSBlocksRecipe; -import gtexpert.integration.extracpus.recipes.EXCPUSItemsRecipe; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.modules.GTEModule; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.GTEIntegrationSubmodule; +import com.github.gtexpert.core.integration.extracpus.recipes.EXCPUSBlocksRecipe; +import com.github.gtexpert.core.integration.extracpus.recipes.EXCPUSItemsRecipe; +import com.github.gtexpert.core.modules.GTEModules; @GTEModule( moduleID = GTEModules.MODULE_EXCPUS, diff --git a/src/main/java/gtexpert/integration/extracpus/recipes/EXCPUSBlocksRecipe.java b/src/main/java/com/github/gtexpert/core/integration/extracpus/recipes/EXCPUSBlocksRecipe.java similarity index 95% rename from src/main/java/gtexpert/integration/extracpus/recipes/EXCPUSBlocksRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/extracpus/recipes/EXCPUSBlocksRecipe.java index 506ec80e..e7d591e2 100644 --- a/src/main/java/gtexpert/integration/extracpus/recipes/EXCPUSBlocksRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/extracpus/recipes/EXCPUSBlocksRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.extracpus.recipes; +package com.github.gtexpert.core.integration.extracpus.recipes; import static gregtech.api.GTValues.ULV; import static gregtech.api.GTValues.VA; @@ -6,8 +6,8 @@ import gregtech.api.recipes.ModHandler; import gregtech.api.recipes.RecipeMaps; -import gtexpert.api.util.Mods; -import gtexpert.integration.extracpus.EXCPUSConfigHolder; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.extracpus.EXCPUSConfigHolder; public class EXCPUSBlocksRecipe { diff --git a/src/main/java/gtexpert/integration/extracpus/recipes/EXCPUSItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/extracpus/recipes/EXCPUSItemsRecipe.java similarity index 94% rename from src/main/java/gtexpert/integration/extracpus/recipes/EXCPUSItemsRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/extracpus/recipes/EXCPUSItemsRecipe.java index 25363dc4..7c82f83f 100644 --- a/src/main/java/gtexpert/integration/extracpus/recipes/EXCPUSItemsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/extracpus/recipes/EXCPUSItemsRecipe.java @@ -1,11 +1,11 @@ -package gtexpert.integration.extracpus.recipes; +package com.github.gtexpert.core.integration.extracpus.recipes; import static gregtech.api.GTValues.ULV; import static gregtech.api.GTValues.VA; import gregtech.api.recipes.RecipeMaps; -import gtexpert.api.util.Mods; +import com.github.gtexpert.core.api.util.Mods; public class EXCPUSItemsRecipe { diff --git a/src/main/java/gtexpert/integration/ffm/FFMConfigHolder.java b/src/main/java/com/github/gtexpert/core/integration/ffm/FFMConfigHolder.java similarity index 76% rename from src/main/java/gtexpert/integration/ffm/FFMConfigHolder.java rename to src/main/java/com/github/gtexpert/core/integration/ffm/FFMConfigHolder.java index e1a5a616..efaee201 100644 --- a/src/main/java/gtexpert/integration/ffm/FFMConfigHolder.java +++ b/src/main/java/com/github/gtexpert/core/integration/ffm/FFMConfigHolder.java @@ -1,9 +1,9 @@ -package gtexpert.integration.ffm; +package com.github.gtexpert.core.integration.ffm; import net.minecraftforge.common.config.Config; -import gtexpert.api.GTEValues; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.modules.GTEModules; @Config.LangKey(GTEValues.MODID + ".config.integration.ffm") @Config(modid = GTEValues.MODID, diff --git a/src/main/java/gtexpert/integration/ffm/FFMModule.java b/src/main/java/com/github/gtexpert/core/integration/ffm/FFMModule.java similarity index 65% rename from src/main/java/gtexpert/integration/ffm/FFMModule.java rename to src/main/java/com/github/gtexpert/core/integration/ffm/FFMModule.java index ac0735b5..3c642dc7 100644 --- a/src/main/java/gtexpert/integration/ffm/FFMModule.java +++ b/src/main/java/com/github/gtexpert/core/integration/ffm/FFMModule.java @@ -1,17 +1,17 @@ -package gtexpert.integration.ffm; +package com.github.gtexpert.core.integration.ffm; import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; -import gtexpert.api.GTEValues; -import gtexpert.api.modules.GTEModule; -import gtexpert.api.util.Mods; -import gtexpert.integration.GTEIntegrationSubmodule; -import gtexpert.integration.ffm.loaders.FFMOreDictionaryLoader; -import gtexpert.integration.ffm.recipes.*; -import gtexpert.integration.ffm.recipes.machines.*; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.modules.GTEModule; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.GTEIntegrationSubmodule; +import com.github.gtexpert.core.integration.ffm.loaders.FFMOreDictionaryLoader; +import com.github.gtexpert.core.integration.ffm.recipes.*; +import com.github.gtexpert.core.integration.ffm.recipes.machines.*; +import com.github.gtexpert.core.modules.GTEModules; @GTEModule( moduleID = GTEModules.MODULE_FFM, diff --git a/src/main/java/gtexpert/integration/ffm/FFMUtility.java b/src/main/java/com/github/gtexpert/core/integration/ffm/FFMUtility.java similarity index 93% rename from src/main/java/gtexpert/integration/ffm/FFMUtility.java rename to src/main/java/com/github/gtexpert/core/integration/ffm/FFMUtility.java index 63612a2f..0cd209ad 100644 --- a/src/main/java/gtexpert/integration/ffm/FFMUtility.java +++ b/src/main/java/com/github/gtexpert/core/integration/ffm/FFMUtility.java @@ -1,10 +1,10 @@ -package gtexpert.integration.ffm; +package com.github.gtexpert.core.integration.ffm; import org.jetbrains.annotations.NotNull; import gregtech.common.ConfigHolder; -import gtexpert.api.util.GTELog; +import com.github.gtexpert.core.api.util.GTELog; import forestry.api.core.ForestryAPI; diff --git a/src/main/java/gtexpert/integration/ffm/loaders/FFMOreDictionaryLoader.java b/src/main/java/com/github/gtexpert/core/integration/ffm/loaders/FFMOreDictionaryLoader.java similarity index 78% rename from src/main/java/gtexpert/integration/ffm/loaders/FFMOreDictionaryLoader.java rename to src/main/java/com/github/gtexpert/core/integration/ffm/loaders/FFMOreDictionaryLoader.java index b8aa1104..c2246980 100644 --- a/src/main/java/gtexpert/integration/ffm/loaders/FFMOreDictionaryLoader.java +++ b/src/main/java/com/github/gtexpert/core/integration/ffm/loaders/FFMOreDictionaryLoader.java @@ -1,8 +1,8 @@ -package gtexpert.integration.ffm.loaders; +package com.github.gtexpert.core.integration.ffm.loaders; import net.minecraftforge.oredict.OreDictionary; -import gtexpert.api.util.Mods; +import com.github.gtexpert.core.api.util.Mods; public class FFMOreDictionaryLoader { diff --git a/src/main/java/gtexpert/integration/ffm/recipes/FFMBlockRecipe.java b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMBlockRecipe.java similarity index 94% rename from src/main/java/gtexpert/integration/ffm/recipes/FFMBlockRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMBlockRecipe.java index 5cb0c8bd..7367f1ff 100644 --- a/src/main/java/gtexpert/integration/ffm/recipes/FFMBlockRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMBlockRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.ffm.recipes; +package com.github.gtexpert.core.integration.ffm.recipes; import static gregtech.api.unification.ore.OrePrefix.*; @@ -11,7 +11,7 @@ import gregtech.api.unification.material.Materials; import gregtech.common.ConfigHolder; -import gtexpert.api.util.Mods; +import com.github.gtexpert.core.api.util.Mods; public class FFMBlockRecipe { diff --git a/src/main/java/gtexpert/integration/ffm/recipes/FFMItemRecipe.java b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMItemRecipe.java similarity index 92% rename from src/main/java/gtexpert/integration/ffm/recipes/FFMItemRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMItemRecipe.java index 7f66983c..8872bd63 100644 --- a/src/main/java/gtexpert/integration/ffm/recipes/FFMItemRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMItemRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.ffm.recipes; +package com.github.gtexpert.core.integration.ffm.recipes; import static gregtech.api.unification.ore.OrePrefix.*; @@ -7,7 +7,7 @@ import gregtech.api.unification.material.Materials; import gregtech.api.unification.stack.UnificationEntry; -import gtexpert.api.util.Mods; +import com.github.gtexpert.core.api.util.Mods; public class FFMItemRecipe { diff --git a/src/main/java/gtexpert/integration/ffm/recipes/FFMMaterialsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMMaterialsRecipe.java similarity index 94% rename from src/main/java/gtexpert/integration/ffm/recipes/FFMMaterialsRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMMaterialsRecipe.java index e1467f15..7d502cca 100644 --- a/src/main/java/gtexpert/integration/ffm/recipes/FFMMaterialsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMMaterialsRecipe.java @@ -1,8 +1,8 @@ -package gtexpert.integration.ffm.recipes; +package com.github.gtexpert.core.integration.ffm.recipes; import gregtech.api.recipes.ModHandler; -import gtexpert.api.util.Mods; +import com.github.gtexpert.core.api.util.Mods; public class FFMMaterialsRecipe { diff --git a/src/main/java/gtexpert/integration/ffm/recipes/FFMToolRecipe.java b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMToolRecipe.java similarity index 97% rename from src/main/java/gtexpert/integration/ffm/recipes/FFMToolRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMToolRecipe.java index 0a6bb308..d7a76c5c 100644 --- a/src/main/java/gtexpert/integration/ffm/recipes/FFMToolRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/FFMToolRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.ffm.recipes; +package com.github.gtexpert.core.integration.ffm.recipes; import static gregtech.api.unification.ore.OrePrefix.*; @@ -13,7 +13,7 @@ import gregtech.api.unification.stack.UnificationEntry; import gregtech.common.ConfigHolder; -import gtexpert.api.util.Mods; +import com.github.gtexpert.core.api.util.Mods; public class FFMToolRecipe { diff --git a/src/main/java/gtexpert/integration/ffm/recipes/machines/CarpenterLoader.java b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/machines/CarpenterLoader.java similarity index 99% rename from src/main/java/gtexpert/integration/ffm/recipes/machines/CarpenterLoader.java rename to src/main/java/com/github/gtexpert/core/integration/ffm/recipes/machines/CarpenterLoader.java index 89128060..e5f6c8b2 100644 --- a/src/main/java/gtexpert/integration/ffm/recipes/machines/CarpenterLoader.java +++ b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/machines/CarpenterLoader.java @@ -1,4 +1,4 @@ -package gtexpert.integration.ffm.recipes.machines; +package com.github.gtexpert.core.integration.ffm.recipes.machines; import static gregtech.api.unification.ore.OrePrefix.*; @@ -19,11 +19,11 @@ import gregtech.common.items.MetaItems; import gregtech.common.metatileentities.MetaTileEntities; -import gtexpert.api.util.GTELog; -import gtexpert.api.util.GTEUtility; -import gtexpert.api.util.Mods; -import gtexpert.integration.ffm.FFMConfigHolder; -import gtexpert.integration.ffm.FFMUtility; +import com.github.gtexpert.core.api.util.GTELog; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.ffm.FFMConfigHolder; +import com.github.gtexpert.core.integration.ffm.FFMUtility; import forestry.api.circuits.ICircuit; import forestry.api.recipes.RecipeManagers; diff --git a/src/main/java/gtexpert/integration/ffm/recipes/machines/CentrifugeLoader.java b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/machines/CentrifugeLoader.java similarity index 99% rename from src/main/java/gtexpert/integration/ffm/recipes/machines/CentrifugeLoader.java rename to src/main/java/com/github/gtexpert/core/integration/ffm/recipes/machines/CentrifugeLoader.java index b376ba9d..a7b3acf7 100644 --- a/src/main/java/gtexpert/integration/ffm/recipes/machines/CentrifugeLoader.java +++ b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/machines/CentrifugeLoader.java @@ -1,4 +1,4 @@ -package gtexpert.integration.ffm.recipes.machines; +package com.github.gtexpert.core.integration.ffm.recipes.machines; import static gregtech.api.unification.ore.OrePrefix.*; @@ -11,7 +11,7 @@ import gregtech.api.unification.OreDictUnifier; import gregtech.api.unification.material.Materials; -import gtexpert.api.util.Mods; +import com.github.gtexpert.core.api.util.Mods; import forestry.factory.MachineUIDs; import forestry.factory.ModuleFactory; diff --git a/src/main/java/gtexpert/integration/ffm/recipes/machines/FabricatorLoader.java b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/machines/FabricatorLoader.java similarity index 94% rename from src/main/java/gtexpert/integration/ffm/recipes/machines/FabricatorLoader.java rename to src/main/java/com/github/gtexpert/core/integration/ffm/recipes/machines/FabricatorLoader.java index 34aeb30d..8308c208 100644 --- a/src/main/java/gtexpert/integration/ffm/recipes/machines/FabricatorLoader.java +++ b/src/main/java/com/github/gtexpert/core/integration/ffm/recipes/machines/FabricatorLoader.java @@ -1,4 +1,4 @@ -package gtexpert.integration.ffm.recipes.machines; +package com.github.gtexpert.core.integration.ffm.recipes.machines; import java.util.ArrayList; import java.util.Collections; @@ -10,8 +10,8 @@ import gregtech.api.unification.material.Materials; import gregtech.api.util.GTUtility; -import gtexpert.api.util.Mods; -import gtexpert.integration.ffm.FFMUtility; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.ffm.FFMUtility; import binnie.extratrees.wood.EnumETLog; import forestry.api.arboriculture.*; diff --git a/src/main/java/gtexpert/integration/gendustry/GendustryConfigHolder.java b/src/main/java/com/github/gtexpert/core/integration/gendustry/GendustryConfigHolder.java similarity index 66% rename from src/main/java/gtexpert/integration/gendustry/GendustryConfigHolder.java rename to src/main/java/com/github/gtexpert/core/integration/gendustry/GendustryConfigHolder.java index 4380df04..b2375add 100644 --- a/src/main/java/gtexpert/integration/gendustry/GendustryConfigHolder.java +++ b/src/main/java/com/github/gtexpert/core/integration/gendustry/GendustryConfigHolder.java @@ -1,9 +1,9 @@ -package gtexpert.integration.gendustry; +package com.github.gtexpert.core.integration.gendustry; import net.minecraftforge.common.config.Config; -import gtexpert.api.GTEValues; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.modules.GTEModules; @Config.LangKey(GTEValues.MODID + ".config.integration.gendustry") @Config(modid = GTEValues.MODID, diff --git a/src/main/java/gtexpert/integration/gendustry/GendustryModule.java b/src/main/java/com/github/gtexpert/core/integration/gendustry/GendustryModule.java similarity index 57% rename from src/main/java/gtexpert/integration/gendustry/GendustryModule.java rename to src/main/java/com/github/gtexpert/core/integration/gendustry/GendustryModule.java index eb7003c3..7b3ad1a1 100644 --- a/src/main/java/gtexpert/integration/gendustry/GendustryModule.java +++ b/src/main/java/com/github/gtexpert/core/integration/gendustry/GendustryModule.java @@ -1,17 +1,17 @@ -package gtexpert.integration.gendustry; +package com.github.gtexpert.core.integration.gendustry; import net.minecraft.block.Block; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; -import gtexpert.api.GTEValues; -import gtexpert.api.modules.GTEModule; -import gtexpert.api.util.Mods; -import gtexpert.integration.GTEIntegrationSubmodule; -import gtexpert.integration.gendustry.metatileentities.GendustryMetaTileEntities; -import gtexpert.integration.gendustry.recipes.GendustryBlocksRecipe; -import gtexpert.integration.gendustry.recipes.GendustryItemsRecipe; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.modules.GTEModule; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.GTEIntegrationSubmodule; +import com.github.gtexpert.core.integration.gendustry.metatileentities.GendustryMetaTileEntities; +import com.github.gtexpert.core.integration.gendustry.recipes.GendustryBlocksRecipe; +import com.github.gtexpert.core.integration.gendustry.recipes.GendustryItemsRecipe; +import com.github.gtexpert.core.modules.GTEModules; @GTEModule( moduleID = GTEModules.MODULE_GENDUSTRY, diff --git a/src/main/java/gtexpert/integration/gendustry/GendustryRecipeMaps.java b/src/main/java/com/github/gtexpert/core/integration/gendustry/GendustryRecipeMaps.java similarity index 70% rename from src/main/java/gtexpert/integration/gendustry/GendustryRecipeMaps.java rename to src/main/java/com/github/gtexpert/core/integration/gendustry/GendustryRecipeMaps.java index d28f3861..88fa2b0c 100644 --- a/src/main/java/gtexpert/integration/gendustry/GendustryRecipeMaps.java +++ b/src/main/java/com/github/gtexpert/core/integration/gendustry/GendustryRecipeMaps.java @@ -1,10 +1,10 @@ -package gtexpert.integration.gendustry; +package com.github.gtexpert.core.integration.gendustry; import gregtech.api.recipes.RecipeMap; import gregtech.core.sound.GTSoundEvents; -import gtexpert.integration.gendustry.recipes.builders.IndustrialApiaryRecipeBuilder; -import gtexpert.integration.gendustry.recipes.machines.RecipeMapIndustrialApiary; +import com.github.gtexpert.core.integration.gendustry.recipes.builders.IndustrialApiaryRecipeBuilder; +import com.github.gtexpert.core.integration.gendustry.recipes.machines.RecipeMapIndustrialApiary; import crafttweaker.annotations.ZenRegister; import stanhebben.zenscript.annotations.ZenExpansion; diff --git a/src/main/java/gtexpert/integration/gendustry/metatileentities/GendustryMetaTileEntities.java b/src/main/java/com/github/gtexpert/core/integration/gendustry/metatileentities/GendustryMetaTileEntities.java similarity index 73% rename from src/main/java/gtexpert/integration/gendustry/metatileentities/GendustryMetaTileEntities.java rename to src/main/java/com/github/gtexpert/core/integration/gendustry/metatileentities/GendustryMetaTileEntities.java index 91ac902e..3004dfc6 100644 --- a/src/main/java/gtexpert/integration/gendustry/metatileentities/GendustryMetaTileEntities.java +++ b/src/main/java/com/github/gtexpert/core/integration/gendustry/metatileentities/GendustryMetaTileEntities.java @@ -1,12 +1,12 @@ -package gtexpert.integration.gendustry.metatileentities; +package com.github.gtexpert.core.integration.gendustry.metatileentities; +import static com.github.gtexpert.core.api.util.GTEUtility.gteId; import static gregtech.api.GTValues.V; import static gregtech.common.metatileentities.MetaTileEntities.registerMetaTileEntities; -import static gtexpert.api.util.GTEUtility.gteId; -import gtexpert.client.GTETextures; -import gtexpert.common.GTEConfigHolder; -import gtexpert.integration.gendustry.GendustryRecipeMaps; +import com.github.gtexpert.core.client.GTETextures; +import com.github.gtexpert.core.common.GTEConfigHolder; +import com.github.gtexpert.core.integration.gendustry.GendustryRecipeMaps; public class GendustryMetaTileEntities { diff --git a/src/main/java/gtexpert/integration/gendustry/metatileentities/IndustrialApiaryLogic.java b/src/main/java/com/github/gtexpert/core/integration/gendustry/metatileentities/IndustrialApiaryLogic.java similarity index 88% rename from src/main/java/gtexpert/integration/gendustry/metatileentities/IndustrialApiaryLogic.java rename to src/main/java/com/github/gtexpert/core/integration/gendustry/metatileentities/IndustrialApiaryLogic.java index c5cf411b..71104052 100644 --- a/src/main/java/gtexpert/integration/gendustry/metatileentities/IndustrialApiaryLogic.java +++ b/src/main/java/com/github/gtexpert/core/integration/gendustry/metatileentities/IndustrialApiaryLogic.java @@ -1,4 +1,4 @@ -package gtexpert.integration.gendustry.metatileentities; +package com.github.gtexpert.core.integration.gendustry.metatileentities; import java.util.function.Supplier; diff --git a/src/main/java/gtexpert/integration/gendustry/metatileentities/MetaTileEntityIndustrialApiary.java b/src/main/java/com/github/gtexpert/core/integration/gendustry/metatileentities/MetaTileEntityIndustrialApiary.java similarity index 87% rename from src/main/java/gtexpert/integration/gendustry/metatileentities/MetaTileEntityIndustrialApiary.java rename to src/main/java/com/github/gtexpert/core/integration/gendustry/metatileentities/MetaTileEntityIndustrialApiary.java index 0133a6c7..e7a4944a 100644 --- a/src/main/java/gtexpert/integration/gendustry/metatileentities/MetaTileEntityIndustrialApiary.java +++ b/src/main/java/com/github/gtexpert/core/integration/gendustry/metatileentities/MetaTileEntityIndustrialApiary.java @@ -1,4 +1,4 @@ -package gtexpert.integration.gendustry.metatileentities; +package com.github.gtexpert.core.integration.gendustry.metatileentities; import java.util.function.Function; @@ -9,7 +9,7 @@ import gregtech.api.recipes.RecipeMap; import gregtech.client.renderer.ICubeRenderer; -import gtexpert.common.metatileentities.GTESimpleMachineMetaTileEntity; +import com.github.gtexpert.core.common.metatileentities.GTESimpleMachineMetaTileEntity; public class MetaTileEntityIndustrialApiary extends GTESimpleMachineMetaTileEntity { diff --git a/src/main/java/gtexpert/integration/gendustry/recipes/GendustryBlocksRecipe.java b/src/main/java/com/github/gtexpert/core/integration/gendustry/recipes/GendustryBlocksRecipe.java similarity index 53% rename from src/main/java/gtexpert/integration/gendustry/recipes/GendustryBlocksRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/gendustry/recipes/GendustryBlocksRecipe.java index 1209f666..39521c41 100644 --- a/src/main/java/gtexpert/integration/gendustry/recipes/GendustryBlocksRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/gendustry/recipes/GendustryBlocksRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.gendustry.recipes; +package com.github.gtexpert.core.integration.gendustry.recipes; public class GendustryBlocksRecipe { diff --git a/src/main/java/gtexpert/integration/gendustry/recipes/GendustryItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/gendustry/recipes/GendustryItemsRecipe.java similarity index 53% rename from src/main/java/gtexpert/integration/gendustry/recipes/GendustryItemsRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/gendustry/recipes/GendustryItemsRecipe.java index 4d9550ef..ab0c124c 100644 --- a/src/main/java/gtexpert/integration/gendustry/recipes/GendustryItemsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/gendustry/recipes/GendustryItemsRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.gendustry.recipes; +package com.github.gtexpert.core.integration.gendustry.recipes; public class GendustryItemsRecipe { diff --git a/src/main/java/gtexpert/integration/gendustry/recipes/builders/IndustrialApiaryRecipeBuilder.java b/src/main/java/com/github/gtexpert/core/integration/gendustry/recipes/builders/IndustrialApiaryRecipeBuilder.java similarity index 92% rename from src/main/java/gtexpert/integration/gendustry/recipes/builders/IndustrialApiaryRecipeBuilder.java rename to src/main/java/com/github/gtexpert/core/integration/gendustry/recipes/builders/IndustrialApiaryRecipeBuilder.java index 76c3b0ff..64361200 100644 --- a/src/main/java/gtexpert/integration/gendustry/recipes/builders/IndustrialApiaryRecipeBuilder.java +++ b/src/main/java/com/github/gtexpert/core/integration/gendustry/recipes/builders/IndustrialApiaryRecipeBuilder.java @@ -1,4 +1,4 @@ -package gtexpert.integration.gendustry.recipes.builders; +package com.github.gtexpert.core.integration.gendustry.recipes.builders; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/gtexpert/integration/gendustry/recipes/machines/RecipeMapIndustrialApiary.java b/src/main/java/com/github/gtexpert/core/integration/gendustry/recipes/machines/RecipeMapIndustrialApiary.java similarity index 87% rename from src/main/java/gtexpert/integration/gendustry/recipes/machines/RecipeMapIndustrialApiary.java rename to src/main/java/com/github/gtexpert/core/integration/gendustry/recipes/machines/RecipeMapIndustrialApiary.java index 7d060dd6..e52e11d2 100644 --- a/src/main/java/gtexpert/integration/gendustry/recipes/machines/RecipeMapIndustrialApiary.java +++ b/src/main/java/com/github/gtexpert/core/integration/gendustry/recipes/machines/RecipeMapIndustrialApiary.java @@ -1,4 +1,4 @@ -package gtexpert.integration.gendustry.recipes.machines; +package com.github.gtexpert.core.integration.gendustry.recipes.machines; import gregtech.api.recipes.RecipeBuilder; import gregtech.api.recipes.RecipeMap; diff --git a/src/main/java/gtexpert/integration/gtfo/GTFOModule.java b/src/main/java/com/github/gtexpert/core/integration/gtfo/GTFOModule.java similarity index 56% rename from src/main/java/gtexpert/integration/gtfo/GTFOModule.java rename to src/main/java/com/github/gtexpert/core/integration/gtfo/GTFOModule.java index b8156c47..aff9d7ad 100644 --- a/src/main/java/gtexpert/integration/gtfo/GTFOModule.java +++ b/src/main/java/com/github/gtexpert/core/integration/gtfo/GTFOModule.java @@ -1,15 +1,15 @@ -package gtexpert.integration.gtfo; +package com.github.gtexpert.core.integration.gtfo; import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.event.RegistryEvent; -import gtexpert.api.GTEValues; -import gtexpert.api.modules.GTEModule; -import gtexpert.api.util.Mods; -import gtexpert.integration.GTEIntegrationSubmodule; -import gtexpert.integration.gtfo.recipes.GTFOChemicalRecipe; -import gtexpert.integration.gtfo.recipes.GTFOItemsRecipe; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.modules.GTEModule; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.GTEIntegrationSubmodule; +import com.github.gtexpert.core.integration.gtfo.recipes.GTFOChemicalRecipe; +import com.github.gtexpert.core.integration.gtfo.recipes.GTFOItemsRecipe; +import com.github.gtexpert.core.modules.GTEModules; @GTEModule( moduleID = GTEModules.MODULE_GTFO, diff --git a/src/main/java/gtexpert/integration/gtfo/recipes/GTFOChemicalRecipe.java b/src/main/java/com/github/gtexpert/core/integration/gtfo/recipes/GTFOChemicalRecipe.java similarity index 95% rename from src/main/java/gtexpert/integration/gtfo/recipes/GTFOChemicalRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/gtfo/recipes/GTFOChemicalRecipe.java index 87f65d30..f20dd74e 100644 --- a/src/main/java/gtexpert/integration/gtfo/recipes/GTFOChemicalRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/gtfo/recipes/GTFOChemicalRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.gtfo.recipes; +package com.github.gtexpert.core.integration.gtfo.recipes; import static gregtech.api.GTValues.*; import static gregtech.api.unification.ore.OrePrefix.dust; diff --git a/src/main/java/gtexpert/integration/gtfo/recipes/GTFOItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/gtfo/recipes/GTFOItemsRecipe.java similarity index 90% rename from src/main/java/gtexpert/integration/gtfo/recipes/GTFOItemsRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/gtfo/recipes/GTFOItemsRecipe.java index 7c74d4a8..0a62eda7 100644 --- a/src/main/java/gtexpert/integration/gtfo/recipes/GTFOItemsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/gtfo/recipes/GTFOItemsRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.gtfo.recipes; +package com.github.gtexpert.core.integration.gtfo.recipes; import net.minecraft.init.Items; @@ -6,7 +6,7 @@ import gregtech.api.recipes.RecipeMaps; import gregtech.api.unification.material.Materials; -import gtexpert.api.util.Mods; +import com.github.gtexpert.core.api.util.Mods; public class GTFOItemsRecipe { diff --git a/src/main/java/gtexpert/integration/nae2/NAE2ConfigHolder.java b/src/main/java/com/github/gtexpert/core/integration/nae2/NAE2ConfigHolder.java similarity index 79% rename from src/main/java/gtexpert/integration/nae2/NAE2ConfigHolder.java rename to src/main/java/com/github/gtexpert/core/integration/nae2/NAE2ConfigHolder.java index ca147f64..8ae9bf6f 100644 --- a/src/main/java/gtexpert/integration/nae2/NAE2ConfigHolder.java +++ b/src/main/java/com/github/gtexpert/core/integration/nae2/NAE2ConfigHolder.java @@ -1,10 +1,10 @@ -package gtexpert.integration.nae2; +package com.github.gtexpert.core.integration.nae2; import net.minecraftforge.common.config.Config; import net.minecraftforge.common.config.Config.LangKey; -import gtexpert.api.GTEValues; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.modules.GTEModules; @LangKey(GTEValues.MODID + ".config.integration.nae2") @Config(modid = GTEValues.MODID, diff --git a/src/main/java/gtexpert/integration/nae2/NAE2Module.java b/src/main/java/com/github/gtexpert/core/integration/nae2/NAE2Module.java similarity index 56% rename from src/main/java/gtexpert/integration/nae2/NAE2Module.java rename to src/main/java/com/github/gtexpert/core/integration/nae2/NAE2Module.java index 7bf308de..09dbcb9a 100644 --- a/src/main/java/gtexpert/integration/nae2/NAE2Module.java +++ b/src/main/java/com/github/gtexpert/core/integration/nae2/NAE2Module.java @@ -1,15 +1,15 @@ -package gtexpert.integration.nae2; +package com.github.gtexpert.core.integration.nae2; import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.event.RegistryEvent; -import gtexpert.api.GTEValues; -import gtexpert.api.modules.GTEModule; -import gtexpert.api.util.Mods; -import gtexpert.integration.GTEIntegrationSubmodule; -import gtexpert.integration.nae2.recipes.NAE2BlocksRecipe; -import gtexpert.integration.nae2.recipes.NAE2ItemsRecipe; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.modules.GTEModule; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.GTEIntegrationSubmodule; +import com.github.gtexpert.core.integration.nae2.recipes.NAE2BlocksRecipe; +import com.github.gtexpert.core.integration.nae2.recipes.NAE2ItemsRecipe; +import com.github.gtexpert.core.modules.GTEModules; @GTEModule( moduleID = GTEModules.MODULE_NAE2, diff --git a/src/main/java/gtexpert/integration/nae2/recipes/NAE2BlocksRecipe.java b/src/main/java/com/github/gtexpert/core/integration/nae2/recipes/NAE2BlocksRecipe.java similarity index 96% rename from src/main/java/gtexpert/integration/nae2/recipes/NAE2BlocksRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/nae2/recipes/NAE2BlocksRecipe.java index 1014ffd3..12be6052 100644 --- a/src/main/java/gtexpert/integration/nae2/recipes/NAE2BlocksRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/nae2/recipes/NAE2BlocksRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.nae2.recipes; +package com.github.gtexpert.core.integration.nae2.recipes; import static gregtech.api.GTValues.ULV; import static gregtech.api.GTValues.VA; @@ -6,8 +6,8 @@ import gregtech.api.recipes.ModHandler; import gregtech.api.recipes.RecipeMaps; -import gtexpert.api.util.Mods; -import gtexpert.integration.nae2.NAE2ConfigHolder; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.nae2.NAE2ConfigHolder; public class NAE2BlocksRecipe { diff --git a/src/main/java/gtexpert/integration/nae2/recipes/NAE2ItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/nae2/recipes/NAE2ItemsRecipe.java similarity index 95% rename from src/main/java/gtexpert/integration/nae2/recipes/NAE2ItemsRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/nae2/recipes/NAE2ItemsRecipe.java index f57c275e..aef5d907 100644 --- a/src/main/java/gtexpert/integration/nae2/recipes/NAE2ItemsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/nae2/recipes/NAE2ItemsRecipe.java @@ -1,12 +1,12 @@ -package gtexpert.integration.nae2.recipes; +package com.github.gtexpert.core.integration.nae2.recipes; import static gregtech.api.GTValues.ULV; import static gregtech.api.GTValues.VA; import gregtech.api.recipes.RecipeMaps; -import gtexpert.api.util.Mods; -import gtexpert.integration.nae2.NAE2ConfigHolder; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.nae2.NAE2ConfigHolder; public class NAE2ItemsRecipe { diff --git a/src/main/java/gtexpert/integration/tc/TCConfigHolder.java b/src/main/java/com/github/gtexpert/core/integration/tc/TCConfigHolder.java similarity index 76% rename from src/main/java/gtexpert/integration/tc/TCConfigHolder.java rename to src/main/java/com/github/gtexpert/core/integration/tc/TCConfigHolder.java index f6bb40eb..3a8ddbd5 100644 --- a/src/main/java/gtexpert/integration/tc/TCConfigHolder.java +++ b/src/main/java/com/github/gtexpert/core/integration/tc/TCConfigHolder.java @@ -1,9 +1,9 @@ -package gtexpert.integration.tc; +package com.github.gtexpert.core.integration.tc; import net.minecraftforge.common.config.Config; -import gtexpert.api.GTEValues; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.modules.GTEModules; @Config.LangKey(GTEValues.MODID + ".config.integration.tc") @Config(modid = GTEValues.MODID, diff --git a/src/main/java/gtexpert/integration/tc/TCModule.java b/src/main/java/com/github/gtexpert/core/integration/tc/TCModule.java similarity index 54% rename from src/main/java/gtexpert/integration/tc/TCModule.java rename to src/main/java/com/github/gtexpert/core/integration/tc/TCModule.java index 29bf1aa7..a8bd8c26 100644 --- a/src/main/java/gtexpert/integration/tc/TCModule.java +++ b/src/main/java/com/github/gtexpert/core/integration/tc/TCModule.java @@ -1,18 +1,18 @@ -package gtexpert.integration.tc; +package com.github.gtexpert.core.integration.tc; import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.event.RegistryEvent; -import gtexpert.api.GTEValues; -import gtexpert.api.modules.GTEModule; -import gtexpert.api.util.Mods; -import gtexpert.integration.GTEIntegrationSubmodule; -import gtexpert.integration.tc.loaders.TCOreDictionaryLoader; -import gtexpert.integration.tc.recipes.TCBlocksRecipe; -import gtexpert.integration.tc.recipes.TCItemsRecipe; -import gtexpert.integration.tc.recipes.TCMaterialsRecipe; -import gtexpert.integration.tc.recipes.TCToolsRecipe; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.modules.GTEModule; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.GTEIntegrationSubmodule; +import com.github.gtexpert.core.integration.tc.loaders.TCOreDictionaryLoader; +import com.github.gtexpert.core.integration.tc.recipes.TCBlocksRecipe; +import com.github.gtexpert.core.integration.tc.recipes.TCItemsRecipe; +import com.github.gtexpert.core.integration.tc.recipes.TCMaterialsRecipe; +import com.github.gtexpert.core.integration.tc.recipes.TCToolsRecipe; +import com.github.gtexpert.core.modules.GTEModules; @GTEModule( moduleID = GTEModules.MODULE_TC, diff --git a/src/main/java/gtexpert/integration/tc/loaders/TCOreDictionaryLoader.java b/src/main/java/com/github/gtexpert/core/integration/tc/loaders/TCOreDictionaryLoader.java similarity index 56% rename from src/main/java/gtexpert/integration/tc/loaders/TCOreDictionaryLoader.java rename to src/main/java/com/github/gtexpert/core/integration/tc/loaders/TCOreDictionaryLoader.java index 5c5453f9..921eb137 100644 --- a/src/main/java/gtexpert/integration/tc/loaders/TCOreDictionaryLoader.java +++ b/src/main/java/com/github/gtexpert/core/integration/tc/loaders/TCOreDictionaryLoader.java @@ -1,4 +1,4 @@ -package gtexpert.integration.tc.loaders; +package com.github.gtexpert.core.integration.tc.loaders; public class TCOreDictionaryLoader { diff --git a/src/main/java/gtexpert/integration/tc/recipes/TCBlocksRecipe.java b/src/main/java/com/github/gtexpert/core/integration/tc/recipes/TCBlocksRecipe.java similarity index 54% rename from src/main/java/gtexpert/integration/tc/recipes/TCBlocksRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/tc/recipes/TCBlocksRecipe.java index 2cd5f4ad..ddcb4955 100644 --- a/src/main/java/gtexpert/integration/tc/recipes/TCBlocksRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/tc/recipes/TCBlocksRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.tc.recipes; +package com.github.gtexpert.core.integration.tc.recipes; public class TCBlocksRecipe { diff --git a/src/main/java/gtexpert/integration/tc/recipes/TCItemsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/tc/recipes/TCItemsRecipe.java similarity index 53% rename from src/main/java/gtexpert/integration/tc/recipes/TCItemsRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/tc/recipes/TCItemsRecipe.java index 458d51b2..4190da0e 100644 --- a/src/main/java/gtexpert/integration/tc/recipes/TCItemsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/tc/recipes/TCItemsRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.tc.recipes; +package com.github.gtexpert.core.integration.tc.recipes; public class TCItemsRecipe { diff --git a/src/main/java/gtexpert/integration/tc/recipes/TCMaterialsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/tc/recipes/TCMaterialsRecipe.java similarity index 95% rename from src/main/java/gtexpert/integration/tc/recipes/TCMaterialsRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/tc/recipes/TCMaterialsRecipe.java index b9f834f2..1f2b229c 100644 --- a/src/main/java/gtexpert/integration/tc/recipes/TCMaterialsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/tc/recipes/TCMaterialsRecipe.java @@ -1,9 +1,9 @@ -package gtexpert.integration.tc.recipes; +package com.github.gtexpert.core.integration.tc.recipes; import gregtech.api.recipes.ModHandler; import gregtech.common.ConfigHolder; -import gtexpert.api.util.Mods; +import com.github.gtexpert.core.api.util.Mods; public class TCMaterialsRecipe { diff --git a/src/main/java/gtexpert/integration/tc/recipes/TCToolsRecipe.java b/src/main/java/com/github/gtexpert/core/integration/tc/recipes/TCToolsRecipe.java similarity index 97% rename from src/main/java/gtexpert/integration/tc/recipes/TCToolsRecipe.java rename to src/main/java/com/github/gtexpert/core/integration/tc/recipes/TCToolsRecipe.java index a88f64d4..e04a9d56 100644 --- a/src/main/java/gtexpert/integration/tc/recipes/TCToolsRecipe.java +++ b/src/main/java/com/github/gtexpert/core/integration/tc/recipes/TCToolsRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.integration.tc.recipes; +package com.github.gtexpert.core.integration.tc.recipes; import static gregtech.api.unification.ore.OrePrefix.*; @@ -7,9 +7,9 @@ import gregtech.api.unification.material.Materials; import gregtech.common.ConfigHolder; -import gtexpert.api.unification.material.GTEMaterials; -import gtexpert.api.util.Mods; -import gtexpert.integration.tc.TCConfigHolder; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.tc.TCConfigHolder; public class TCToolsRecipe { diff --git a/src/main/java/gtexpert/integration/te/TEConfigHolder.java b/src/main/java/com/github/gtexpert/core/integration/te/TEConfigHolder.java similarity index 66% rename from src/main/java/gtexpert/integration/te/TEConfigHolder.java rename to src/main/java/com/github/gtexpert/core/integration/te/TEConfigHolder.java index 13879d60..133fcaf7 100644 --- a/src/main/java/gtexpert/integration/te/TEConfigHolder.java +++ b/src/main/java/com/github/gtexpert/core/integration/te/TEConfigHolder.java @@ -1,9 +1,9 @@ -package gtexpert.integration.te; +package com.github.gtexpert.core.integration.te; import net.minecraftforge.common.config.Config; -import gtexpert.api.GTEValues; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.modules.GTEModules; @Config.LangKey(GTEValues.MODID + ".config.integration.te") @Config(modid = GTEValues.MODID, diff --git a/src/main/java/gtexpert/integration/te/TEModule.java b/src/main/java/com/github/gtexpert/core/integration/te/TEModule.java similarity index 62% rename from src/main/java/gtexpert/integration/te/TEModule.java rename to src/main/java/com/github/gtexpert/core/integration/te/TEModule.java index 583a0e29..86131483 100644 --- a/src/main/java/gtexpert/integration/te/TEModule.java +++ b/src/main/java/com/github/gtexpert/core/integration/te/TEModule.java @@ -1,13 +1,13 @@ -package gtexpert.integration.te; +package com.github.gtexpert.core.integration.te; import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.event.RegistryEvent; -import gtexpert.api.GTEValues; -import gtexpert.api.modules.GTEModule; -import gtexpert.api.util.Mods; -import gtexpert.integration.GTEIntegrationSubmodule; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.modules.GTEModule; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.GTEIntegrationSubmodule; +import com.github.gtexpert.core.modules.GTEModules; @GTEModule( moduleID = GTEModules.MODULE_TE, diff --git a/src/main/java/gtexpert/integration/theoneprobe/TheOneProbeModule.java b/src/main/java/com/github/gtexpert/core/integration/theoneprobe/TheOneProbeModule.java similarity index 70% rename from src/main/java/gtexpert/integration/theoneprobe/TheOneProbeModule.java rename to src/main/java/com/github/gtexpert/core/integration/theoneprobe/TheOneProbeModule.java index 4eb96343..c328d89a 100644 --- a/src/main/java/gtexpert/integration/theoneprobe/TheOneProbeModule.java +++ b/src/main/java/com/github/gtexpert/core/integration/theoneprobe/TheOneProbeModule.java @@ -1,4 +1,4 @@ -package gtexpert.integration.theoneprobe; +package com.github.gtexpert.core.integration.theoneprobe; import java.util.List; @@ -8,12 +8,12 @@ import com.google.common.collect.ImmutableList; -import gtexpert.api.GTEValues; -import gtexpert.api.modules.GTEModule; -import gtexpert.api.util.Mods; -import gtexpert.integration.GTEIntegrationSubmodule; -import gtexpert.integration.theoneprobe.provider.ElectricSpawnerInfoProvider; -import gtexpert.modules.GTEModules; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.modules.GTEModule; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.integration.GTEIntegrationSubmodule; +import com.github.gtexpert.core.integration.theoneprobe.provider.ElectricSpawnerInfoProvider; +import com.github.gtexpert.core.modules.GTEModules; import mcjty.theoneprobe.TheOneProbe; import mcjty.theoneprobe.api.ITheOneProbe; diff --git a/src/main/java/gtexpert/integration/theoneprobe/provider/ElectricSpawnerInfoProvider.java b/src/main/java/com/github/gtexpert/core/integration/theoneprobe/provider/ElectricSpawnerInfoProvider.java similarity index 86% rename from src/main/java/gtexpert/integration/theoneprobe/provider/ElectricSpawnerInfoProvider.java rename to src/main/java/com/github/gtexpert/core/integration/theoneprobe/provider/ElectricSpawnerInfoProvider.java index 76f02f57..8ab94f1c 100644 --- a/src/main/java/gtexpert/integration/theoneprobe/provider/ElectricSpawnerInfoProvider.java +++ b/src/main/java/com/github/gtexpert/core/integration/theoneprobe/provider/ElectricSpawnerInfoProvider.java @@ -1,4 +1,4 @@ -package gtexpert.integration.theoneprobe.provider; +package com.github.gtexpert.core.integration.theoneprobe.provider; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -10,8 +10,8 @@ import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.MetaTileEntityHolder; -import gtexpert.api.GTEValues; -import gtexpert.integration.eio.metatileentities.MetaTileEntityElectricSpawner; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.integration.eio.metatileentities.MetaTileEntityElectricSpawner; import mcjty.theoneprobe.api.*; diff --git a/src/main/java/gtexpert/loaders/GTEOreDictionaryLoader.java b/src/main/java/com/github/gtexpert/core/loaders/GTEOreDictionaryLoader.java similarity index 79% rename from src/main/java/gtexpert/loaders/GTEOreDictionaryLoader.java rename to src/main/java/com/github/gtexpert/core/loaders/GTEOreDictionaryLoader.java index 24b9ea6d..d195b3ec 100644 --- a/src/main/java/gtexpert/loaders/GTEOreDictionaryLoader.java +++ b/src/main/java/com/github/gtexpert/core/loaders/GTEOreDictionaryLoader.java @@ -1,10 +1,10 @@ -package gtexpert.loaders; +package com.github.gtexpert.core.loaders; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; -import gtexpert.common.items.GTEMetaItems; +import com.github.gtexpert.core.common.items.GTEMetaItems; public class GTEOreDictionaryLoader { diff --git a/src/main/java/gtexpert/loaders/recipe/CEUOverrideRecipe.java b/src/main/java/com/github/gtexpert/core/loaders/recipe/CEUOverrideRecipe.java similarity index 99% rename from src/main/java/gtexpert/loaders/recipe/CEUOverrideRecipe.java rename to src/main/java/com/github/gtexpert/core/loaders/recipe/CEUOverrideRecipe.java index e51ed2a4..c6f087f8 100644 --- a/src/main/java/gtexpert/loaders/recipe/CEUOverrideRecipe.java +++ b/src/main/java/com/github/gtexpert/core/loaders/recipe/CEUOverrideRecipe.java @@ -1,4 +1,4 @@ -package gtexpert.loaders.recipe; +package com.github.gtexpert.core.loaders.recipe; import static gregtech.api.GTValues.*; import static gregtech.api.unification.material.info.MaterialFlags.*; @@ -38,7 +38,7 @@ import gregicality.multiblocks.api.fluids.GCYMFluidStorageKeys; import gregicality.multiblocks.api.unification.properties.GCYMPropertyKey; -import gtexpert.common.items.GTEMetaItems; +import com.github.gtexpert.core.common.items.GTEMetaItems; public class CEUOverrideRecipe { diff --git a/src/main/java/gtexpert/loaders/recipe/GTERecipe.java b/src/main/java/com/github/gtexpert/core/loaders/recipe/GTERecipe.java similarity index 98% rename from src/main/java/gtexpert/loaders/recipe/GTERecipe.java rename to src/main/java/com/github/gtexpert/core/loaders/recipe/GTERecipe.java index 7a1176dc..8c20a7fd 100644 --- a/src/main/java/gtexpert/loaders/recipe/GTERecipe.java +++ b/src/main/java/com/github/gtexpert/core/loaders/recipe/GTERecipe.java @@ -1,4 +1,4 @@ -package gtexpert.loaders.recipe; +package com.github.gtexpert.core.loaders.recipe; import static gregtech.api.GTValues.*; import static gregtech.api.unification.ore.OrePrefix.*; @@ -37,17 +37,17 @@ import gregicality.multiblocks.api.fluids.GCYMFluidStorageKeys; -import gtexpert.api.GTEValues; -import gtexpert.api.recipes.GTERecipeMaps; -import gtexpert.api.unification.material.GTEMaterials; -import gtexpert.api.util.GTELog; -import gtexpert.api.util.GTEUtility; -import gtexpert.api.util.Mods; -import gtexpert.common.GTEConfigHolder; -import gtexpert.common.blocks.GTEBlockMetalCasing; -import gtexpert.common.blocks.GTEMetaBlocks; -import gtexpert.common.items.GTEMetaItems; -import gtexpert.common.metatileentities.GTEMetaTileEntities; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.recipes.GTERecipeMaps; +import com.github.gtexpert.core.api.unification.material.GTEMaterials; +import com.github.gtexpert.core.api.util.GTELog; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.api.util.Mods; +import com.github.gtexpert.core.common.GTEConfigHolder; +import com.github.gtexpert.core.common.blocks.GTEBlockMetalCasing; +import com.github.gtexpert.core.common.blocks.GTEMetaBlocks; +import com.github.gtexpert.core.common.items.GTEMetaItems; +import com.github.gtexpert.core.common.metatileentities.GTEMetaTileEntities; public class GTERecipe { diff --git a/src/main/java/gtexpert/loaders/recipe/GTEVanillaOverrideRecipes.java b/src/main/java/com/github/gtexpert/core/loaders/recipe/GTEVanillaOverrideRecipes.java similarity index 94% rename from src/main/java/gtexpert/loaders/recipe/GTEVanillaOverrideRecipes.java rename to src/main/java/com/github/gtexpert/core/loaders/recipe/GTEVanillaOverrideRecipes.java index ab6e77cf..b4213488 100644 --- a/src/main/java/gtexpert/loaders/recipe/GTEVanillaOverrideRecipes.java +++ b/src/main/java/com/github/gtexpert/core/loaders/recipe/GTEVanillaOverrideRecipes.java @@ -1,9 +1,9 @@ -package gtexpert.loaders.recipe; +package com.github.gtexpert.core.loaders.recipe; +import static com.github.gtexpert.core.common.GTEConfigHolder.ceuOverride; import static gregtech.api.GTValues.MV; import static gregtech.api.GTValues.VA; import static gregtech.api.unification.ore.OrePrefix.*; -import static gtexpert.common.GTEConfigHolder.ceuOverride; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -15,7 +15,7 @@ import gregtech.api.recipes.category.RecipeCategories; import gregtech.api.unification.material.Materials; -import gtexpert.api.util.Mods; +import com.github.gtexpert.core.api.util.Mods; public class GTEVanillaOverrideRecipes { diff --git a/src/main/java/gtexpert/loaders/recipe/handlers/GTEImplosionNoBombRecipeHandler.java b/src/main/java/com/github/gtexpert/core/loaders/recipe/handlers/GTEImplosionNoBombRecipeHandler.java similarity index 95% rename from src/main/java/gtexpert/loaders/recipe/handlers/GTEImplosionNoBombRecipeHandler.java rename to src/main/java/com/github/gtexpert/core/loaders/recipe/handlers/GTEImplosionNoBombRecipeHandler.java index 8d7e898c..3c9ea81d 100644 --- a/src/main/java/gtexpert/loaders/recipe/handlers/GTEImplosionNoBombRecipeHandler.java +++ b/src/main/java/com/github/gtexpert/core/loaders/recipe/handlers/GTEImplosionNoBombRecipeHandler.java @@ -1,14 +1,14 @@ -package gtexpert.loaders.recipe.handlers; +package com.github.gtexpert.core.loaders.recipe.handlers; import static gregtech.api.unification.ore.OrePrefix.block; import net.minecraft.item.ItemStack; -import com.github.gtexpert.inb.api.recipes.INBRecipeMaps; - import gregtech.api.unification.material.Material; import gregtech.api.util.GTUtility; +import com.github.gtexpert.inb.api.recipes.INBRecipeMaps; + public class GTEImplosionNoBombRecipeHandler { public static void add(Material inputMaterial, Material outputMaterial) { diff --git a/src/main/java/gtexpert/loaders/recipe/handlers/GTEImplosionRecipeHandler.java b/src/main/java/com/github/gtexpert/core/loaders/recipe/handlers/GTEImplosionRecipeHandler.java similarity index 97% rename from src/main/java/gtexpert/loaders/recipe/handlers/GTEImplosionRecipeHandler.java rename to src/main/java/com/github/gtexpert/core/loaders/recipe/handlers/GTEImplosionRecipeHandler.java index 3fd75fac..db0bc82d 100644 --- a/src/main/java/gtexpert/loaders/recipe/handlers/GTEImplosionRecipeHandler.java +++ b/src/main/java/com/github/gtexpert/core/loaders/recipe/handlers/GTEImplosionRecipeHandler.java @@ -1,4 +1,4 @@ -package gtexpert.loaders.recipe.handlers; +package com.github.gtexpert.core.loaders.recipe.handlers; import static gregtech.api.unification.ore.OrePrefix.*; @@ -10,7 +10,7 @@ import gregtech.common.blocks.MetaBlocks; import gregtech.common.items.MetaItems; -import gtexpert.api.util.Mods; +import com.github.gtexpert.core.api.util.Mods; public class GTEImplosionRecipeHandler { diff --git a/src/main/java/gtexpert/mixins/GTEMixinLoader.java b/src/main/java/com/github/gtexpert/core/mixins/GTEMixinLoader.java similarity index 92% rename from src/main/java/gtexpert/mixins/GTEMixinLoader.java rename to src/main/java/com/github/gtexpert/core/mixins/GTEMixinLoader.java index 1b8d9892..36df49d3 100644 --- a/src/main/java/gtexpert/mixins/GTEMixinLoader.java +++ b/src/main/java/com/github/gtexpert/core/mixins/GTEMixinLoader.java @@ -1,4 +1,4 @@ -package gtexpert.mixins; +package com.github.gtexpert.core.mixins; import java.util.AbstractMap; import java.util.List; @@ -9,9 +9,9 @@ import net.minecraftforge.fml.common.Loader; -import gtexpert.api.GTEValues; -import gtexpert.api.util.GTELog; -import gtexpert.api.util.Mods; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.util.GTELog; +import com.github.gtexpert.core.api.util.Mods; import zone.rong.mixinbooter.ILateMixinLoader; diff --git a/src/main/java/gtexpert/mixins/draconicadditions/items/baubles/ShieldNecklaceMixin.java b/src/main/java/com/github/gtexpert/core/mixins/draconicadditions/items/baubles/ShieldNecklaceMixin.java similarity index 97% rename from src/main/java/gtexpert/mixins/draconicadditions/items/baubles/ShieldNecklaceMixin.java rename to src/main/java/com/github/gtexpert/core/mixins/draconicadditions/items/baubles/ShieldNecklaceMixin.java index 16183cff..e7345c9f 100644 --- a/src/main/java/gtexpert/mixins/draconicadditions/items/baubles/ShieldNecklaceMixin.java +++ b/src/main/java/com/github/gtexpert/core/mixins/draconicadditions/items/baubles/ShieldNecklaceMixin.java @@ -1,4 +1,4 @@ -package gtexpert.mixins.draconicadditions.items.baubles; +package com.github.gtexpert.core.mixins.draconicadditions.items.baubles; import net.foxmcloud.draconicadditions.items.baubles.BaubleStats; import net.foxmcloud.draconicadditions.items.baubles.ShieldNecklace; diff --git a/src/main/java/gtexpert/mixins/draconicadditions/items/tools/PortableWiredChargerMixin.java b/src/main/java/com/github/gtexpert/core/mixins/draconicadditions/items/tools/PortableWiredChargerMixin.java similarity index 91% rename from src/main/java/gtexpert/mixins/draconicadditions/items/tools/PortableWiredChargerMixin.java rename to src/main/java/com/github/gtexpert/core/mixins/draconicadditions/items/tools/PortableWiredChargerMixin.java index c8d2b673..c99b1685 100644 --- a/src/main/java/gtexpert/mixins/draconicadditions/items/tools/PortableWiredChargerMixin.java +++ b/src/main/java/com/github/gtexpert/core/mixins/draconicadditions/items/tools/PortableWiredChargerMixin.java @@ -1,4 +1,4 @@ -package gtexpert.mixins.draconicadditions.items.tools; +package com.github.gtexpert.core.mixins.draconicadditions.items.tools; import net.foxmcloud.draconicadditions.items.tools.PortableWiredCharger; import net.minecraft.item.ItemStack; diff --git a/src/main/java/gtexpert/mixins/draconicadditions/lib/DARecipesMixin.java b/src/main/java/com/github/gtexpert/core/mixins/draconicadditions/lib/DARecipesMixin.java similarity index 87% rename from src/main/java/gtexpert/mixins/draconicadditions/lib/DARecipesMixin.java rename to src/main/java/com/github/gtexpert/core/mixins/draconicadditions/lib/DARecipesMixin.java index 3c1328f0..cc682b03 100644 --- a/src/main/java/gtexpert/mixins/draconicadditions/lib/DARecipesMixin.java +++ b/src/main/java/com/github/gtexpert/core/mixins/draconicadditions/lib/DARecipesMixin.java @@ -1,4 +1,4 @@ -package gtexpert.mixins.draconicadditions.lib; +package com.github.gtexpert.core.mixins.draconicadditions.lib; import net.foxmcloud.draconicadditions.lib.DARecipes; diff --git a/src/main/java/gtexpert/mixins/gregtech/QuarkTechSuiteMixin.java b/src/main/java/com/github/gtexpert/core/mixins/gregtech/QuarkTechSuiteMixin.java similarity index 86% rename from src/main/java/gtexpert/mixins/gregtech/QuarkTechSuiteMixin.java rename to src/main/java/com/github/gtexpert/core/mixins/gregtech/QuarkTechSuiteMixin.java index 0bd8c2a5..ddf54d85 100644 --- a/src/main/java/gtexpert/mixins/gregtech/QuarkTechSuiteMixin.java +++ b/src/main/java/com/github/gtexpert/core/mixins/gregtech/QuarkTechSuiteMixin.java @@ -1,4 +1,4 @@ -package gtexpert.mixins.gregtech; +package com.github.gtexpert.core.mixins.gregtech; import net.minecraft.util.FoodStats; @@ -8,7 +8,7 @@ import gregtech.common.items.armor.QuarkTechSuite; -import gtexpert.common.GTEConfigHolder; +import com.github.gtexpert.core.common.GTEConfigHolder; @Mixin(value = QuarkTechSuite.class, remap = false) public class QuarkTechSuiteMixin { diff --git a/src/main/java/gtexpert/modules/BaseGTEModule.java b/src/main/java/com/github/gtexpert/core/modules/BaseGTEModule.java similarity index 71% rename from src/main/java/gtexpert/modules/BaseGTEModule.java rename to src/main/java/com/github/gtexpert/core/modules/BaseGTEModule.java index 6956ee43..c22d6bfb 100644 --- a/src/main/java/gtexpert/modules/BaseGTEModule.java +++ b/src/main/java/com/github/gtexpert/core/modules/BaseGTEModule.java @@ -1,4 +1,4 @@ -package gtexpert.modules; +package com.github.gtexpert.core.modules; import java.util.Collections; import java.util.Set; @@ -7,8 +7,8 @@ import org.jetbrains.annotations.NotNull; -import gtexpert.api.modules.IGTEModule; -import gtexpert.api.util.GTEUtility; +import com.github.gtexpert.core.api.modules.IGTEModule; +import com.github.gtexpert.core.api.util.GTEUtility; public abstract class BaseGTEModule implements IGTEModule { diff --git a/src/main/java/gtexpert/modules/GTEModuleManager.java b/src/main/java/com/github/gtexpert/core/modules/GTEModuleManager.java similarity index 99% rename from src/main/java/gtexpert/modules/GTEModuleManager.java rename to src/main/java/com/github/gtexpert/core/modules/GTEModuleManager.java index 035a4eba..d5814881 100644 --- a/src/main/java/gtexpert/modules/GTEModuleManager.java +++ b/src/main/java/com/github/gtexpert/core/modules/GTEModuleManager.java @@ -1,4 +1,4 @@ -package gtexpert.modules; +package com.github.gtexpert.core.modules; import java.io.File; import java.util.*; @@ -22,8 +22,8 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; -import gtexpert.api.GTEValues; -import gtexpert.api.modules.*; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.modules.*; public class GTEModuleManager implements IModuleManager { diff --git a/src/main/java/gtexpert/modules/GTEModules.java b/src/main/java/com/github/gtexpert/core/modules/GTEModules.java similarity index 92% rename from src/main/java/gtexpert/modules/GTEModules.java rename to src/main/java/com/github/gtexpert/core/modules/GTEModules.java index 99422742..2671bf16 100644 --- a/src/main/java/gtexpert/modules/GTEModules.java +++ b/src/main/java/com/github/gtexpert/core/modules/GTEModules.java @@ -1,7 +1,7 @@ -package gtexpert.modules; +package com.github.gtexpert.core.modules; -import gtexpert.api.GTEValues; -import gtexpert.api.modules.IModuleContainer; +import com.github.gtexpert.core.api.GTEValues; +import com.github.gtexpert.core.api.modules.IModuleContainer; public class GTEModules implements IModuleContainer { diff --git a/src/main/resources/mixins.gtexpert.draconicadditions.json b/src/main/resources/mixins.gtexpert.draconicadditions.json index 7914c47b..f305c9f6 100644 --- a/src/main/resources/mixins.gtexpert.draconicadditions.json +++ b/src/main/resources/mixins.gtexpert.draconicadditions.json @@ -1,5 +1,5 @@ { - "package": "gtexpert.mixins.draconicadditions", + "package": "com.github.gtexpert.core.mixins.draconicadditions", "refmap": "mixins.gtexpert.refmap.json", "target": "@env(DEFAULT)", "minVersion": "0.8", diff --git a/src/main/resources/mixins.gtexpert.gregtech.json b/src/main/resources/mixins.gtexpert.gregtech.json index 23329464..8b2955bc 100644 --- a/src/main/resources/mixins.gtexpert.gregtech.json +++ b/src/main/resources/mixins.gtexpert.gregtech.json @@ -1,5 +1,5 @@ { - "package": "gtexpert.mixins.gregtech", + "package": "com.github.gtexpert.core.mixins.gregtech", "refmap": "mixins.gtexpert.refmap.json", "target": "@env(DEFAULT)", "minVersion": "0.8", diff --git a/src/test/java/gtexpert/.gitkeep b/src/test/java/com/github/gtexpert/core/.gitkeep similarity index 100% rename from src/test/java/gtexpert/.gitkeep rename to src/test/java/com/github/gtexpert/core/.gitkeep diff --git a/src/test/java/gtexpert/GTETest.java b/src/test/java/com/github/gtexpert/core/GTETest.java similarity index 78% rename from src/test/java/gtexpert/GTETest.java rename to src/test/java/com/github/gtexpert/core/GTETest.java index 56f2ea8c..3150c8b4 100644 --- a/src/test/java/gtexpert/GTETest.java +++ b/src/test/java/com/github/gtexpert/core/GTETest.java @@ -1,4 +1,4 @@ -package gtexpert; +package com.github.gtexpert.core; import org.junit.jupiter.api.BeforeAll;