diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigIntValues.java b/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigIntValues.java index 422d8e0d0..dab3e1f5f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigIntValues.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigIntValues.java @@ -64,7 +64,7 @@ public enum ConfigIntValues{ CANOLA_PRESS_ENERGY_CAPACITY("Canola Press: Energy Capacity", ConfigCategories.MACHINE_ENERGY_VALUES, 40000, 1000, 1000000000, "Amount of energy Canola Press can store."), CANOLA_PRESS_ENERGY_RECEIVE("Canola Press: Energy Receive Rate", ConfigCategories.MACHINE_ENERGY_VALUES, 100, 1, 1000000000, "Amount of energy Canola Press can receive per tick."), CANOLA_PRESS_RECIPE_COST("Canola Press: Energy Use", ConfigCategories.MACHINE_RECIPE_COSTS, 35, 1, 1000000000, "Amount of energy Canola Press uses to extract Canola Oil from one item."), - CANOLA_PRESS_RECIPE_DURATION("Canola Press: Processing Duration", ConfigCategories.MACHINE_RECIPE_COSTS, 30, 1, 72000, "Time in ticks required to process one Canola in Canola Press."), + CANOLA_PRESS_PROCESSING_DURATION("Canola Press: Processing Duration", ConfigCategories.MACHINE_RECIPE_COSTS, 30, 1, 72000, "Time in ticks required to process one Canola in Canola Press."), CANOLA_PRESS_PRODUCTION_AMOUNT("Canola Press: Production Amount", ConfigCategories.MACHINE_RECIPE_COSTS, 80, 1, 2000, "Amount of Canola Oil (in mB) Canola Press produces from one Canola."), COAL_GENERATOR_ENERGY_CAPACITY("Coal Generator: Energy Capacity", ConfigCategories.MACHINE_ENERGY_VALUES, 60000, 1000, 1000000000, "Amount of energy Coal Generator can store."), COAL_GENERATOR_ENERGY_SEND("Coal Generator: Energy Send Rate", ConfigCategories.MACHINE_ENERGY_VALUES, 80, 1, 1000000000, "Amount of energy Coal Generator can send per tick."), @@ -84,7 +84,7 @@ public enum ConfigIntValues{ ENERGIZER_ENERGY_RECEIVE("Energizer: Energy Receive Rate", ConfigCategories.MACHINE_ENERGY_VALUES, 1000, 1, 1000000000, "Amount of energy Energizer can receive per tick"), ENERVATOR_ENERGY_CAPACITY("Enervator: Energy Capacity", ConfigCategories.MACHINE_ENERGY_VALUES, 50000, 1000, 1000000000, "Amount of energy Enervator can store."), ENERVATOR_ENERGY_SEND("Enervator: Energy Send Rate", ConfigCategories.MACHINE_ENERGY_VALUES, 1000, 1, 1000000000, "Amount of energy Enervator can send per tick"), - FERMENTING_BARREL_RECIPE_DURATION("Fermenting Barrel: Processing Duration", ConfigCategories.MACHINE_RECIPE_COSTS, 100, 1, 72000, "Time in ticks required for one operation in Fermenting Barrel."), + FERMENTING_BARREL_PROCESSING_DURATION("Fermenting Barrel: Processing Duration", ConfigCategories.MACHINE_RECIPE_COSTS, 100, 1, 72000, "Time in ticks required for one operation in Fermenting Barrel."), FERMENTING_BARREL_CONSUMPTION_AMOUNT("Fermenting Barrel: Consumption Amount", ConfigCategories.MACHINE_RECIPE_COSTS, 80, 1, 2000, "Amount of Canola Oil (in mB) Fermenting Barrel uses per operation."), FERMENTING_BARREL_PRODUCTION_AMOUNT("Fermenting Barrel: Production Amount", ConfigCategories.MACHINE_RECIPE_COSTS, 80, 1, 2000, "Amount of Refined Canola Oil Fermenting Barrel produces per operation."), ITEM_REPAIRER_ENERGY_CAPACITY("Item Repairer: Energy Capacity", ConfigCategories.MACHINE_ENERGY_VALUES, 300000, 1000, 1000000000, "Amount of energy Item Repairer can store."), @@ -110,7 +110,7 @@ public enum ConfigIntValues{ POWERED_FURNACE_ENERGY_CAPACITY("Powered Furnace: Energy Capacity", ConfigCategories.MACHINE_ENERGY_VALUES, 30000, 1000, 1000000000, "Amount of energy Powered Furnace can store."), POWERED_FURNACE_ENERGY_RECEIVE("Powered Furnace: Energy Receive Rate", ConfigCategories.MACHINE_ENERGY_VALUES, 150, 1, 1000000000, "Amount of energy Powered Furnace can receive per tick."), POWERED_FURNACE_ENERGY_USE("Powered Furnace: Energy Use", ConfigCategories.MACHINE_RECIPE_COSTS, 25, 1, 1000000000, "Amount of energy Powered Furnace uses per tick."), - POWERED_FURNACE_PROCESSING_DURATION("Powered Furnace: Processing Time", ConfigCategories.MACHINE_RECIPE_COSTS, 80, 1, 72000, "Time in ticks required to smelt one item in Powered Furnace."), + POWERED_FURNACE_PROCESSING_DURATION("Powered Furnace: Processing Duration", ConfigCategories.MACHINE_RECIPE_COSTS, 80, 1, 72000, "Time in ticks required to smelt one item in Powered Furnace."), SHOCK_ABSORBER_ENERGY_CAPACITY("Shock Absorber: Energy Capacity", ConfigCategories.MACHINE_ENERGY_VALUES, 300000, 1000, 1000000000, "Amount of energy Shock Absorber can store."), SHOCK_ABSORBER_ENERGY_RECEIVE("Shock Absorber: Energy Receive Rate", ConfigCategories.MACHINE_ENERGY_VALUES, 400, 1, 1000000000, "Amount of energy Shock Absorber can receive per tick."), SHOCK_ABSORBER_ENERGY_USE("Shock Absorber: Energy Use", ConfigCategories.MACHINE_ENERGY_VALUES, 300, 1, 1000000000, "Amount of energy Shock Absorber uses to protect block or entity."), diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCanolaPress.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCanolaPress.java index c8a32d521..f15fbd461 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCanolaPress.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCanolaPress.java @@ -50,7 +50,7 @@ public class TileEntityCanolaPress extends TileEntityInventoryBase implements IS @SideOnly(Side.CLIENT) public int getProcessScaled(int i){ - return this.currentProcessTime*i/ConfigIntValues.CANOLA_PRESS_RECIPE_DURATION.getValue(); + return this.currentProcessTime*i/ConfigIntValues.CANOLA_PRESS_PROCESSING_DURATION.getValue(); } @SideOnly(Side.CLIENT) @@ -84,7 +84,7 @@ public class TileEntityCanolaPress extends TileEntityInventoryBase implements IS if(!this.world.isRemote){ int energyUse = ConfigIntValues.CANOLA_PRESS_RECIPE_COST.getValue(); int productionAmount = ConfigIntValues.CANOLA_PRESS_PRODUCTION_AMOUNT.getValue(); - int processingTime = ConfigIntValues.CANOLA_PRESS_RECIPE_DURATION.getValue(); + int processingTime = ConfigIntValues.CANOLA_PRESS_PROCESSING_DURATION.getValue(); if(this.isCanola(0) && productionAmount <= this.tank.getCapacity()-this.tank.getFluidAmount()){ if(this.storage.getEnergyStored() >= energyUse){ this.currentProcessTime++; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFermentingBarrel.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFermentingBarrel.java index 59a4f0256..204303b98 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFermentingBarrel.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFermentingBarrel.java @@ -84,7 +84,7 @@ public class TileEntityFermentingBarrel extends TileEntityBase implements IShari if(!this.world.isRemote){ int consumptionAmount = ConfigIntValues.FERMENTING_BARREL_CONSUMPTION_AMOUNT.getValue(); int productionAmount = ConfigIntValues.FERMENTING_BARREL_PRODUCTION_AMOUNT.getValue(); - int processingTime = ConfigIntValues.FERMENTING_BARREL_RECIPE_DURATION.getValue(); + int processingTime = ConfigIntValues.FERMENTING_BARREL_PROCESSING_DURATION.getValue(); if(this.canolaTank.getFluidAmount() >= productionAmount && productionAmount <= this.oilTank.getCapacity()-this.oilTank.getFluidAmount()){ this.currentProcessTime++; if(this.currentProcessTime >= processingTime){ @@ -121,7 +121,7 @@ public class TileEntityFermentingBarrel extends TileEntityBase implements IShari @SideOnly(Side.CLIENT) public int getProcessScaled(int i){ - return this.currentProcessTime*i/ ConfigIntValues.FERMENTING_BARREL_RECIPE_DURATION.getValue(); + return this.currentProcessTime*i/ ConfigIntValues.FERMENTING_BARREL_PROCESSING_DURATION.getValue(); } @SideOnly(Side.CLIENT)