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 --- .../java/gregtech/nei/dumper/BatchModeSupportDumper.java | 4 ++-- .../gregtech/nei/dumper/InputSeparationSupportDumper.java | 4 ++-- src/main/java/gregtech/nei/dumper/MaterialDumper.java | 4 ++-- src/main/java/gregtech/nei/dumper/MetaItemDumper.java | 6 +++--- .../java/gregtech/nei/dumper/MetaTileEntityDumper.java | 6 +++--- .../nei/dumper/MultiBlockFeatureSupportDumper.java | 14 +++++++------- .../gregtech/nei/dumper/RecipeLockingSupportDumper.java | 4 ++-- .../gregtech/nei/dumper/VoidProtectionSupportDumper.java | 4 ++-- 8 files changed, 23 insertions(+), 23 deletions(-) (limited to 'src/main/java/gregtech/nei/dumper') diff --git a/src/main/java/gregtech/nei/dumper/BatchModeSupportDumper.java b/src/main/java/gregtech/nei/dumper/BatchModeSupportDumper.java index ea0168073a..a69a0aa0d6 100644 --- a/src/main/java/gregtech/nei/dumper/BatchModeSupportDumper.java +++ b/src/main/java/gregtech/nei/dumper/BatchModeSupportDumper.java @@ -1,10 +1,10 @@ package gregtech.nei.dumper; -import gregtech.api.interfaces.modularui.ControllerWithOptionalFeatures; +import gregtech.api.interfaces.modularui.IControllerWithOptionalFeatures; public class BatchModeSupportDumper extends MultiBlockFeatureSupportDumper { public BatchModeSupportDumper() { - super("batch_mode", ControllerWithOptionalFeatures::supportsBatchMode); + super("batch_mode", IControllerWithOptionalFeatures::supportsBatchMode); } } diff --git a/src/main/java/gregtech/nei/dumper/InputSeparationSupportDumper.java b/src/main/java/gregtech/nei/dumper/InputSeparationSupportDumper.java index 5b0d293827..d0a68d1131 100644 --- a/src/main/java/gregtech/nei/dumper/InputSeparationSupportDumper.java +++ b/src/main/java/gregtech/nei/dumper/InputSeparationSupportDumper.java @@ -1,10 +1,10 @@ package gregtech.nei.dumper; -import gregtech.api.interfaces.modularui.ControllerWithOptionalFeatures; +import gregtech.api.interfaces.modularui.IControllerWithOptionalFeatures; public class InputSeparationSupportDumper extends MultiBlockFeatureSupportDumper { public InputSeparationSupportDumper() { - super("input_separation", ControllerWithOptionalFeatures::supportsInputSeparation); + super("input_separation", IControllerWithOptionalFeatures::supportsInputSeparation); } } diff --git a/src/main/java/gregtech/nei/dumper/MaterialDumper.java b/src/main/java/gregtech/nei/dumper/MaterialDumper.java index 3234779de8..197fbba6b3 100644 --- a/src/main/java/gregtech/nei/dumper/MaterialDumper.java +++ b/src/main/java/gregtech/nei/dumper/MaterialDumper.java @@ -7,7 +7,7 @@ import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gregtech.api.enums.Materials; public class MaterialDumper extends GregTechIDDumper { @@ -24,7 +24,7 @@ public class MaterialDumper extends GregTechIDDumper { @Override protected Iterable dump(Mode mode) { List dump = new ArrayList<>(); - Map idMap = Arrays.stream(GregTech_API.sGeneratedMaterials) + Map idMap = Arrays.stream(GregTechAPI.sGeneratedMaterials) .filter(Objects::nonNull) .collect(Collectors.toMap(m -> m.mMetaItemSubID, m -> m)); for (int i = 0; i < 1000; i++) { diff --git a/src/main/java/gregtech/nei/dumper/MetaItemDumper.java b/src/main/java/gregtech/nei/dumper/MetaItemDumper.java index 519af48e93..44e2ef8637 100644 --- a/src/main/java/gregtech/nei/dumper/MetaItemDumper.java +++ b/src/main/java/gregtech/nei/dumper/MetaItemDumper.java @@ -7,14 +7,14 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ChatComponentText; import codechicken.nei.NEIClientUtils; -import gregtech.api.items.GT_MetaGenerated_Item; +import gregtech.api.items.MetaGeneratedItem; public class MetaItemDumper extends GregTechIDDumper { - private final GT_MetaGenerated_Item item; + private final MetaGeneratedItem item; private final String nameSuffix; - public MetaItemDumper(GT_MetaGenerated_Item item, String name) { + public MetaItemDumper(MetaGeneratedItem item, String name) { super(name); this.nameSuffix = name; this.item = item; diff --git a/src/main/java/gregtech/nei/dumper/MetaTileEntityDumper.java b/src/main/java/gregtech/nei/dumper/MetaTileEntityDumper.java index ee30cdfb8a..a3fbd199fd 100644 --- a/src/main/java/gregtech/nei/dumper/MetaTileEntityDumper.java +++ b/src/main/java/gregtech/nei/dumper/MetaTileEntityDumper.java @@ -3,7 +3,7 @@ package gregtech.nei.dumper; import java.util.ArrayList; import java.util.List; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; public class MetaTileEntityDumper extends GregTechIDDumper { @@ -20,8 +20,8 @@ public class MetaTileEntityDumper extends GregTechIDDumper { @Override protected Iterable dump(Mode mode) { List list = new ArrayList<>(); - for (int i = 1; i < GregTech_API.METATILEENTITIES.length; i++) { - IMetaTileEntity mte = GregTech_API.METATILEENTITIES[i]; + for (int i = 1; i < GregTechAPI.METATILEENTITIES.length; i++) { + IMetaTileEntity mte = GregTechAPI.METATILEENTITIES[i]; if (mode == Mode.FREE && mte == null) { list.add(new String[] { String.valueOf(i), "", "", }); } else if (mode == Mode.USED && mte != null) { diff --git a/src/main/java/gregtech/nei/dumper/MultiBlockFeatureSupportDumper.java b/src/main/java/gregtech/nei/dumper/MultiBlockFeatureSupportDumper.java index dc378ff9ad..37045c6b58 100644 --- a/src/main/java/gregtech/nei/dumper/MultiBlockFeatureSupportDumper.java +++ b/src/main/java/gregtech/nei/dumper/MultiBlockFeatureSupportDumper.java @@ -5,16 +5,16 @@ import java.util.List; import java.util.function.Function; import codechicken.nei.config.DataDumper; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; -import gregtech.api.interfaces.modularui.ControllerWithOptionalFeatures; +import gregtech.api.interfaces.modularui.IControllerWithOptionalFeatures; public abstract class MultiBlockFeatureSupportDumper extends DataDumper { - private final Function isFeatureSupported; + private final Function isFeatureSupported; public MultiBlockFeatureSupportDumper(String name, - Function isFeatureSupported) { + Function isFeatureSupported) { super("tools.dump.gt5u." + name); this.isFeatureSupported = isFeatureSupported; } @@ -27,9 +27,9 @@ public abstract class MultiBlockFeatureSupportDumper extends DataDumper { @Override public Iterable dump(int mode) { List list = new ArrayList<>(); - for (int i = 1; i < GregTech_API.METATILEENTITIES.length; i++) { - IMetaTileEntity mte = GregTech_API.METATILEENTITIES[i]; - if (!(mte instanceof ControllerWithOptionalFeatures controller)) continue; + for (int i = 1; i < GregTechAPI.METATILEENTITIES.length; i++) { + IMetaTileEntity mte = GregTechAPI.METATILEENTITIES[i]; + if (!(mte instanceof IControllerWithOptionalFeatures controller)) continue; if (!isFeatureSupported.apply(controller)) { list.add( new String[] { controller.getClass() diff --git a/src/main/java/gregtech/nei/dumper/RecipeLockingSupportDumper.java b/src/main/java/gregtech/nei/dumper/RecipeLockingSupportDumper.java index 05deba6c39..0c901e49eb 100644 --- a/src/main/java/gregtech/nei/dumper/RecipeLockingSupportDumper.java +++ b/src/main/java/gregtech/nei/dumper/RecipeLockingSupportDumper.java @@ -1,10 +1,10 @@ package gregtech.nei.dumper; -import gregtech.api.interfaces.modularui.ControllerWithOptionalFeatures; +import gregtech.api.interfaces.modularui.IControllerWithOptionalFeatures; public class RecipeLockingSupportDumper extends MultiBlockFeatureSupportDumper { public RecipeLockingSupportDumper() { - super("recipe_locking", ControllerWithOptionalFeatures::supportsSingleRecipeLocking); + super("recipe_locking", IControllerWithOptionalFeatures::supportsSingleRecipeLocking); } } diff --git a/src/main/java/gregtech/nei/dumper/VoidProtectionSupportDumper.java b/src/main/java/gregtech/nei/dumper/VoidProtectionSupportDumper.java index b48efb2cdc..b870d0c984 100644 --- a/src/main/java/gregtech/nei/dumper/VoidProtectionSupportDumper.java +++ b/src/main/java/gregtech/nei/dumper/VoidProtectionSupportDumper.java @@ -1,10 +1,10 @@ package gregtech.nei.dumper; -import gregtech.api.interfaces.modularui.ControllerWithOptionalFeatures; +import gregtech.api.interfaces.modularui.IControllerWithOptionalFeatures; public class VoidProtectionSupportDumper extends MultiBlockFeatureSupportDumper { public VoidProtectionSupportDumper() { - super("void_protection", ControllerWithOptionalFeatures::supportsVoidProtection); + super("void_protection", IControllerWithOptionalFeatures::supportsVoidProtection); } } -- cgit