From 1b820de08a05070909a267e17f033fcf58ac8710 Mon Sep 17 00:00:00 2001 From: NotAPenguin Date: Mon, 2 Sep 2024 23:17:17 +0200 Subject: The Great Renaming (#3014) * move kekztech to a single root dir * move detrav to a single root dir * move gtnh-lanthanides to a single root dir * move tectech and delete some gross reflection in gt++ * remove more reflection inside gt5u * delete more reflection in gt++ * fix imports * move bartworks and bwcrossmod * fix proxies * move galactigreg and ggfab * move gtneioreplugin * try to fix gt++ bee loader * apply the rename rules to BW * apply rename rules to bwcrossmod * apply rename rules to detrav scanner mod * apply rename rules to galacticgreg * apply rename rules to ggfab * apply rename rules to goodgenerator * apply rename rules to gtnh-lanthanides * apply rename rules to gt++ * apply rename rules to kekztech * apply rename rules to kubatech * apply rename rules to tectech * apply rename rules to gt apply the rename rules to gt * fix tt import * fix mui hopefully * fix coremod except intergalactic * rename assline recipe class * fix a class name i stumbled on * rename StructureUtility to GTStructureUtility to prevent conflict with structurelib * temporary rename of GTTooltipDataCache to old name * fix gt client/server proxy names --- .../api/interfaces/internal/IGTCraftingRecipe.java | 8 ++++ .../gregtech/api/interfaces/internal/IGTMod.java | 50 ++++++++++++++++++++++ .../api/interfaces/internal/IGTRecipeAdder.java | 8 ++++ .../interfaces/internal/IGT_CraftingRecipe.java | 8 ---- .../gregtech/api/interfaces/internal/IGT_Mod.java | 50 ---------------------- .../api/interfaces/internal/IGT_RecipeAdder.java | 8 ---- .../api/interfaces/internal/IThaumcraftCompat.java | 8 ++-- 7 files changed, 70 insertions(+), 70 deletions(-) create mode 100644 src/main/java/gregtech/api/interfaces/internal/IGTCraftingRecipe.java create mode 100644 src/main/java/gregtech/api/interfaces/internal/IGTMod.java create mode 100644 src/main/java/gregtech/api/interfaces/internal/IGTRecipeAdder.java delete mode 100644 src/main/java/gregtech/api/interfaces/internal/IGT_CraftingRecipe.java delete mode 100644 src/main/java/gregtech/api/interfaces/internal/IGT_Mod.java delete mode 100644 src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java (limited to 'src/main/java/gregtech/api/interfaces/internal') diff --git a/src/main/java/gregtech/api/interfaces/internal/IGTCraftingRecipe.java b/src/main/java/gregtech/api/interfaces/internal/IGTCraftingRecipe.java new file mode 100644 index 0000000000..beacd71f95 --- /dev/null +++ b/src/main/java/gregtech/api/interfaces/internal/IGTCraftingRecipe.java @@ -0,0 +1,8 @@ +package gregtech.api.interfaces.internal; + +import net.minecraft.item.crafting.IRecipe; + +public interface IGTCraftingRecipe extends IRecipe { + + boolean isRemovable(); +} diff --git a/src/main/java/gregtech/api/interfaces/internal/IGTMod.java b/src/main/java/gregtech/api/interfaces/internal/IGTMod.java new file mode 100644 index 0000000000..f47a7ef645 --- /dev/null +++ b/src/main/java/gregtech/api/interfaces/internal/IGTMod.java @@ -0,0 +1,50 @@ +package gregtech.api.interfaces.internal; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +/** + * Interface used by the Mods Main Class to reference to internals. + *

+ * Don't even think about including this File in your Mod. + */ +public interface IGTMod { + + /** + * This means that Server specific Basefiles are definitely existing! Not if the World is actually server side or + * not! + */ + boolean isServerSide(); + + /** + * This means that Client specific Basefiles are definitely existing! Not if the World is actually client side or + * not! + */ + boolean isClientSide(); + + /** + * This means that Bukkit specific Basefiles are definitely existing! Not if the World is actually bukkit server or + * not! + */ + boolean isBukkitSide(); + + /** + * works only ClientSide otherwise returns null + */ + EntityPlayer getThePlayer(); + + // ---------- Internal Usage Only ---------- + + /** + * works only ClientSide otherwise returns 0 + * + * @return the Index of the added Armor + */ + int addArmor(String aArmorPrefix); + + /** + * Plays the Sonictron Sound for the ItemStack on the Client Side + */ + void doSonictronSound(ItemStack aStack, World aWorld, double aX, double aY, double aZ); +} diff --git a/src/main/java/gregtech/api/interfaces/internal/IGTRecipeAdder.java b/src/main/java/gregtech/api/interfaces/internal/IGTRecipeAdder.java new file mode 100644 index 0000000000..a4d554428e --- /dev/null +++ b/src/main/java/gregtech/api/interfaces/internal/IGTRecipeAdder.java @@ -0,0 +1,8 @@ +package gregtech.api.interfaces.internal; + +import gregtech.api.util.GTRecipeBuilder; + +public interface IGTRecipeAdder { + + GTRecipeBuilder stdBuilder(); +} diff --git a/src/main/java/gregtech/api/interfaces/internal/IGT_CraftingRecipe.java b/src/main/java/gregtech/api/interfaces/internal/IGT_CraftingRecipe.java deleted file mode 100644 index 3f29736470..0000000000 --- a/src/main/java/gregtech/api/interfaces/internal/IGT_CraftingRecipe.java +++ /dev/null @@ -1,8 +0,0 @@ -package gregtech.api.interfaces.internal; - -import net.minecraft.item.crafting.IRecipe; - -public interface IGT_CraftingRecipe extends IRecipe { - - boolean isRemovable(); -} diff --git a/src/main/java/gregtech/api/interfaces/internal/IGT_Mod.java b/src/main/java/gregtech/api/interfaces/internal/IGT_Mod.java deleted file mode 100644 index dbf888ef96..0000000000 --- a/src/main/java/gregtech/api/interfaces/internal/IGT_Mod.java +++ /dev/null @@ -1,50 +0,0 @@ -package gregtech.api.interfaces.internal; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -/** - * Interface used by the Mods Main Class to reference to internals. - *

- * Don't even think about including this File in your Mod. - */ -public interface IGT_Mod { - - /** - * This means that Server specific Basefiles are definitely existing! Not if the World is actually server side or - * not! - */ - boolean isServerSide(); - - /** - * This means that Client specific Basefiles are definitely existing! Not if the World is actually client side or - * not! - */ - boolean isClientSide(); - - /** - * This means that Bukkit specific Basefiles are definitely existing! Not if the World is actually bukkit server or - * not! - */ - boolean isBukkitSide(); - - /** - * works only ClientSide otherwise returns null - */ - EntityPlayer getThePlayer(); - - // ---------- Internal Usage Only ---------- - - /** - * works only ClientSide otherwise returns 0 - * - * @return the Index of the added Armor - */ - int addArmor(String aArmorPrefix); - - /** - * Plays the Sonictron Sound for the ItemStack on the Client Side - */ - void doSonictronSound(ItemStack aStack, World aWorld, double aX, double aY, double aZ); -} diff --git a/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java b/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java deleted file mode 100644 index e3c3a8cbaa..0000000000 --- a/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java +++ /dev/null @@ -1,8 +0,0 @@ -package gregtech.api.interfaces.internal; - -import gregtech.api.util.GT_RecipeBuilder; - -public interface IGT_RecipeAdder { - - GT_RecipeBuilder stdBuilder(); -} diff --git a/src/main/java/gregtech/api/interfaces/internal/IThaumcraftCompat.java b/src/main/java/gregtech/api/interfaces/internal/IThaumcraftCompat.java index 5d99f83689..2cb2e6fd84 100644 --- a/src/main/java/gregtech/api/interfaces/internal/IThaumcraftCompat.java +++ b/src/main/java/gregtech/api/interfaces/internal/IThaumcraftCompat.java @@ -6,8 +6,8 @@ import net.minecraft.block.Block; import net.minecraft.enchantment.Enchantment; import net.minecraft.item.ItemStack; -import gregtech.api.enums.TC_Aspects; -import gregtech.api.enums.TC_Aspects.TC_AspectStack; +import gregtech.api.enums.TCAspects; +import gregtech.api.enums.TCAspects.TC_AspectStack; public interface IThaumcraftCompat { @@ -35,10 +35,10 @@ public interface IThaumcraftCompat { Object addCrucibleRecipe(String aResearch, Object aInput, ItemStack aOutput, List aAspects); Object addInfusionRecipe(String aResearch, ItemStack aMainInput, ItemStack[] aSideInputs, ItemStack aOutput, - int aInstability, List aAspects); + int aInstability, List aAspects); Object addInfusionEnchantmentRecipe(String aResearch, Enchantment aEnchantment, int aInstability, - List aAspects, ItemStack[] aSideInputs); + List aAspects, ItemStack[] aSideInputs); Object addResearch(String aResearch, String aName, String aText, String[] aParentResearches, String aCategory, ItemStack aIcon, int aComplexity, int aType, int aX, int aY, List aAspects, -- cgit