Skip to content

Commit

Permalink
clean up MetaTileEntities
Browse files Browse the repository at this point in the history
  • Loading branch information
@serenibyss
serenibyss committed Aug 9, 2021
1 parent 161a216 commit 4f36d36
Show file tree
Hide file tree
Showing 3 changed files with 94 additions and 282 deletions.
41 changes: 1 addition & 40 deletions src/main/java/gregtech/api/GTValues.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package gregtech.api;

import gregtech.api.util.XSTR;
import gregtech.common.ConfigHolder;
import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.oredict.OreDictionary;

Expand Down Expand Up @@ -115,43 +114,5 @@ public static boolean isModLoaded(String modid) {
/**
* Used to tell if any high-tier machine (UHV+) was registered.
*/
public static final boolean HT =
ConfigHolder.U.machines.highTierMachines ||
ConfigHolder.U.machines.highTierAlloySmelter ||
ConfigHolder.U.machines.highTierArcFurnaces ||
ConfigHolder.U.machines.highTierAssemblers ||
ConfigHolder.U.machines.highTierAutoclaves ||
ConfigHolder.U.machines.highTierBenders ||
ConfigHolder.U.machines.highTierBreweries ||
ConfigHolder.U.machines.highTierCanners ||
ConfigHolder.U.machines.highTierCentrifuges ||
ConfigHolder.U.machines.highTierChemicalBaths ||
ConfigHolder.U.machines.highTierChemicalReactors ||
ConfigHolder.U.machines.highTierCompressors ||
ConfigHolder.U.machines.highTierCutters ||
ConfigHolder.U.machines.highTierDistilleries ||
ConfigHolder.U.machines.highTierElectricFurnace ||
ConfigHolder.U.machines.highTierElectrolyzers ||
ConfigHolder.U.machines.highTierElectromagneticSeparators ||
ConfigHolder.U.machines.highTierExtractors ||
ConfigHolder.U.machines.highTierExtruders ||
ConfigHolder.U.machines.highTierFermenters ||
ConfigHolder.U.machines.highTierFluidHeaters ||
ConfigHolder.U.machines.highTierFluidSolidifiers ||
ConfigHolder.U.machines.highTierForgeHammers ||
ConfigHolder.U.machines.highTierFormingPresses ||
ConfigHolder.U.machines.highTierLathes ||
ConfigHolder.U.machines.highTierMixers ||
ConfigHolder.U.machines.highTierOreWashers ||
ConfigHolder.U.machines.highTierPackers ||
ConfigHolder.U.machines.highTierPolarizers ||
ConfigHolder.U.machines.highTierLaserEngravers ||
ConfigHolder.U.machines.highTierSifters ||
ConfigHolder.U.machines.highTierThermalCentrifuges ||
ConfigHolder.U.machines.highTierMacerators ||
ConfigHolder.U.machines.highTierUnpackers ||
ConfigHolder.U.machines.highTierWiremills ||
ConfigHolder.U.machines.highTierMassFabricators ||
ConfigHolder.U.machines.highTierReplicators ||
ConfigHolder.U.machines.highTierScanners;
public static boolean HT = false;
}
108 changes: 0 additions & 108 deletions src/main/java/gregtech/common/ConfigHolder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,11 +185,6 @@ public static class NanoSaberConfiguration {

public static class UnofficialOptions {

@Config.Comment("Config category for enabling higher-tier machines.")
@Config.Name("Higher Tier Machines")
@Config.RequiresMcRestart
public HighTierMachines machines = new HighTierMachines();

@Config.Comment("Config category for GT5u inspired features.")
@Config.Name("GregTech 5 Unofficial Options")
public GT5U GT5u = new GT5U();
Expand All @@ -198,14 +193,6 @@ public static class UnofficialOptions {
@Config.Name("GregTech 6 Options")
public GT6 GT6 = new GT6();

@Config.Comment("Should Drums be enabled? Default: true")
@Config.RequiresMcRestart
public boolean registerDrums = true;

@Config.Comment("Should Crates be enabled? Default: true")
@Config.RequiresMcRestart
public boolean registerCrates = true;

@Config.Comment("Should recipes for EV and IV Drills be enabled, which may cause large amounts of lag when used on some low-end devices? Default: true")
@Config.RequiresMcRestart
public boolean registerRecipesForHighTierDrills = true;
Expand Down Expand Up @@ -282,100 +269,5 @@ public static class GT6 {
@Config.RequiresMcRestart
public boolean plateWrenches = false;
}

public static class HighTierMachines {

@Config.Comment("Enable all LuV-UV Machines, overrides individual values if true. Default: false")
@Config.Name("LuV-UV Machines")
public boolean midTierMachines = false;

@Config.Comment("Enable all UHV-UXV Machines, overrides individual values if true. THESE WILL HAVE NO RECIPES BY DEFAULT WITHOUT GREGICALITY! Default: false")
@Config.Name("UHV-UXV Machines")
public boolean highTierMachines = false;

@Config.Comment("Should higher tier Pumps be registered (IV-UV)? Separate from other configs. Default: false")
public boolean highTierPumps = false;

@Config.Comment("Should higher tier Air Collectors be registered (IV, LuV)? Separate from other configs. Default: false")
public boolean highTierAirCollectors = false;

@Config.Comment("Set these to true to enable LuV-UV tiers of machines. Default (all): false")
public boolean midTierAlloySmelter = false;
public boolean midTierArcFurnaces = false;
public boolean midTierAssemblers = false;
public boolean midTierAutoclaves = false;
public boolean midTierBenders = false;
public boolean midTierBreweries = false;
public boolean midTierCanners = false;
public boolean midTierCentrifuges = false;
public boolean midTierChemicalBaths = false;
public boolean midTierChemicalReactors = false;
public boolean midTierCompressors = false;
public boolean midTierCutters = false;
public boolean midTierDistilleries = false;
public boolean midTierElectricFurnace = false;
public boolean midTierElectrolyzers = false;
public boolean midTierElectromagneticSeparators = false;
public boolean midTierExtractors = false;
public boolean midTierExtruders = false;
public boolean midTierFermenters = false;
public boolean midTierFluidHeaters = false;
public boolean midTierFluidSolidifiers = false;
public boolean midTierForgeHammers = false;
public boolean midTierFormingPresses = false;
public boolean midTierLathes = false;
public boolean midTierMixers = false;
public boolean midTierOreWashers = false;
public boolean midTierPackers = false;
public boolean midTierPolarizers = false;
public boolean midTierLaserEngravers = false;
public boolean midTierSifters = false;
public boolean midTierThermalCentrifuges = false;
public boolean midTierMacerators = false;
public boolean midTierUnpackers = false;
public boolean midTierWiremills = false;
public boolean midTierMassFabricators = false;
public boolean midTierReplicators = false;
public boolean midTierScanners = false;

@Config.Comment("Set these to true to enable UHV-UXV tiers of machines. THESE WILL HAVE NO RECIPES BY DEFAULT WITHOUT GREGICALITY! Default (all): false")
public boolean highTierAlloySmelter = false;
public boolean highTierArcFurnaces = false;
public boolean highTierAssemblers = false;
public boolean highTierAutoclaves = false;
public boolean highTierBenders = false;
public boolean highTierBreweries = false;
public boolean highTierCanners = false;
public boolean highTierCentrifuges = false;
public boolean highTierChemicalBaths = false;
public boolean highTierChemicalReactors = false;
public boolean highTierCompressors = false;
public boolean highTierCutters = false;
public boolean highTierDistilleries = false;
public boolean highTierElectricFurnace = false;
public boolean highTierElectrolyzers = false;
public boolean highTierElectromagneticSeparators = false;
public boolean highTierExtractors = false;
public boolean highTierExtruders = false;
public boolean highTierFermenters = false;
public boolean highTierFluidHeaters = false;
public boolean highTierFluidSolidifiers = false;
public boolean highTierForgeHammers = false;
public boolean highTierFormingPresses = false;
public boolean highTierLathes = false;
public boolean highTierMixers = false;
public boolean highTierOreWashers = false;
public boolean highTierPackers = false;
public boolean highTierPolarizers = false;
public boolean highTierLaserEngravers = false;
public boolean highTierSifters = false;
public boolean highTierThermalCentrifuges = false;
public boolean highTierMacerators = false;
public boolean highTierUnpackers = false;
public boolean highTierWiremills = false;
public boolean highTierMassFabricators = false;
public boolean highTierReplicators = false;
public boolean highTierScanners = false;
}
}
}
Loading

0 comments on commit 4f36d36

Please sign in to comment.