Skip to content

Some config changes #153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
serenibyss merged 1 commit into from
Sep 16, 2021
Merged

Some config changes #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/gregtech/api/metatileentity/SimpleMachineMetaTileEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ public class SimpleMachineMetaTileEntity extends WorkableTieredMetaTileEntity im
protected IItemHandler outputItemInventory;
protected IFluidHandler outputFluidInventory;

private static final int inputTankCapacity = ConfigHolder.U.GT5u.useCustomMachineTankSizes ? ConfigHolder.U.GT5u.customMachineTankSizes[0] : 64000;
private static final int outputTankCapacity = ConfigHolder.U.GT5u.useCustomMachineTankSizes ? ConfigHolder.U.GT5u.customMachineTankSizes[1] : 64000;
private static final int inputTankCapacity = ConfigHolder.U.GT5u.customMachineTankSizes[0];
private static final int outputTankCapacity = ConfigHolder.U.GT5u.customMachineTankSizes[1];
private static final int FONT_HEIGHT = 9; // Minecraft's FontRenderer FONT_HEIGHT value

public SimpleMachineMetaTileEntity(ResourceLocation metaTileEntityId, RecipeMap<?> recipeMap, OrientedOverlayRenderer renderer, int tier) {
Expand Down
48 changes: 21 additions & 27 deletions src/main/java/gregtech/common/ConfigHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ public class ConfigHolder {
@Config.Comment("Whether to increase number of rolls for dungeon chests. Increases dungeon loot drastically. Default: true")
public static boolean increaseDungeonLoot = true;

@Config.Comment("Allow GregTech to add additional Gregtech items as loot in various structures. Default: true")
@Config.RequiresMcRestart
public static boolean addLoot = true;

@Config.Comment("Whether to hide facades of all blocks in JEI and creative search menu. Default: true")
@Config.RequiresMcRestart
public static boolean hideFacadesInJEI = true;
Expand All @@ -37,8 +41,8 @@ public class ConfigHolder {
@Config.Comment("Whether veins should be generated in center of chunk. Default: false")
public static boolean generateVeinsInCenterOfChunk = false;

@Config.Comment("Whether to disable vanilla ores generation in world. Default: false")
public static boolean disableVanillaOres = false;
@Config.Comment("Whether to disable vanilla ores generation in world. Default: true")
public static boolean disableVanillaOres = true;

@Config.Comment("Whether to disable rubber tree world generation. Default: false")
@Config.RequiresMcRestart
Expand Down Expand Up @@ -115,18 +119,15 @@ public static class VanillaRecipes {
@Config.Comment("Whether to make redstone related recipes harder. Default: false")
public boolean hardRedstoneRecipes = false;

@Config.Comment("Recipes for items like iron doors, trapdoors, pressure plates, cauldrons, hoppers, and iron bars require iron plates, sticks, and more. Default: true")
@Config.Comment("Recipes for items like iron doors, trapdoors, buckets, pressure plates, cauldrons, hoppers, and iron bars require iron plates, sticks, and more. Default: true")
public boolean hardIronRecipes = true;

@Config.Comment("Whether to make miscellaneous recipes harder. Default: false")
public boolean hardMiscRecipes = false;

@Config.Comment("Whether to make flint and steel recipe require a steel of iron. Default: true.")
@Config.Comment("Whether to make flint and steel recipe require steel parts. Default: true.")
public boolean flintAndSteelRequireSteel = true;

@Config.Comment("Whether to make the iron bucket recipe harder by requiring a hammer and plates. Default: true")
public boolean bucketRequirePlatesAndHammer = true;

@Config.Comment("Whether to make vanilla tools and armor recipes harder. Excludes flint and steel, and buckets. Default: false")
public boolean hardToolArmorRecipes = false;

Expand Down Expand Up @@ -178,15 +179,11 @@ public static class UnofficialOptions {
@Config.RequiresMcRestart
public ClientConfig clientConfig = new ClientConfig();

@Config.Comment("Allow GregTech to add additional loot. Default: true")
@Config.RequiresMcRestart
public static boolean addLoot = true;

@Config.Comment("Divisor for Recipe Duration per Overclock. Default: 2.0")
@Config.RangeDouble(min = 2.0, max = 3.0)
public double overclockDivisor = 2.0;

@Config.Comment("Whether to enable that Steam Multiblocks use Steel instead of Bronze. Default: false")
@Config.Comment("Whether Steam Multiblocks should use Steel instead of Bronze. Default: false")
@Config.RequiresMcRestart
public boolean steelSteamMultiblocks = false;

Expand All @@ -196,15 +193,11 @@ public static class UnofficialOptions {

public static class GT5U {

@Config.Comment("This config requires 'B:Use custom machine tank sizes' = true to take effect. Changes the input tank size to the first value, and out tank size to the second value for nearly every single block machine. Units are millibuckets. Default: {64000, 64000}")
@Config.Comment("Changes the size of input and output tanks in nearly all single block machine. The first value will be used for the input tank size, the second for the output tank size. Units are millibuckets. Default: {64000, 64000}")
@Config.RangeInt(min = 1)
@Config.RequiresMcRestart
public int[] customMachineTankSizes = new int[]{64000, 64000};

@Config.Comment("This config enables the customization of nearly every single block machine's input and output fluid tank sizes. Default: false")
@Config.RequiresMcRestart
public boolean useCustomMachineTankSizes = false;

@Config.Comment("Require Wrench to break machines? Default: false")
public boolean requireWrenchForMachines = false;

Expand Down Expand Up @@ -278,16 +271,6 @@ public static class ClientConfig {
public boolean emissiveTextures = true;
}

public static class ArmorHud {
@Config.Comment({"Sets HUD location", "1 - left-upper corner", "2 - right-upper corner", "3 - left-bottom corner", "4 - right-bottom corner"})
public byte hudLocation = 1;
@Config.Comment("Horizontal offset of HUD [0 ~ 100)")
public byte hudOffsetX = 0;
@Config.Comment("Vertical offset of HUD [0 ~ 100)")
public byte hudOffsetY = 0;

}

public static class Equipment {
@Config.Comment("NightVision Goggles Voltage Tier. Default: 2 (LV)")
@Config.RangeInt(min = 0, max = 14)
Expand Down Expand Up @@ -337,5 +320,16 @@ public static class BatPack {
@Config.RangeInt(min = 1)
public int capacityHV = 9600000;
}

public static class ArmorHud {
@Config.Comment({"Sets HUD location", "1 - left-upper corner", "2 - right-upper corner", "3 - left-bottom corner", "4 - right-bottom corner"})
public byte hudLocation = 1;
@Config.Comment("Horizontal offset of HUD [0 ~ 100)")
public byte hudOffsetX = 0;
@Config.Comment("Vertical offset of HUD [0 ~ 100)")
public byte hudOffsetY = 0;

}

}
}
4 changes: 2 additions & 2 deletions src/main/java/gregtech/loaders/dungeon/DungeonLootLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
public class DungeonLootLoader {

public static void init() {
if (ConfigHolder.UnofficialOptions.addLoot || ConfigHolder.increaseDungeonLoot) {
if (ConfigHolder.addLoot || ConfigHolder.increaseDungeonLoot) {
GTLog.logger.info("Registering dungeon loot...");
ChestGenHooks.init();
}
if (ConfigHolder.UnofficialOptions.addLoot) {
if (ConfigHolder.addLoot) {
ChestGenHooks.addItem(LootTableList.CHESTS_SPAWN_BONUS_CHEST, MetaItems.BOTTLE_PURPLE_DRINK.getStackForm(), 8, 16, 2);

ChestGenHooks.addItem(LootTableList.CHESTS_SIMPLE_DUNGEON, MetaItems.BOTTLE_PURPLE_DRINK.getStackForm(), 8, 16, 40);
Expand Down
9 changes: 4 additions & 5 deletions src/main/java/gregtech/loaders/recipe/VanillaOverrideRecipes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,6 +566,10 @@ private static void metalRecipes() {
'R', new UnificationEntry(OrePrefix.ring, Materials.Iron),
'P', new UnificationEntry(OrePrefix.plate, Materials.Iron)
);

ModHandler.addShapedRecipe("iron_bucket", new ItemStack(Items.BUCKET), "XhX", " X ", 'X', new UnificationEntry(OrePrefix.plate, Materials.Iron));
ModHandler.removeRecipeByName(new ResourceLocation("minecraft:bucket"));

}

/**
Expand Down Expand Up @@ -707,11 +711,6 @@ private static void toolArmorRecipes() {
);
}

if (ConfigHolder.vanillaRecipes.bucketRequirePlatesAndHammer) {
ModHandler.addShapedRecipe("iron_bucket", new ItemStack(Items.BUCKET), "XhX", " X ", 'X', new UnificationEntry(OrePrefix.plate, Materials.Iron));
ModHandler.removeRecipeByName(new ResourceLocation("minecraft:bucket"));
}

if (!ConfigHolder.vanillaRecipes.hardToolArmorRecipes)
return;

Expand Down