Skip to content

Commit

Permalink
Last-minute changes for a config option I almost forgot to add
Browse files Browse the repository at this point in the history
  • Loading branch information
Roadhog360 committed Apr 1, 2021
1 parent 5225fa1 commit b50f5b9
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ public class ConfigurationHandler {
public static boolean enableNetherEndermen;
public static boolean enableTotemUndying;
public static boolean enableRecipeForTotem;
public static boolean copper9to1;

public static boolean enableWoodRedstone;
public static boolean enableStrippedLogs;
Expand Down Expand Up @@ -314,10 +315,11 @@ private void syncConfigs() {
enableAutoAddBlastFurnace = cfg.getBoolean("enableAutoAddBlastFurnace", catFunction, true, "Auto-adds ores to the blast furnace, detected if the input has the \"ore\" oreDictionary prefix and is smeltable. Turn off for only vanilla ores");
totemHealPercent = cfg.getInt("totemHealPercent", catFunction, 5, 5, 100, "Percentage of max health for totem to set you at if you die with it. (5% is 0.05, 20 * 0.05 = 1, 1 health is one half-heart)");
enableHoeMining = cfg.getBoolean("enableHoeMining", catFunction, true, "Allows blocks like hay bales, leaves etc to mine faster with hoes");
enableRecipeForTotem = cfg.getBoolean("enableRecipeForTotem", catFunction, false, "Recipe for totems since there's no other way to get them currently?");
enableRecipeForTotem = cfg.getBoolean("enableRecipeForTotem", catFunction, false, "Recipe for totems since there's no other way to get them currently.");
enableHayBaleFalls = cfg.getBoolean("enableHayBaleFalls", catFunction, true, "If true, fall damage on a hay bale will be reduced");
hayBaleReducePercent = cfg.getInt("hayBaleReducePercent", catFunction, 20, 0, 99, "If enableHayBaleFalls is true, what percent should we keep for the fall damage?");
// enableDyeReplacement = cfg.getBoolean("enableDyeReplacement", catFunction, true, "Removes lapis, bone meal, ink sac and cocoa bean's ore dictionary entries as dyes, making the Et Futurum dyes the dyes instead. Disable if this causes weirdisms with modded recipes. (If false both items can be used)");
copper9to1 = cfg.getBoolean("copper9to1", catFunction, false, "Changes the recipe to copper from four ingots, to nine and back. Copper is mainly a building block and would be much harder to build with if this is on, so only use if this causes balance issues with your mods.");

//replacement
enableTileReplacement = cfg.getBoolean("enableTileReplacement", catReplacement, true, "Replace old Brewing Stands/Enchanting Tables/Daylight Sensors/Beacons with new one on the fly. (Note, as of 2.1.0 this option has been reworked to have better performance. If you disabled it due to lag, please consider trying it again!)"); //Requires enableNewTileEntities. If you want to switch your tile entities from the \"new\" ones to the vanilla blocks, disable this, load the chunks with your tile entities and then disable enableNewTileEntities.
Expand Down
10 changes: 7 additions & 3 deletions src/main/java/ganymedes01/etfuturum/recipes/ModRecipes.java
Original file line number Diff line number Diff line change
Expand Up @@ -660,9 +660,13 @@ private static void registerRecipes() {

if(ConfigurationHandler.enableCopper) {
Block[] stairs = new Block[] {ModBlocks.cut_copper_stairs, ModBlocks.exposed_cut_copper_stairs, ModBlocks.weathered_cut_copper_stairs, ModBlocks.oxidized_cut_copper_stairs, ModBlocks.waxed_cut_copper_stairs, ModBlocks.waxed_exposed_cut_copper_stairs, ModBlocks.waxed_weathered_cut_copper_stairs};
addShapedRecipe(new ItemStack(ModBlocks.copper_block, 4), "xx", "xx", 'x', new ItemStack(ModItems.copper_ingot, 1, 0));
addShapedRecipe(new ItemStack(ModItems.copper_ingot, 4), "x", 'x', new ItemStack(ModBlocks.copper_block, 1, 0));
addShapedRecipe(new ItemStack(ModItems.copper_ingot, 4), "x", 'x', new ItemStack(ModBlocks.copper_block, 1, 8));
if(ConfigurationHandler.copper9to1) {
addShapedRecipe(new ItemStack(ModBlocks.copper_block, 1), "xxx", "xxx", "xxx", 'x', new ItemStack(ModItems.copper_ingot, 1, 0));
} else {
addShapedRecipe(new ItemStack(ModBlocks.copper_block, 1), "xx", "xx", 'x', new ItemStack(ModItems.copper_ingot, 1, 0));
}
addShapedRecipe(new ItemStack(ModItems.copper_ingot, ConfigurationHandler.copper9to1 ? 9 : 4), "x", 'x', new ItemStack(ModBlocks.copper_block, 1, 0));
addShapedRecipe(new ItemStack(ModItems.copper_ingot, ConfigurationHandler.copper9to1 ? 9 : 4), "x", 'x', new ItemStack(ModBlocks.copper_block, 1, 8));
GameRegistry.addSmelting(new ItemStack(ModBlocks.copper_ore), new ItemStack(ModItems.copper_ingot), .7F);
for(int i = 0; i <= 7; i++) {
int j = i;
Expand Down

0 comments on commit b50f5b9

Please sign in to comment.